diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-09-01 05:29:08 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-09-01 05:29:08 +0000 |
| commit | 777b5ba62bde818a6c2979158f806a761ebfbfd4 (patch) | |
| tree | 56d8da35e051151e942ce4494cf63bae88ef3678 /dev-util/devhelp | |
| parent | Tests seem to work fine now. (diff) | |
| download | gentoo-2-777b5ba62bde818a6c2979158f806a761ebfbfd4.tar.gz gentoo-2-777b5ba62bde818a6c2979158f806a761ebfbfd4.tar.bz2 gentoo-2-777b5ba62bde818a6c2979158f806a761ebfbfd4.zip | |
Remove gedit plugin support from devhelp-3.6; it requires python2-compatible gedit-3.6.x, which was removed from the tree (bug #483084, thanks to Patrick Lauer).
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'dev-util/devhelp')
| -rw-r--r-- | dev-util/devhelp/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/devhelp/devhelp-3.6.1-r1.ebuild | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog index 2c3ac52f07b7..7e65097749cc 100644 --- a/dev-util/devhelp/ChangeLog +++ b/dev-util/devhelp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/devhelp # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.157 2013/08/31 18:48:40 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.158 2013/09/01 05:29:08 tetromino Exp $ + + 01 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + devhelp-3.6.1-r1.ebuild: + Remove gedit plugin support from devhelp-3.6; it requires python2-compatible + gedit-3.6.x, which was removed from the tree (bug #483084, thanks to Patrick + Lauer). 31 Aug 2013; Pacho Ramos <pacho@gentoo.org> -devhelp-3.8.1.ebuild, devhelp-3.8.2.ebuild: diff --git a/dev-util/devhelp/devhelp-3.6.1-r1.ebuild b/dev-util/devhelp/devhelp-3.6.1-r1.ebuild index 64aae40cbdfc..c307e6080e8e 100644 --- a/dev-util/devhelp/devhelp-3.6.1-r1.ebuild +++ b/dev-util/devhelp/devhelp-3.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.6.1-r1.ebuild,v 1.9 2013/08/27 22:25:37 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.6.1-r1.ebuild,v 1.10 2013/09/01 05:29:08 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -15,7 +15,7 @@ HOMEPAGE="http://live.gnome.org/devhelp" LICENSE="GPL-2+" SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version) KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" -IUSE="gedit" +IUSE="" # FIXME: automagic python dependency COMMON_DEPEND=">=gnome-base/gconf-2.6:2 @@ -23,11 +23,6 @@ COMMON_DEPEND=">=gnome-base/gconf-2.6:2 >=x11-libs/gtk+-3.4:3 >=net-libs/webkit-gtk-1.6:3" RDEPEND="${COMMON_DEPEND} - gedit? ( - ${PYTHON_DEPS} - app-editors/gedit[introspection,python,${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+[introspection] ) gnome-base/gsettings-desktop-schemas" DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} @@ -45,7 +40,8 @@ src_prepare() { G2CONF="${G2CONF} --with-compile-warnings=no" fi - use gedit || sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die + # always disable gedit support, it requires <gedit-3.8 (bug #483084) + sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die # https://bugzilla.gnome.org/show_bug.cgi?id=688919 epatch "${FILESDIR}/${PN}-3.6.1-libm.patch" |