yelp-2.20.0-r1 has broken deps since beagle-0.2* was removed from the tree. Thanks to mr_bones for noticing. Leio gave me the go-ahead.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

3 files changed, 6 insertions, 69 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 6759da14701d..ebb2d0aac66e 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.205 2009/03/18 15:55:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.206 2009/03/28 15:31:54 loki_val Exp $
+
+  28 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> -yelp-2.20.0-r1.ebuild:
+  yelp-2.20.0-r1 has broken deps since beagle-0.2* was removed from the
+  tree. Thanks to mr_bones for noticing. Leio gave me the go-ahead.
 
   18 Mar 2009; Raúl Porcel <armin76@gentoo.org> yelp-2.24.0.ebuild:
   alpha/ia64 stable wrt #260063
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index a90b43409b7c..9cbaf31c2611 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -3,15 +3,13 @@ AUX yelp-2.22.1-format-string.patch 574 RMD160 0e6830bf9adb768fd0e463e1a5b46cbcb
 AUX yelp-2.22.1-xulrunner-1.9.patch 19677 RMD160 b463718314652821946a3cf9ca9e77e36ac2f5cc SHA1 c95312cfb2063f4d93f318d72c92a22d4b036353 SHA256 09fb68c73587dcda653701efb9a2893da5942cc12795c95f1305b5e02ac29466
 DIST yelp-2.16.2.tar.bz2 858693 RMD160 5c33700f40c6f533406d99f06731f2ffcb31d448 SHA1 d165a6a31eed3f6f2c251b9217299cd5e04ac6e0 SHA256 d3582665af98c8f4fd2f3c62d378360ea4de699bfe9e7213054071462f0650d5
 DIST yelp-2.18.1.tar.bz2 900142 RMD160 8aaf7e5f7f37369fa6822eed615f110babbecd28 SHA1 66e446596c22902290d6614b2d356b64d5bd304c SHA256 3add75de19550015a526a875bca66be81f73910561f1a84493d76d990717d1fa
-DIST yelp-2.20.0.tar.bz2 903106 RMD160 381b71583bc98dcce52a3de19407cc7f7e123ab0 SHA1 29c99793174c24f86ad34373ed5798b534aaac9e SHA256 0f4e1c5f3c4bf8d5109794b4d0a340ed847d49381d42968beb405f14b68c61ed
 DIST yelp-2.22.1.tar.bz2 995734 RMD160 236acd566b5e0cde0cc1365b1fdae75b2451bcce SHA1 29586dd5415fc6470c43dbd68fdb491f91778231 SHA256 6e990b35d914869dc82ada4790e2215ef71c884f6ccb8acf2e7a1c7d4b6f7614
 DIST yelp-2.24.0.tar.bz2 1023876 RMD160 dad1fe1c4d0adcfff15e6c538f6cfb6b8cf082f5 SHA1 18082b28de342c170978c8433a2ce544361598b2 SHA256 7566177d23c3cac7725981f2d04de22923499318a067044158cff17f43957a0a
 EBUILD yelp-2.16.2.ebuild 1019 RMD160 e573e78794fa33ac11d2472bf4dcb88e598bd47f SHA1 97945fdafa2e04c3b886c342dc83c9d9022cbe8c SHA256 d19baa674dc2889edd5e994248120183bbd6d6c452a095f05bac1ab75f4a44ee
 EBUILD yelp-2.18.1.ebuild 1176 RMD160 8ba00824a96a91ee0e7073223600554b32558d25 SHA1 be734cd583d6842578d200a134b246ca66d6a57c SHA256 2b9e5b8e8cb7303b27c94bb259aff34649ceeb6ae8d6279bcf24170046cb7682
-EBUILD yelp-2.20.0-r1.ebuild 1644 RMD160 b3914d24cf6f5bb5c62d80a9a29492b39bbeb90b SHA1 b4404531b1b50c36a4d9d75b7b79470bfc22d8cc SHA256 a8fe38bcb1821f4f3b74035681d29443207067489f416931e3d24950ad4c4e3d
 EBUILD yelp-2.22.1-r11.ebuild 2012 RMD160 20a80121d3faaea5a5a077fcc5ae8911c87abecd SHA1 43e827af26e447fa2cc0a7417af46b60bae151a1 SHA256 8458ff2838248a1da1333b95edfaf2086816685e6f28ecc2a5aae2da1d987a15
 EBUILD yelp-2.22.1-r2.ebuild 2130 RMD160 b35c19a1b584d725d32beb51772ccc87cc587129 SHA1 ea69b73ec8a72868e02771a9e2cae87803e27ccb SHA256 d77143b6d1fd921d31b581836b28d2d6341a557efda106b5a042faa62ad0148d
 EBUILD yelp-2.24.0-r10.ebuild 1576 RMD160 b88e302f36017c1a5272548cc484936e69a386d3 SHA1 121ea4ec2c4ad83eda4ef0254b7ed20822305b01 SHA256 a3637f1da234b73b161114b777ed2bc74787a2a93763146d5f00e15ab2783527
 EBUILD yelp-2.24.0.ebuild 1741 RMD160 b66ac81ff323cae83e5c210f8b61b73da1ebdca0 SHA1 eb39791ea6423fd153d1ac6d52f803b3e496ee56 SHA256 1a85c6b8c6074961587ca081298ad1339af812aa4bc0d6743bb2fdb74111c516
-MISC ChangeLog 24417 RMD160 1680058b092b70a25da2a86efec0cb116cf2b1ea SHA1 2d2c363b2f221cc1b8b8868df85eb7c0ed82d90d SHA256 2255bf2fb7411693796c3e3805bcfedb919e12c95e20809b47d5637a322748de
+MISC ChangeLog 24636 RMD160 6390e8e27e41e9c40f2ca4c99c6b5559174fba6e SHA1 342c142e4ff8772b1473094aebc7127294f4ea31 SHA256 932a62b722f51ca8428080fe85c337502273caffd9f22d58ce1f36a07973950d
 MISC metadata.xml 364 RMD160 b8d1a4cb0331c368c94ba6f8b72b52396b1728da SHA1 99cf408c018565500005654707a4bd1b1ab28334 SHA256 7f315cc2f1c8d303ba2dfa5c2542ba3b9b65635a3d1b978032f114ce6ebc5a4c
diff --git a/gnome-extra/yelp/yelp-2.20.0-r1.ebuild b/gnome-extra/yelp/yelp-2.20.0-r1.ebuild
deleted file mode 100644
index 22128aa5be7e..000000000000
--- a/gnome-extra/yelp/yelp-2.20.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.20.0-r1.ebuild,v 1.1 2008/08/15 14:16:04 dang Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="beagle xulrunner"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=app-text/gnome-doc-utils-0.11.1
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.14
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	>=dev-libs/glib-2
-	>=dev-libs/dbus-glib-0.71
-	beagle? ( =app-misc/beagle-0.2* )
-	!xulrunner? ( =www-client/mozilla-firefox-2* )
-	xulrunner? ( =net-libs/xulrunner-1.8* )
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-text/rarian-0.5
-	>=app-text/scrollkeeper-9999"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix format string.  Bug #234079
-	epatch "${FILESDIR}"/${PN}-2.22.1-format-string.patch
-
-	# strip stupid options in configure, see bug #196621
-	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-man --enable-info"
-
-	if use beagle; then
-		G2CONF="${G2CONF} --with-search=beagle"
-	else
-		G2CONF="${G2CONF} --with-search=basic"
-	fi
-
-	if use xulrunner; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	else
-		G2CONF="${G2CONF} --with-gecko=firefox"
-	fi
-}