Bump to EAPI 3 to pin dependencies to appropriate slots. Drop old revisions.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

7 files changed, 23 insertions, 277 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 9668f9720183..10889f2a39a8 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.322 2011/01/20 22:33:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.323 2011/01/24 14:43:22 eva Exp $
+
+  24 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> -gedit-2.26.3-r1.ebuild,
+  -files/gedit-2.26.3-external_tools_config.patch, -gedit-2.28.4.ebuild,
+  -files/gedit-2.28.4-xml-syntax.patch, gedit-2.30.4.ebuild:
+  Bump to EAPI 3 to pin dependencies to appropriate slots. Drop old revisions.
 
   20 Jan 2011; Pacho Ramos <pacho@gentoo.org> gedit-2.30.4.ebuild:
   Needs python2 for compiling ok.
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 0a44a324bf9a..4894f89b5f54 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,23 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gedit-2.26.3-external_tools_config.patch 1389 RMD160 3709a253e35bce544493232f6faa4982e537f366 SHA1 c64c30defa6bbb2101849bb74874ebaf98f9ed4b SHA256 c690607e75553d9a93cfd9b397c68247c7b4cfc804103b9240be108d519e7eb8
-AUX gedit-2.28.4-xml-syntax.patch 2427 RMD160 75a63fc542b5ae59c488808049e206d4a17e646b SHA1 2253c5d32d5eccc574c48ce58e49de936cf8ee4b SHA256 e99c38e7294e66e35664fc55419c909a3920593c47275b5524e40b6f35253b45
 AUX gedit-2.30.2-tests-skip.patch 1402 RMD160 ba1984f9207a57254be2f6904789f8403fc619c5 SHA1 42424dbb1472d55d3b2ba0a383154bd4c2935955 SHA256 faf11f3817052dd76aa9d34af938c4cd8136a71b7b7f4dc5a42e38abd90402e9
-DIST gedit-2.26.3.tar.bz2 4527425 RMD160 4248dbbaad3df23203654e8c3a70198bd25a5f3e SHA1 57ee9519a1c28195fb5b5bafa06308d816246c53 SHA256 955be93a9c5d01849ab1e723c7bc6c25474a8ca5997396bae6fa0feb2bbdcb53
-DIST gedit-2.28.4.tar.bz2 4597928 RMD160 3bd518f8e91d04fcb6b7e06e59f27185a735aded SHA1 5f28f25c8b86cc8a5ba875121124099b94681d48 SHA256 56e72b15ecc2f27cb35c636f0efe2b78eaf463264d06d7bb33de830f38247932
 DIST gedit-2.30.3.tar.bz2 4729828 RMD160 237b8d07fecf32030ff411806adcf21e234bfd87 SHA1 c198bf088beb3cae6bee6fe91ef976cee250e688 SHA256 ab09e29e70fa830ed453a2ffb3e80f614cc7df4f3b89b3d3d1234a4936ffecf6
 DIST gedit-2.30.4.tar.bz2 4705692 RMD160 b2659b8847ef02c66a70acd2f4a492555e1e4d21 SHA1 ff7f4088d0b89224b84406557a7d9970323fdcc3 SHA256 a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c
-EBUILD gedit-2.26.3-r1.ebuild 2043 RMD160 4010ddfd7a85e6b7763c4e716b260be1c5e7d269 SHA1 f1f9f611623368557be30810059e3d897abb59d0 SHA256 3be17fba4e2ec6dbd744063e02b94cd6500936f7b57bc6671fbd8f0ce2ffe4aa
-EBUILD gedit-2.28.4.ebuild 2240 RMD160 5d984671e833b479be5eada660d33a1f0c31a8c9 SHA1 e2592e955727dd039877c4cc11066607aecea674 SHA256 e5770f745d0203c08b373ca474db0dcaa647f485f376d3190b01a068f8e4bf7c
 EBUILD gedit-2.30.3.ebuild 2085 RMD160 0340c14377289a88c9aae246feb046ce28ca3fd2 SHA1 b8027cac6aec1bdd7cf59a59859fdd1cac0e7c1c SHA256 96f7174eae83f774bf44aab5012c5aafb65e2e24d37c50b7df6584ee3e573d2d
