Raise dependencies per configure. Adjust python dependency with PYTHON_DEPEND. Clean up old revision.

Package-Manager: portage-2.2_rc72/cvs/Linux x86_64

6 files changed, 18 insertions, 121 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index d19bbc81a08c..de0cf7efffa1 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.312 2010/08/18 22:11:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.313 2010/08/31 20:56:52 eva Exp $
+
+  31 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gedit-2.16.2-no_python_module_docs.patch,
+  -files/gedit-2.22.1-fix-libtool-2.2.patch, -gedit-2.26.3.ebuild,
+  gedit-2.30.3.ebuild:
+  Raise dependencies per configure. Adjust python dependency with
+  PYTHON_DEPEND. Clean up old revision.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org> gedit-2.28.4.ebuild:
   arm stable, bug #314899
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index ffb6b5dd062e..c2026ac72007 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,8 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gedit-2.16.2-no_python_module_docs.patch 730 RMD160 81afcad6cca9d0be7311fca0da788d93368beef4 SHA1 70f11ceb222c58a85f5ce4d08474dbc70b3abfe5 SHA256 7cff8d687f0def86ccabd6bc584e9a57de23e48e9b8fb7d5f241f60ac7c3b38c
-AUX gedit-2.22.1-fix-libtool-2.2.patch 250 RMD160 26f257916aaa2bc99bc54be02f60ee57129825a6 SHA1 a6df9ba1042e8001548c9e89f1e1f3cfbda0df31 SHA256 091fe2c54d41032f5f4857787e1235709349215db44060a3d07545aaacbfb0b9
 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
@@ -10,15 +8,14 @@ DIST gedit-2.26.3.tar.bz2 4527425 RMD160 4248dbbaad3df23203654e8c3a70198bd25a5f3
 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
 EBUILD gedit-2.26.3-r1.ebuild 2043 RMD160 4010ddfd7a85e6b7763c4e716b260be1c5e7d269 SHA1 f1f9f611623368557be30810059e3d897abb59d0 SHA256 3be17fba4e2ec6dbd744063e02b94cd6500936f7b57bc6671fbd8f0ce2ffe4aa
-EBUILD gedit-2.26.3.ebuild 1895 RMD160 2562c7056924b360b0ba3fee441e37d97e7f1c8a SHA1 9090671b8462c3def5a1fdc575e376b2c8d0eec7 SHA256 fdce318446ecbf881a5eab8b5c546be23bad2bd0ff4c8f111c5dfaa38226b622
 EBUILD gedit-2.28.4.ebuild 2240 RMD160 5d984671e833b479be5eada660d33a1f0c31a8c9 SHA1 e2592e955727dd039877c4cc11066607aecea674 SHA256 e5770f745d0203c08b373ca474db0dcaa647f485f376d3190b01a068f8e4bf7c
