Fix incomplete DEPEND, bug #252910.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo x86_64

7 files changed, 35 insertions, 199 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 0036a2f6a0e3..3df7613c1293 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.254 2008/11/29 20:10:49 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.255 2009/01/03 15:55:24 eva Exp $
+
+  03 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gedit-2.20.4-r1.ebuild, gedit-2.22.3.ebuild, gedit-2.22.3-r1.ebuild,
+  -gedit-2.24.1.ebuild, gedit-2.24.2.ebuild:
+  Fix incomplete DEPEND, bug #252910.
 
   29 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org> gedit-2.24.2.ebuild:
   Fix for libtool-1 systems, bug #248788.
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 32d8c8973b79..9d82a8b37a97 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -7,22 +7,18 @@ AUX gedit-2.20.3-libattr.patch 395 RMD160 36d526fce179fa961ae7d36920247503803333
 AUX gedit-2.20.4-parallel-install.patch 382 RMD160 bebad6c652b617484b1d67ef9e9c0811eaccc2fb SHA1 411586d0e348779fe306a3acb72169f96cb02a45 SHA256 aa01ae580a82289f76cc5186673f58ada09cd58d55c3c198abbe18d04d522aa2
 AUX gedit-2.22.1-fix-libtool-2.2.patch 250 RMD160 26f257916aaa2bc99bc54be02f60ee57129825a6 SHA1 a6df9ba1042e8001548c9e89f1e1f3cfbda0df31 SHA256 091fe2c54d41032f5f4857787e1235709349215db44060a3d07545aaacbfb0b9
 DIST gedit-2.20.3.tar.bz2 3812377 RMD160 e3747bbafca099ae5567005b5bd6af3ba2704c3d SHA1 ccbb9bad00101ed465c39da05b0dcaf8ea881120 SHA256 d8159e6a3442a3bcf8dba5aab5b8d4b79faa5f2d14d9df9b43fa0e9186922df0
-DIST gedit-2.20.4.tar.bz2 3809006 RMD160 8f87871f2ab5c9f5747dd990aaa5eaad2f30215a SHA1 82bf5fe2e119018936fca0b89196c9e86c69ee3f SHA256 695b70582734b3ba04e0d76970bf1dd722a22ef027f8a749ec3fb05e40e83121
 DIST gedit-2.22.3.tar.bz2 3884436 RMD160 fb4b5548615318dd09584820b636d4d8f664428d SHA1 3582e532c6c18f1b49b92878540484693976307b SHA256 1c9a97e5665bad9bc5c128a6dcc1be37683b619ff7255efad8f282b2184b8576
-DIST gedit-2.24.1.tar.bz2 4078946 RMD160 3cc7f341da83efc52b182e801452f7a9f030fc59 SHA1 720c80250d7e9ed6517fb4d530bd7c8d19b3a125 SHA256 f24654fdf022a15f227b3a19e025332fea9b1ae3d52254a6438f2c7df3f84816
 DIST gedit-2.24.2.tar.bz2 4089534 RMD160 4e043a5b69c69d1edcdebc3648338d8bac4d615f SHA1 dd47269990bcf0f1de11d3ab2cbc3e1d2b75f1d5 SHA256 2efe1aa0b44caec9b29e2cf40222d27a18ae32e98f00bd70b2c056602940d203
 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-r1.ebuild 2282 RMD160 624d8b7cf3d6aae7b3ba454807c2071f50d0bc57 SHA1 24d5ba5d09ffb4f65e663398c936e8951111c2fe SHA256 4939365ea2fe2d21fbfdf4476915ab6c0b47821ac64be2b5cfbdd1016c3030aa