-EBUILD gedit-2.30.4.ebuild 2138 RMD160 c1f388341a17a93eeb0a1da84d0d6ab124e4add0 SHA1 43693c019994a5022598b130c6e4855f24775a78 SHA256 d6ab11ca4ff4a6208896e93f9f63d293e296c32b551057d8a31c3947c70f136c
-MISC ChangeLog 40091 RMD160 2d69874831f901e740ae253058ce39edb28e98a2 SHA1 1805ee0b0ae686ae770525cdf336a74f9c95f131 SHA256 6cfb2a43643e661a3af2be70571c6fb6779dfb760d86fa8064df6fba3534b8c7
+EBUILD gedit-2.30.4.ebuild 2161 RMD160 acf386d0ad45b32f8a291fc515cda167dd041c12 SHA1 49d973238b12bc81e14677d84e5550619d068c00 SHA256 86d8b844f2dc2c8037593a5c01f1ed68a57205b018f618507d0dadce15c2f34e
+MISC ChangeLog 40382 RMD160 41b188c3deb9c217963f4698f4dc0296641d7725 SHA1 f9695530c567a374bfe0e9d5bdbf136571ad30c9 SHA256 bbb7f0664c5480a72841201344f29d6ab7704c82663ad07342dc9d3cec884863
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk04uFQACgkQCaWpQKGI+9RcHgCfW5x0moDY+EeLqU+rl9fqoZDW
-pjYAn064oBpX0IKnT+J4hT5SJhX/YotE
-=odcu
+iEYEARECAAYFAk09kA8ACgkQ1fmVwcYIWAZb4gCbBxmh4T0S8LQmDazZuYHWvvLO
+e6QAnRZZ5vITBgJmV3EdHWP0RmKi5U2k
+=IaX6
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/files/gedit-2.26.3-external_tools_config.patch b/app-editors/gedit/files/gedit-2.26.3-external_tools_config.patch
deleted file mode 100644
index d46d0357f750..000000000000
--- a/app-editors/gedit/files/gedit-2.26.3-external_tools_config.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -NurdB gedit-2.26.3/plugins/externaltools/tools/tools.ui gedit-2.26.3.patched/plugins/externaltools/tools/tools.ui
---- gedit-2.26.3/plugins/externaltools/tools/tools.ui	2009-07-03 03:54:58.000000000 +1000
-+++ gedit-2.26.3.patched/plugins/externaltools/tools/tools.ui	2009-10-18 20:03:25.737001974 +1100
-@@ -331,7 +331,7 @@
-                             <property name="model">model_output</property>
-                             <property name="visible">True</property>
-                             <child>
--                              <object class="GtkCellRendererText" id="input_renderer"/>
-+                              <object class="GtkCellRendererText" id="input_renderer2"/>
-                               <attributes>
-                                 <attribute name="text">0</attribute>
-                               </attributes>
-@@ -351,7 +351,7 @@
-                             <property name="model">model_input</property>
-                             <property name="visible">True</property>
-                             <child>
--                              <object class="GtkCellRendererText" id="input_renderer"/>
-+                              <object class="GtkCellRendererText" id="input_renderer3"/>
-                               <attributes>
-                                 <attribute name="text">0</attribute>
-                               </attributes>
diff --git a/app-editors/gedit/files/gedit-2.28.4-xml-syntax.patch b/app-editors/gedit/files/gedit-2.28.4-xml-syntax.patch
deleted file mode 100644
index a63fac8acb65..000000000000
--- a/app-editors/gedit/files/gedit-2.28.4-xml-syntax.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 9b2d27fd959e336a51a7f7ca5efaab46dfeb946f Mon Sep 17 00:00:00 2001
-From: Dustin Polke <dustin.polke@uni-siegen.de>
-Date: Mon, 19 Apr 2010 13:42:34 +0000
-Subject: Fix XML syntax in po files for de, fi, and hu.
-
----
-diff --git a/help/de/de.po b/help/de/de.po
-index ab25e26..56d5e53 100644
---- a/help/de/de.po
-+++ b/help/de/de.po
-@@ -1046,7 +1046,7 @@ msgid ""
- "guimenu><guimenuitem>Clear Highlight</guimenuitem></menuchoice>."
- msgstr ""
- "Um die Syntax-Hervorhebung aus dem Text zu entfernen, wählen Sie "
--"<menuchoice>Suchen<guimenu>Bearbeiten</guimenu><guimenuitem>Hervorhebung "
-+"<menuchoice><guimenu>Suchen</guimenu><guimenuitem>Hervorhebung "
- "zurücksetzen</guimenuitem></menuchoice>."
- 
- #: C/gedit.xml:458(title)
-diff --git a/help/fi/fi.po b/help/fi/fi.po
-index 234bba5..f4c5d4f 100644
---- a/help/fi/fi.po
-+++ b/help/fi/fi.po
-@@ -1019,8 +1019,8 @@ msgid ""
- "search box appears at the top of the display area."
- msgstr ""
- "Aloittaaksesi tarkentavan haun, valitse <menuchoice><guimenu>Etsi</"
--"guimenu><guimenuitem>Tarkentava haku</guimenuitem>. Hakukenttä ilmestyy "
--"näyttöalueen yläosaan."
-+"guimenu><guimenuitem>Tarkentava haku</guimenuitem></menuchoice>. "
-+"Hakukenttä ilmestyy näyttöalueen yläosaan."
- 
- #: C/gedit.xml:462(para)
- msgid ""
-@@ -3243,8 +3243,8 @@ msgid ""
- "To indent the text, choose <menuchoice><guimenu>Edit</"
- "guimenu><guimenuitem>Indent</guimenuitem></menuchoice>."
- msgstr ""
--"Sisentääksesi tekstin, valitse <menuchoice><guimenu>Muokkaa</guimenu></"
--"guimenuitem>Sisennä</guimenuitem></menuchoice>."
-+"Sisentääksesi tekstin, valitse <menuchoice><guimenu>Muokkaa</guimenu>"
-+"<guimenuitem>Sisennä</guimenuitem></menuchoice>."
- 
- #: C/gedit.xml:1612(para)
- msgid ""
-diff --git a/help/hu/hu.po b/help/hu/hu.po
-index 80d881e..0d12961 100644
---- a/help/hu/hu.po
-+++ b/help/hu/hu.po
-@@ -3895,7 +3895,7 @@ msgid ""
- "there are no more tab placeholders moves the cursor to the end of the "
- "snippet text, or to the end placeholder if it exists."
- msgstr ""
--"A <keycombo>Shift<keycap></keycap><keycap>Tab</keycap></keycombo> "
-+"A <keycombo><keycap>Shift</keycap><keycap>Tab</keycap></keycombo> "
- "billentyűkombinációval visszafele léphet a helykitöltők között. Az utolsó "
- "tab helykitöltő kitöltése után a <keycap>Tab</keycap> billentyűt megnyomva a "
- "töredék végére vagy, ha létezik, a záró helykitöltőre kerül a kurzor."
---
-cgit v0.8.3.1
diff --git a/app-editors/gedit/gedit-2.26.3-r1.ebuild b/app-editors/gedit/gedit-2.26.3-r1.ebuild
deleted file mode 100644
index 08c51d8b8b2f..000000000000
--- a/app-editors/gedit/gedit-2.26.3-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.26.3-r1.ebuild,v 1.7 2010/07/20 02:01:34 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc python spell xattr"
-
-RDEPEND=">=gnome-base/gconf-2
-	xattr? ( sys-apps/attr )
-	>=x11-libs/libSM-1.0
-	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.18
-	>=x11-libs/gtk+-2.15
-	>=x11-libs/gtksourceview-2.5
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35
-	)
-	python? (
-		>=dev-python/pygobject-2.15.4
-		>=dev-python/pygtk-2.12
-		>=dev-python/pygtksourceview-2.2
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-# gnome-common and gtk-doc-am needed to eautoreconf
-
-DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-if [[ "${ARCH}" == "PPC" ]] ; then
-	# HACK HACK HACK: someone fix this garbage
-	MAKEOPTS="${MAKEOPTS} -j1"
-fi
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		$(use_enable python)
-		$(use_enable spell)
-		$(use_enable xattr attr)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed expression failed"
-
-	# Fix object labels that makes the configuration dialog not shown,
-	# bug #207457
-	epatch "${FILESDIR}/${P}-external_tools_config.patch"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
-}
diff --git a/app-editors/gedit/gedit-2.28.4.ebuild b/app-editors/gedit/gedit-2.28.4.ebuild
deleted file mode 100644
index 3c846cae012e..000000000000
--- a/app-editors/gedit/gedit-2.28.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.28.4.ebuild,v 1.7 2010/08/18 22:11:36 maekke Exp $
-
-GCONF_DEBUG="no"
-
-inherit gnome2 python eutils
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="doc python spell xattr"
-
-RDEPEND=">=gnome-base/gconf-2
-	xattr? ( sys-apps/attr )
-	>=x11-libs/libSM-1.0
-	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.18
-	>=x11-libs/gtk+-2.17.1
-	>=x11-libs/gtksourceview-2.5
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35
-	)
-	python? (
-		>=dev-python/pygobject-2.15.4
-		>=dev-python/pygtk-2.12
-		>=dev-python/pygtksourceview-2.2
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-# gnome-common and gtk-doc-am needed to eautoreconf
-
-DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-if [[ "${ARCH}" == "PPC" ]] ; then
-	# HACK HACK HACK: someone fix this garbage
-	MAKEOPTS="${MAKEOPTS} -j1"
-fi
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-updater
-		$(use_enable python)
-		$(use_enable spell)
-		$(use_enable xattr attr)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix XML syntax in po files, bug #262325
-	epatch "${FILESDIR}/${P}-xml-syntax.patch"
-	# disable pyc compiling
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "intltool rules fix failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Installed for plugins, but they're dlopen()-ed
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
-}
diff --git a/app-editors/gedit/gedit-2.30.4.ebuild b/app-editors/gedit/gedit-2.30.4.ebuild
index d6c5b78e88d8..000653e59dc7 100644
--- a/app-editors/gedit/gedit-2.30.4.ebuild
+++ b/app-editors/gedit/gedit-2.30.4.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild,v 1.5 2011/01/20 22:33:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild,v 1.6 2011/01/24 14:43:22 eva Exp $
 