-EBUILD gedit-2.30.3.ebuild 2052 RMD160 2539c06f7cbee45ce8172a94988334b73b803385 SHA1 1c0ebd08d71af79e02f08f5115e2b8107f1bc400 SHA256 b7e821532b0981e8cf21ace35011f89d7b4deeb38972f25d8685131cca2d951c
-MISC ChangeLog 38813 RMD160 35705e23306e7cb89ee9bcdeb2b0ff1ee031d41f SHA1 389a5946ebd96256a6c8b2491c8fedbeec354c6c SHA256 b9a233ec2b16fc6454e0a960b1b936e936000f5aa24419f97bd36a77d5a85d72
+EBUILD gedit-2.30.3.ebuild 2087 RMD160 7bc31c29665c22f21d92d152f2aea8ef47b40778 SHA1 418a70df1045a04f77188b87a89a490153256f63 SHA256 7d622af3fb9b4018fbb7f1310eb270d5ae18ed86cbe366c919761f892838ac64
+MISC ChangeLog 39112 RMD160 3a3e2a72b6e032234e43668b0a29607d59a1ecfe SHA1 99b06e2331cd32e50478588bc04887b7af80aba5 SHA256 0121b32e3f37e6ec788de275fe9d10d0f71b58f87e9951b67cda56f383b44bc7
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxsWjkACgkQkKaRLQcq0GLXuQCfR0GGmckekV/VsU6hsat3gUXm
-js8AoKeMGWd7j8BiIGVRPc+wvhkeSQm7
-=KNOU
+iEYEARECAAYFAkx9bJwACgkQ1fmVwcYIWAZwjgCfQnjbZOHL+Drl9JisOYJj+vUA
+h6oAniHiFtBcTtUu2ADwCRkH2ueq/obA
+=FyUU
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/files/gedit-2.16.2-no_python_module_docs.patch b/app-editors/gedit/files/gedit-2.16.2-no_python_module_docs.patch
deleted file mode 100644
index f1fa94f823e1..000000000000
--- a/app-editors/gedit/files/gedit-2.16.2-no_python_module_docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -NurdB gedit-2.16.2/docs/reference/gedit.types gedit-2.16.2-patched/docs/reference/gedit.types
---- gedit-2.16.2/docs/reference/gedit.types     2006-10-29 18:32:53.000000000 +0000
-+++ gedit-2.16.2-patched/docs/reference/gedit.types     2006-12-21 10:04:31.000000000 +0000
-@@ -10,7 +10,6 @@
- #include "gedit-print.h"
- #include "gedit-print-job-preview.h"
- #include "gedit-progress-message-area.h"
--#include "gedit-python-module.h"
- #include "gedit-statusbar.h"
- #include "gedit-tab.h"
- #include "gedit-view.h"
-@@ -27,7 +26,6 @@
- gedit_print_job_get_type
- gedit_print_job_preview_get_type
- gedit_progress_message_area_get_type
--gedit_python_module_get_type
- gedit_statusbar_get_type
- gedit_tab_get_type
- gedit_tooltips_get_type
diff --git a/app-editors/gedit/files/gedit-2.22.1-fix-libtool-2.2.patch b/app-editors/gedit/files/gedit-2.22.1-fix-libtool-2.2.patch
deleted file mode 100644
index 70d1234add3d..000000000000
--- a/app-editors/gedit/files/gedit-2.22.1-fix-libtool-2.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.old	2008-05-10 19:56:22.000000000 +0200
-+++ configure.ac	2008-05-10 19:56:57.000000000 +0200
-@@ -31,6 +31,7 @@
- IT_PROG_INTLTOOL([0.35.0])
- 
- AC_PROG_LIBTOOL
-+m4_ifdef([LT_OUTPUT],[LT_OUTPUT])
- 
- GNOME_DOC_INIT
- GTK_DOC_CHECK([1.0])
diff --git a/app-editors/gedit/gedit-2.26.3.ebuild b/app-editors/gedit/gedit-2.26.3.ebuild
deleted file mode 100644
index b594baf019f8..000000000000
--- a/app-editors/gedit/gedit-2.26.3.ebuild
+++ /dev/null
@@ -1,79 +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.ebuild,v 1.11 2010/07/20 02:01:34 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit 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"
-}
-
-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.3.ebuild b/app-editors/gedit/gedit-2.30.3.ebuild
index 409bdf7edc0a..e4bd8b71ac18 100644
--- a/app-editors/gedit/gedit-2.30.3.ebuild
+++ b/app-editors/gedit/gedit-2.30.3.ebuild
@@ -1,8 +1,9 @@
 # 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.30.3.ebuild,v 1.5 2010/08/01 11:44:08 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.3.ebuild,v 1.6 2010/08/31 20:56:52 eva Exp $
 
 GCONF_DEBUG="no"
+PYTHON_DEPEND="python? 2:2.5"
 
 inherit gnome2 python eutils
 
@@ -18,7 +19,7 @@ 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.16.0
+	>=x11-libs/gtk+-2.19.0
 	>=x11-libs/gtksourceview-2.9.7
 	spell? (
 		>=app-text/enchant-1.2
@@ -31,11 +32,11 @@ RDEPEND=">=gnome-base/gconf-2
 	)"
 
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	>=sys-devel/gettext-0.17
 	>=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/gnome-doc-utils-0.9.0
 	~app-text/docbook-xml-dtd-4.1.2
 	doc? ( >=dev-util/gtk-doc-1 )"
 # gnome-common and gtk-doc-am needed to eautoreconf