Fix incomplete DEPEND, bug #252910.

(Portage version: 2.2_rc20/cvs/Linux 2.6.28-gentoo x86_64)

6 files changed, 28 insertions, 188 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/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"