-EBUILD gedit-2.22.3.ebuild 2223 RMD160 1d33b76d483ff2e3b22ee849c9037354df3db4c4 SHA1 6b7936ae9db90a72e09c5864328fbaf0813caf2b SHA256 3bb1baeda823b5322ef24c1c6400d332d6d58ced96f9ee196c71123863934bcc
-EBUILD gedit-2.24.1.ebuild 2162 RMD160 b57e82fd786a6733f572561e78d327ed51b75ee2 SHA1 1d10833e9c8d56535a58be768e40ea041a4d4a03 SHA256 b5a72645dd308a56131ccb15edb547d390a64a29a7b6df1d675c1d8b1676a61b
-EBUILD gedit-2.24.2.ebuild 2149 RMD160 50f593f2e76a4bb741c9eb977b11640c896397ff SHA1 9b48205ac639e711f758b7b2ede847a7db23d852 SHA256 0f621cbd0e843fce3ae2bfb488de5fa1d6bdd2fee4975a2f95a76b870063d04f
-MISC ChangeLog 30947 RMD160 fa85a2e59dbcf7492be06b0e5681d26cae28b1e5 SHA1 4f57e265c2138ec5a49000eb640c033fe42dd9ac SHA256 cb345499ce2c7f5f14a15926ce2bc93d5f3f7aefaf678c4e81fa9ffe0fb76d3a
+EBUILD gedit-2.22.3-r1.ebuild 2350 RMD160 902e664b0dacf5f8c20cef76df12b7a56a33efdd SHA1 93b524dac0f9c7c7ee39ff136e706f383376e0e7 SHA256 5d9f99427c7d1050a2208f1caa85fd7eb7a1755db978b6dfeef18833771a6dbf
+EBUILD gedit-2.22.3.ebuild 2298 RMD160 c197672d1e847e43a3d8587fe56de96f2c4b809d SHA1 802bd912d2fb866c307db093c52115bf1218f3b4 SHA256 706eeea30b2f28d965504889d1f36da7dd4b1c7a94f827e4c756566a5d1192c6
+EBUILD gedit-2.24.2.ebuild 2226 RMD160 72bb8655e0fc0d53eab29cb82399101db81e6f1d SHA1 ee43fabc33332a7caa874762d22b44ce12710edd SHA256 c3edbd0d0cc486ab1d6179e01457d9d5dc573f9fc2c594d3432d0f982f8f4c5e
+MISC ChangeLog 31157 RMD160 8bec6af0dc6dac37497aefd28c6f4d07a972f51b SHA1 e03403cd7ac5fa5ae87d2233b14bd276ac200991 SHA256 e5cf4dee035dddf03c11f20cfe4d9966b2ffdadaf53890eaf843e3ea36c8aeee
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkxoc8ACgkQ1fmVwcYIWAaougCgrN2JYr3HLqfmeOP/rABPYesj
-r4wAoJD2jNsuFo4yCWNuLmq7fAAoIUKY
-=TGbb
+iEYEARECAAYFAklfinYACgkQ1fmVwcYIWAabcgCeLy9P7WvNT+jKjxJTEDhWWB0c
+CaEAoNtA70MY75j9ZYR0g0/kCCfDHzqv
+=hm6n
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/gedit-2.20.4-r1.ebuild b/app-editors/gedit/gedit-2.20.4-r1.ebuild
deleted file mode 100644
index 3377f72d0f70..000000000000
--- a/app-editors/gedit/gedit-2.20.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.20.4-r1.ebuild,v 1.9 2008/03/29 14:34:45 eva 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.13.5
-	>=x11-libs/gtk+-2.11.6
-	=x11-libs/gtksourceview-2*
-	>=gnome-base/libgnomeui-2.16
-	>=gnome-base/libglade-2.5.1
-	>=gnome-base/libgnomeprintui-2.12.1
-	>=gnome-base/gnome-vfs-2.16
-	spell? (
-		>=app-text/enchant-1.2
-		app-text/iso-codes
-	)
-	python? (
-		>=dev-python/pygobject-2.11.5
-		>=dev-python/pygtk-2.9.7
-		>=dev-python/pygtksourceview-2
-	)"
-
-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"
-# 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} $(use_enable python) $(use_enable spell)
-		$(use_enable xattr attr) --disable-scrollkeeper"
-}
-
-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
-
-	# Make libattr optional; bug #191989
-	epatch "${FILESDIR}"/${PN}-2.20.3-libattr.patch
-
-	# fix parallel make install, bug #205038
-	epatch "${FILESDIR}"/${PN}-2.20.4-parallel-install.patch
-
-	# disable pyc compiling
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
-}
diff --git a/app-editors/gedit/gedit-2.22.3-r1.ebuild b/app-editors/gedit/gedit-2.22.3-r1.ebuild
index f7f6af98fdc6..d75741997bd8 100644
--- a/app-editors/gedit/gedit-2.22.3-r1.ebuild
+++ b/app-editors/gedit/gedit-2.22.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.22.3-r1.ebuild,v 1.2 2009/01/03 15:55:24 eva Exp $
 
 inherit gnome2 python eutils autotools
 
