sh needs one or the other of the !?xulrunner deps first

Package-Manager: portage-2.1.2.9

4 files changed, 21 insertions, 17 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 17c96433948c..f099fa23c483 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
 # 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.153 2007/07/08 05:02:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.154 2007/07/25 03:22:29 mr_bones_ Exp $
+
+  25 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org> yelp-2.18.0.ebuild,
+  yelp-2.18.1.ebuild:
+  sh needs one or the other of the !?xulrunner deps first
 
   08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   yelp-2.14.2-r2.ebuild, yelp-2.16.1.ebuild, yelp-2.16.2.ebuild,
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index da273b186fc6..b3df9d5031a7 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -23,18 +23,18 @@ EBUILD yelp-2.16.2.ebuild 1117 RMD160 0a263567b79cf7b696743675ce7df862a590cb02 S
 MD5 8498d7fd49a3de3874ec1ba9bb026926 yelp-2.16.2.ebuild 1117
 RMD160 0a263567b79cf7b696743675ce7df862a590cb02 yelp-2.16.2.ebuild 1117
 SHA256 3185179b12edded5531ace7ea5c9bd69022a8ae1d9bd4802351454aa11bd089e yelp-2.16.2.ebuild 1117
-EBUILD yelp-2.18.0.ebuild 1271 RMD160 f4df1a53b22d89f1a4a99ea8388f23e260a97c1f SHA1 5b46f81f7f65c1610e762a50b1502c6321fc0d2c SHA256 bd9540d15432c8034017578e2094c9ff7418b821f29453bc62dd8dcf94fa0554
-MD5 a97d3a74955815ac224dcdce3b40e0b4 yelp-2.18.0.ebuild 1271
-RMD160 f4df1a53b22d89f1a4a99ea8388f23e260a97c1f yelp-2.18.0.ebuild 1271
-SHA256 bd9540d15432c8034017578e2094c9ff7418b821f29453bc62dd8dcf94fa0554 yelp-2.18.0.ebuild 1271
-EBUILD yelp-2.18.1.ebuild 1271 RMD160 457d2412d92c9adbd1eaef354b740f66a63946f3 SHA1 02ed8991c2d6f24381f7df4ad9e27c0b5a12f57b SHA256 0a23f1f8f4c32a3d1b52acc8dbc3b31ea850f1d827fb486fdd543c6299dd5738
-MD5 3229326e9cae020a0cf21bf157b9615c yelp-2.18.1.ebuild 1271
-RMD160 457d2412d92c9adbd1eaef354b740f66a63946f3 yelp-2.18.1.ebuild 1271
-SHA256 0a23f1f8f4c32a3d1b52acc8dbc3b31ea850f1d827fb486fdd543c6299dd5738 yelp-2.18.1.ebuild 1271
-MISC ChangeLog 17317 RMD160 3898fb3a102a788d65f179304b977ec9cad8dcf9 SHA1 bce5851fc8fed5d03ddf9ae7f89fb4be824dbff0 SHA256 7a3d2088b78fd3b8b7f93ee77371d68b20052809035c151fd1aab8cae0a0f240
-MD5 b053feb608e17e35967313789f144a27 ChangeLog 17317
-RMD160 3898fb3a102a788d65f179304b977ec9cad8dcf9 ChangeLog 17317
-SHA256 7a3d2088b78fd3b8b7f93ee77371d68b20052809035c151fd1aab8cae0a0f240 ChangeLog 17317
+EBUILD yelp-2.18.0.ebuild 1267 RMD160 f9b64b745ed7735861557f7867d5d6c7cdd6ae5a SHA1 15bc6ab6714b00fd5ce36ed7d521c319c513fd4e SHA256 c4cff9d208727dec160f5de9892823c9b5b13cdfd9c1c50ce46db6107e499210
+MD5 706f27e4f38afc7a5f402c7af92163bb yelp-2.18.0.ebuild 1267
+RMD160 f9b64b745ed7735861557f7867d5d6c7cdd6ae5a yelp-2.18.0.ebuild 1267
+SHA256 c4cff9d208727dec160f5de9892823c9b5b13cdfd9c1c50ce46db6107e499210 yelp-2.18.0.ebuild 1267
+EBUILD yelp-2.18.1.ebuild 1267 RMD160 031a19810e147b3d97532c6b4a811c4c95c4b028 SHA1 fe65fefd3a1ee457760d6fc76cd081c327c218bc SHA256 cf0bfd486bb86022b2984c696d39b0ad08a0854fbce524848c24d37c8862dd44
+MD5 a27df147ad702792048992d0e619a557 yelp-2.18.1.ebuild 1267
+RMD160 031a19810e147b3d97532c6b4a811c4c95c4b028 yelp-2.18.1.ebuild 1267
+SHA256 cf0bfd486bb86022b2984c696d39b0ad08a0854fbce524848c24d37c8862dd44 yelp-2.18.1.ebuild 1267
+MISC ChangeLog 17473 RMD160 86653e5d779ca520aab9dd4788dc6ed75c02a172 SHA1 a0de9522227948fb9c90c7e20b6caa3f43fa5e49 SHA256 2baee4cebace8c48d9bd8a9f80c40367b0b6ca16f2af5824031e1cbd9449afd4
+MD5 811c8126d89c1c89ecb484c53b5373c4 ChangeLog 17473
+RMD160 86653e5d779ca520aab9dd4788dc6ed75c02a172 ChangeLog 17473
+SHA256 2baee4cebace8c48d9bd8a9f80c40367b0b6ca16f2af5824031e1cbd9449afd4 ChangeLog 17473
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
diff --git a/gnome-extra/yelp/yelp-2.18.0.ebuild b/gnome-extra/yelp/yelp-2.18.0.ebuild
index 0c0e20ecc0fb..aa439ceffa08 100644
--- a/gnome-extra/yelp/yelp-2.18.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.18.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.18.0.ebuild,v 1.2 2007/07/08 05:02:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.18.0.ebuild,v 1.3 2007/07/25 03:22:29 mr_bones_ Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="beagle xulrunner"
 
 RDEPEND=">=gnome-base/gconf-2
diff --git a/gnome-extra/yelp/yelp-2.18.1.ebuild b/gnome-extra/yelp/yelp-2.18.1.ebuild
index aa67f6ae230e..11df56d15fbb 100644
--- a/gnome-extra/yelp/yelp-2.18.1.ebuild
+++ b/gnome-extra/yelp/yelp-2.18.1.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.18.1.ebuild,v 1.2 2007/07/08 05:02:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.18.1.ebuild,v 1.3 2007/07/25 03:22:29 mr_bones_ Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="beagle xulrunner"
 
 RDEPEND=">=gnome-base/gconf-2