Add missing gnome-python dep (monolithic for stable and bump to -r1 for dep on split ebuilds (gnome-vfs and libgnome)

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 i686

4 files changed, 101 insertions, 4 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 23228a696997..e5e14e927562 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.248 2008/08/17 19:27:03 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.249 2008/09/15 03:52:40 ford_prefect Exp $
+
+*gedit-2.22.3-r1 (15 Sep 2008)
+
+  15 Sep 2008; Arun Raghavan <ford_prefect@gentoo.org> gedit-2.22.3.ebuild,
+  +gedit-2.22.3-r1.ebuild:
+  Add missing gnome-python dep (monolithic for stable and bump to -r1 for
+  dep on split ebuilds (gnome-vfs and libgnome)
 
   17 Aug 2008; Arun Raghavan <ford_prefect@gentoo.org> gedit-2.22.3.ebuild:
   Add gtk-doc dep for USE=doc
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index e084bef30f7d..98bbb9afdda4 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -8,6 +8,7 @@ DIST gedit-2.20.4.tar.bz2 3809006 RMD160 8f87871f2ab5c9f5747dd990aaa5eaad2f30215
 DIST gedit-2.22.3.tar.bz2 3884436 RMD160 fb4b5548615318dd09584820b636d4d8f664428d SHA1 3582e532c6c18f1b49b92878540484693976307b SHA256 1c9a97e5665bad9bc5c128a6dcc1be37683b619ff7255efad8f282b2184b8576
 EBUILD gedit-2.20.3.ebuild 1724 RMD160 f124319dc42372f5fb0d1f40115ed0fe9fb1bd1f SHA1 ae551dccd4eba96da9b24d5b7b0a8b111a48e9b5 SHA256 72605b8524f6bf5292e5498eecc0b71e587fb9338c80a70970b1b7ccc3ccb4e2
 EBUILD gedit-2.20.4-r1.ebuild 2251 RMD160 6e013bc8e029fe02dd897412e13bc6e75a9137ff SHA1 a08efb32e77f28f0603d9fd5b7309be119ea68f8 SHA256 edeb80dbe814cdd08401968702ee59d1ba99680433819bb1b9343bcba5eda94b
-EBUILD gedit-2.22.3.ebuild 2196 RMD160 b8863ac9b348b7328d23da30665ddb03e1b88d37 SHA1 194cffcedc2e2b8019488dc1aeecbfb89579c9cc SHA256 83194c97990f856211fea0dec589cd63b1e1aff03efc369672d91b6da7cbc77a
-MISC ChangeLog 29951 RMD160 ed7544429592d7b4d6e38aae3987cac729232cf5 SHA1 13d1d84be354942b082b061380793ed8f975172f SHA256 3995278f00eb97003ea28d3ebb06b6af9445a607e678b9e3ec7b4d88cd8ade3c
+EBUILD gedit-2.22.3-r1.ebuild 2282 RMD160 624d8b7cf3d6aae7b3ba454807c2071f50d0bc57 SHA1 24d5ba5d09ffb4f65e663398c936e8951111c2fe SHA256 4939365ea2fe2d21fbfdf4476915ab6c0b47821ac64be2b5cfbdd1016c3030aa
+EBUILD gedit-2.22.3.ebuild 2231 RMD160 63a8650a9eb78ccd9449fa8e60c3f7e4b2da3739 SHA1 3182815e87f77763f8fc0c5d735dc9719f46b252 SHA256 6768c83846d6fbd74ec7ae570bb70cc84c709ef230d6924e4637807d0c8d3d71
+MISC ChangeLog 30209 RMD160 b6ac6bccd3f154e5697e02db316e8aabeef895df SHA1 cfbcdae5116ce2e6b01557d9731f84cecedc9c17 SHA256 812c44a1c5ae669c4da04a41e41b0bdc55d25d1ebc9bfa5aefc5c76672b0de11
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/app-editors/gedit/gedit-2.22.3-r1.ebuild b/app-editors/gedit/gedit-2.22.3-r1.ebuild
new file mode 100644
index 000000000000..f7f6af98fdc6
--- /dev/null
+++ b/app-editors/gedit/gedit-2.22.3-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.22.3-r1.ebuild,v 1.1 2008/09/15 03:52:40 ford_prefect Exp $
+
+inherit gnome2 python eutils autotools
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc python spell xattr"
+
+RDEPEND=">=gnome-base/gconf-2
+	xattr? ( sys-apps/attr )
+	>=dev-libs/glib-2.14
+	>=x11-libs/gtk+-2.12
+	>=x11-libs/gtksourceview-2.2
+	>=gnome-base/libgnomeui-2.16
+	>=gnome-base/libglade-2.5.1
+	>=gnome-base/gnome-vfs-2.16
+	spell? (
+		>=app-text/enchant-1.2
+		app-text/iso-codes
+	)
+	python? (
+		>=dev-python/pygobject-2.12
+		>=dev-python/pygtk-2.12
+		>=dev-python/pygtksourceview-2.2
+		>=dev-python/gnome-vfs-python-2.22.1
+		>=dev-python/libgnome-python-2.22.1
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2
+	gnome-base/gnome-common
+	doc? ( dev-util/gtk-doc )"
+# gnome-common 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
+
+	# Remove symbols that are not meant to be part of the docs, and
+	# break compilation if USE="doc -python" (bug #158638).
+	if use !python && use doc; then
+		epatch "${FILESDIR}"/${PN}-2.16.2-no_python_module_docs.patch
+	fi
+
+	# chown on fbsd doesn't have --reference.  Bug #183691
+	epatch "${FILESDIR}"/${PN}-2.18.1-fbsd.patch
+
+	# fixes failing python test due to libtool 2.2, bug #216110
+	epatch "${FILESDIR}/${PN}-2.22.1-fix-libtool-2.2.patch"
+
+	# disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s $(type -P true) "${S}"/py-compile
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
+}
diff --git a/app-editors/gedit/gedit-2.22.3.ebuild b/app-editors/gedit/gedit-2.22.3.ebuild
index 26853ef5f409..231c9672c40b 100644
--- a/app-editors/gedit/gedit-2.22.3.ebuild
+++ b/app-editors/gedit/gedit-2.22.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.22.3.ebuild,v 1.6 2008/08/17 19:27:03 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.22.3.ebuild,v 1.7 2008/09/15 03:52:40 ford_prefect Exp $
 
 inherit gnome2 python eutils autotools
 
@@ -28,6 +28,7 @@ RDEPEND=">=gnome-base/gconf-2
 		>=dev-python/pygobject-2.12
 		>=dev-python/pygtk-2.12
 		>=dev-python/pygtksourceview-2.2
+		>=dev-python/gnome-python-2.22.0
 	)"
 
 DEPEND="${RDEPEND}