@@ -34,13 +34,15 @@ RDEPEND=">=gnome-base/gconf-2
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
+	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
 	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.35
 	>=app-text/gnome-doc-utils-0.3.2
+	~app-text/docbook-xml-dtd-4.1.2
 	gnome-base/gnome-common
-	doc? ( dev-util/gtk-doc )"
-# gnome-common needed to eautoreconf
+	>=dev-util/gtk-doc-am-1
+	doc? ( >=dev-util/gtk-doc-1 )"
+# gnome-common and gtk-doc-am needed to eautoreconf
 
 DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
diff --git a/app-editors/gedit/gedit-2.22.3.ebuild b/app-editors/gedit/gedit-2.22.3.ebuild
index b9cdae905058..a58f8da98cae 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
+# Copyright 1999-2009 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.9 2008/11/13 19:36:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.22.3.ebuild,v 1.10 2009/01/03 15:55:24 eva Exp $
 
 inherit gnome2 python eutils autotools
 
@@ -33,13 +33,15 @@ RDEPEND=">=gnome-base/gconf-2
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
+	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
 	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.35
 	>=app-text/gnome-doc-utils-0.3.2
+	~app-text/docbook-xml-dtd-4.1.2
 	gnome-base/gnome-common
-	doc? ( dev-util/gtk-doc )"
-# gnome-common needed to eautoreconf
+	>=dev-util/gtk-doc-am-1
+	doc? ( >=dev-util/gtk-doc-1 )"
+# gnome-common and gtk-doc-am needed to eautoreconf
 
 DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
diff --git a/app-editors/gedit/gedit-2.24.1.ebuild b/app-editors/gedit/gedit-2.24.1.ebuild
deleted file mode 100644
index 9c92a1dfb1eb..000000000000
--- a/app-editors/gedit/gedit-2.24.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.24.1.ebuild,v 1.1 2008/11/17 19:28:26 eva 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 )
-	>=x11-libs/libSM-1.0
-	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.13
-	>=x11-libs/gtksourceview-2.2
-	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/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.24.2.ebuild b/app-editors/gedit/gedit-2.24.2.ebuild
index a0d348161171..044e0294dc26 100644
--- a/app-editors/gedit/gedit-2.24.2.ebuild
+++ b/app-editors/gedit/gedit-2.24.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.24.2.ebuild,v 1.2 2008/11/29 20:10:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.24.2.ebuild,v 1.3 2009/01/03 15:55:24 eva Exp $
 
 inherit gnome2 python eutils autotools
 
@@ -31,13 +31,15 @@ RDEPEND=">=gnome-base/gconf-2
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
+	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
 	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.35
 	>=app-text/gnome-doc-utils-0.3.2
+	~app-text/docbook-xml-dtd-4.1.2
 	gnome-base/gnome-common
-	doc? ( dev-util/gtk-doc )"
-# gnome-common needed to eautoreconf
+	>=dev-util/gtk-doc-am-1
+	doc? ( >=dev-util/gtk-doc-1 )"
+# gnome-common and gtk-doc-am needed to eautoreconf
 
 DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"