Fix slot-deps on gnome libs, remove old

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 8 insertions, 153 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index d8b56eedfa92..db89eeb79d85 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.256 2011/03/22 19:33:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.257 2011/03/23 08:32:01 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -yelp-2.30.1-r1.ebuild, -yelp-2.30.2.ebuild, yelp-2.30.2-r1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> yelp-2.30.2-r1.ebuild:
   Marking yelp-2.30.2-r1 ppc stable for bug 353436
diff --git a/gnome-extra/yelp/yelp-2.30.1-r1.ebuild b/gnome-extra/yelp/yelp-2.30.1-r1.ebuild
deleted file mode 100644
index 069d5d87cf0d..000000000000
--- a/gnome-extra/yelp/yelp-2.30.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.1-r1.ebuild,v 1.8 2010/10/17 15:34:03 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="beagle lzma"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=app-text/gnome-doc-utils-0.19.1
-	>=x11-libs/gtk+-2.18
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	>=dev-libs/dbus-glib-0.71
-	beagle? ( || (
-		>=dev-libs/libbeagle-0.3.0
-		=app-misc/beagle-0.2* ) )
-	net-libs/xulrunner:1.9
-	sys-libs/zlib
-	app-arch/bzip2
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma-utils ) )
-	>=app-text/rarian-0.7
-	>=app-text/scrollkeeper-9999"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	gnome-base/gnome-common"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-gecko=libxul-embedding
-		$(use_enable lzma)"
-
-	if use beagle; then
-		G2CONF="${G2CONF} --with-search=beagle"
-	else
-		G2CONF="${G2CONF} --with-search=basic"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix automagic lzma support, bug #266128
-	epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch"
-
-	# Fix build with xulrunner-1.9.2
-	epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch"
-
-	# Fix TOC title I18N, bgo#615141
-	epatch "${FILESDIR}/${P}-fix-toc.patch"
-
-	# Fix "Open Link in New Window", bgo#615457
-	epatch "${FILESDIR}/${P}-open-link.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# strip stupid options in configure, see bug #196621
-	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed	failed"
-}
diff --git a/gnome-extra/yelp/yelp-2.30.2-r1.ebuild b/gnome-extra/yelp/yelp-2.30.2-r1.ebuild
index 4a64fad5ce9c..55286b6fffff 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r1.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r1.ebuild,v 1.6 2011/03/22 19:33:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r1.ebuild,v 1.7 2011/03/23 08:32:01 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -16,11 +16,11 @@ KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~amd64-lin
 # FIXME: lzma/xz support will be fixed in yelp3, bug #314923
 IUSE=""
 
-RDEPEND=">=gnome-base/gconf-2
+RDEPEND=">=gnome-base/gconf-2:2
 	>=app-text/gnome-doc-utils-0.19.1
 	>=x11-libs/gtk+-2.18:2
 	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxml2-2.6.5:2
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/dbus-glib-0.71
diff --git a/gnome-extra/yelp/yelp-2.30.2.ebuild b/gnome-extra/yelp/yelp-2.30.2.ebuild
deleted file mode 100644
index 454fe8c4fb73..000000000000
--- a/gnome-extra/yelp/yelp-2.30.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2.ebuild,v 1.5 2011/01/30 18:58:17 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="beagle lzma"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=app-text/gnome-doc-utils-0.19.1
-	>=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	>=dev-libs/dbus-glib-0.71
-	beagle? ( || (
-		>=dev-libs/libbeagle-0.3.0
-		=app-misc/beagle-0.2* ) )
-	net-libs/xulrunner:1.9
-	sys-libs/zlib
-	app-arch/bzip2
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma-utils ) )
-	>=app-text/rarian-0.7
-	>=app-text/scrollkeeper-9999"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	gnome-base/gnome-common"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--with-gecko=libxul-embedding
-		$(use_enable lzma)"
-
-	if use beagle; then
-		G2CONF="${G2CONF} --with-search=beagle"
-	else
-		G2CONF="${G2CONF} --with-search=basic"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix automagic lzma support, bug #266128
-	epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch"
-
-	# Fix build with xulrunner-1.9.2
-	epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# strip stupid options in configure, see bug #196621
-	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed	failed"
-}