Now that xul-2 patch is compatible with 1.9 also keywords can be recovered. Drop old.

(Portage version: 2.1.10.38/cvs/Linux x86_64)

3 files changed, 8 insertions, 65 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 18cf10564286..76cb8b0148ca 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.271 2011/11/24 03:49:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.272 2011/11/28 16:45:57 pacho Exp $
+
+  28 Nov 2011; Pacho Ramos <pacho@gentoo.org> -yelp-2.30.2-r1.ebuild,
+  yelp-2.30.2-r6.ebuild:
+  Now that xul-2 patch is compatible with 1.9 also keywords can be recovered.
+  Drop old.
 
   24 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   yelp-2.30.2-r6.ebuild, -files/yelp-2.30.2-port-to-xulrunner-2-r1.patch,
diff --git a/gnome-extra/yelp/yelp-2.30.2-r1.ebuild b/gnome-extra/yelp/yelp-2.30.2-r1.ebuild
deleted file mode 100644
index 55286b6fffff..000000000000
--- a/gnome-extra/yelp/yelp-2.30.2-r1.ebuild
+++ /dev/null
@@ -1,62 +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-r1.ebuild,v 1.7 2011/03/23 08:32:01 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-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"
-# FIXME: lzma/xz support will be fixed in yelp3, bug #314923
-IUSE=""
-
-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:2
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	>=dev-libs/dbus-glib-0.71
-	net-libs/xulrunner:1.9
-	sys-libs/zlib
-	app-arch/bzip2
-	>=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
-		--with-search=basic
-		--disable-lzma"
-}
-
-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"
-}
diff --git a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild b/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
index 3463175cc5b1..dfef57df062f 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-r6.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-r6.ebuild,v 1.3 2011/11/24 03:49:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.4 2011/11/28 16:45:57 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://projects.gnome.org/yelp/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 # FIXME: lzma/xz support will be fixed in yelp3, bug #314923
 IUSE=""