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

(Portage version: 2.2_rc72/cvs/Linux x86_64)

5 files changed, 13 insertions, 113 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/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