Ease with migration to rarian by working around a blocker in some upgrade scenarios by helping portage with an extra rdepend on scrollkeeper-9999 migration stub

Package-Manager: portage-2.1.3.16

3 files changed, 27 insertions, 11 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 0bc6a3295487..4006b890f677 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.167 2007/10/23 19:25:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.168 2007/10/27 06:36:25 leio Exp $
+
+  27 Oct 2007; Mart Raudsepp <leio@gentoo.org> yelp-2.20.0.ebuild:
+  Ease with migration to rarian by working around a blocker in some upgrade
+  scenarios by helping portage with an extra rdepend on scrollkeeper-9999
+  migration stub
 
   23 Oct 2007; Raúl Porcel <armin76@gentoo.org> yelp-2.20.0.ebuild:
   Add ~ia64/~sparc wrt #196360
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index b5b56fb11fb2..eb094909cfb9 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX yelp-2.14.0-mozilla-include-fix.patch 276 RMD160 24d8144d6655617da708b7048536582bad257795 SHA1 2b66e08646e205fbae9d6fb4143c400c1b9ac1b7 SHA256 d8d44922f7710eeb7f80d57c68187fc138c318473f3c24455e53b9b2f2114356
 MD5 d3dd0a00ede7b453249075c979ddc6cc files/yelp-2.14.0-mozilla-include-fix.patch 276
 RMD160 24d8144d6655617da708b7048536582bad257795 files/yelp-2.14.0-mozilla-include-fix.patch 276
@@ -22,14 +25,14 @@ EBUILD yelp-2.18.1.ebuild 1225 RMD160 046030e064fa7866fe49f6ca2a5139583cb76e30 S
 MD5 e929ed39a59ec7ce0682af205daad73e yelp-2.18.1.ebuild 1225
 RMD160 046030e064fa7866fe49f6ca2a5139583cb76e30 yelp-2.18.1.ebuild 1225
 SHA256 e65155d289e0c06a990e542ff65dd902ebf1165a95b3b3d5c557c42426723d83 yelp-2.18.1.ebuild 1225
-EBUILD yelp-2.20.0.ebuild 1319 RMD160 caff45d59d2cfefe303a16dc6aab471ee1e2eb2a SHA1 d75cd092f2ecd5a8d090401bd11f529ee1beb1ad SHA256 943c79d2faf15081ffa0dda220afb5c9be48552795e0a9e270d58e9d68176ece
-MD5 ced09d9b48a5146289b9f31f983c1b38 yelp-2.20.0.ebuild 1319
-RMD160 caff45d59d2cfefe303a16dc6aab471ee1e2eb2a yelp-2.20.0.ebuild 1319
-SHA256 943c79d2faf15081ffa0dda220afb5c9be48552795e0a9e270d58e9d68176ece yelp-2.20.0.ebuild 1319
-MISC ChangeLog 18856 RMD160 64ee5914cb68b1329d62e5f1db69be2893015af8 SHA1 ffee346daf6360219343a896c01761247cd4858e SHA256 92f61c198f1ba5ad9f948634b7eeb24f2c5c250c8a3a71e50aa97357e8665dbf
-MD5 0e4975948fbfd27ecfe5b0665b4fdffe ChangeLog 18856
-RMD160 64ee5914cb68b1329d62e5f1db69be2893015af8 ChangeLog 18856
-SHA256 92f61c198f1ba5ad9f948634b7eeb24f2c5c250c8a3a71e50aa97357e8665dbf ChangeLog 18856
+EBUILD yelp-2.20.0.ebuild 1346 RMD160 e4ab83929287841e31360558fbb0906cfb8651fc SHA1 db9464affbafce257e5bb07185831b3d39f3c183 SHA256 73304fcd286b20d51897cc34b69fea168253da3431bf7d700a6a00e5bd630474
+MD5 97abe3bf6e01b5b7f75101f40559e7e5 yelp-2.20.0.ebuild 1346
+RMD160 e4ab83929287841e31360558fbb0906cfb8651fc yelp-2.20.0.ebuild 1346
+SHA256 73304fcd286b20d51897cc34b69fea168253da3431bf7d700a6a00e5bd630474 yelp-2.20.0.ebuild 1346
+MISC ChangeLog 19088 RMD160 d3a118766948fce38c052b6560d9511c1b10bd9c SHA1 2204cf8370a14d7663daff6b43fda761c8276537 SHA256 72b8c666e28cf0bdba52ba6a2a6e17938b47688f1b131846e1747008cd50e579
+MD5 7adcdbb6e2b605ed0495f37cdfdff47c ChangeLog 19088
+RMD160 d3a118766948fce38c052b6560d9511c1b10bd9c ChangeLog 19088
+SHA256 72b8c666e28cf0bdba52ba6a2a6e17938b47688f1b131846e1747008cd50e579 ChangeLog 19088
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -46,3 +49,10 @@ SHA256 bb3e08272f19d5445e61de9f8739dd6e2c07e0da544a53a7f778339766d8b43a files/di
 MD5 ed889194362f482c5d81b176e265cca3 files/digest-yelp-2.20.0 238
 RMD160 c41c7a3771943b2794bcd2f3a65d1fb5cfa08e08 files/digest-yelp-2.20.0 238
 SHA256 cdadf08a393204129e1d5687133496044c588047a3ffadadf95b472b38559505 files/digest-yelp-2.20.0 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD4DBQFHItxxkeYb6olFHJcRAtE4AJjuBuq54FFqyCt5Y0ygn8uCfxeAAJ9abMpJ
+SZw00eFHMGb5vnf3c9T5dg==
+=RdBS
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/yelp-2.20.0.ebuild b/gnome-extra/yelp/yelp-2.20.0.ebuild
index 9e71e29e9757..7c91a5ff4e46 100644
--- a/gnome-extra/yelp/yelp-2.20.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.ebuild,v 1.5 2007/10/23 19:25:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.20.0.ebuild,v 1.6 2007/10/27 06:36:25 leio Exp $
 
 inherit gnome2
 
@@ -30,7 +30,8 @@ RDEPEND=">=gnome-base/gconf-2
 	xulrunner? ( net-libs/xulrunner )
 	sys-libs/zlib
 	app-arch/bzip2
-	>=app-text/rarian-0.5"
+	>=app-text/rarian-0.5
+	>=app-text/scrollkeeper-9999"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35