+EAPI="3"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="python? 2:2.5"
 
@@ -18,17 +19,17 @@ IUSE="doc python spell"
 RDEPEND=">=gnome-base/gconf-2
 	>=x11-libs/libSM-1.0
 	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.23.1
-	>=x11-libs/gtk+-2.19.0
-	>=x11-libs/gtksourceview-2.9.7
+	>=dev-libs/glib-2.23.1:2
+	>=x11-libs/gtk+-2.19.0:2
+	>=x11-libs/gtksourceview-2.9.7:2.0
 	spell? (
 		>=app-text/enchant-1.2
 		>=app-text/iso-codes-0.35
 	)
 	python? (
-		>=dev-python/pygobject-2.15.4
-		>=dev-python/pygtk-2.12
-		>=dev-python/pygtksourceview-2.9.2
+		>=dev-python/pygobject-2.15.4:2
+		>=dev-python/pygtk-2.12:2
+		>=dev-python/pygtksourceview-2.9.2:2
 	)"
 
 DEPEND="${RDEPEND}
@@ -41,14 +42,13 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1 )"
 # gnome-common and gtk-doc-am needed to eautoreconf
 
-DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
 if [[ "${ARCH}" == "PPC" ]] ; then
 	# HACK HACK HACK: someone fix this garbage
 	MAKEOPTS="${MAKEOPTS} -j1"
 fi
 
 pkg_setup() {
+	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--disable-updater
@@ -57,8 +57,8 @@ pkg_setup() {
 	use python && python_set_active_version 2
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
 	# Do not fail if remote mounting is not supported.
 	epatch "${FILESDIR}/${PN}-2.30.2-tests-skip.patch"