Fix mozilla/firefox deps, bug 204682

Package-Manager: portage-2.1.4_rc14

4 files changed, 25 insertions, 18 deletions

diff --git a/app-text/gnomesword/ChangeLog b/app-text/gnomesword/ChangeLog
index 135b59b7e88e..647246cf7b38 100644
--- a/app-text/gnomesword/ChangeLog
+++ b/app-text/gnomesword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/gnomesword
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/ChangeLog,v 1.23 2008/01/05 17:43:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/ChangeLog,v 1.24 2008/01/07 03:01:27 beandog Exp $
+
+*gnomesword-2.3.1-r1 (07 Jan 2008)
+
+  07 Jan 2008; Steve Dibb <beandog@gentoo.org> -gnomesword-2.3.1.ebuild,
+  +gnomesword-2.3.1-r1.ebuild:
+  Fix mozilla/firefox deps, bug 204682
 
 *gnomesword-2.3.1 (05 Jan 2008)
 
diff --git a/app-text/gnomesword/Manifest b/app-text/gnomesword/Manifest
index 94d4227d31fe..115028c50051 100644
--- a/app-text/gnomesword/Manifest
+++ b/app-text/gnomesword/Manifest
@@ -8,14 +8,14 @@ EBUILD gnomesword-2.1.7.ebuild 1171 RMD160 2a32dde15f38d950c6ea5a95b99f191ca9281
 MD5 76efb6d8a26ca5610295c4608563b924 gnomesword-2.1.7.ebuild 1171
 RMD160 2a32dde15f38d950c6ea5a95b99f191ca92815c0 gnomesword-2.1.7.ebuild 1171
 SHA256 b4ae974a52273f939b0a1e79f6aaa7d8bbd833881d81e36cdf73a858e7fcf6a9 gnomesword-2.1.7.ebuild 1171
-EBUILD gnomesword-2.3.1.ebuild 1152 RMD160 0e4d0f89146b2bd06e2b1324eab8aff5094c6d28 SHA1 eee048875f069cb59c5549f0e9090c0b8f3e0381 SHA256 d6c6f02bd39c71ff0353b310544e851ce49098d07bcaf26bbafe8d34d184544d
-MD5 785082833876243062d3ca560ce40f56 gnomesword-2.3.1.ebuild 1152
-RMD160 0e4d0f89146b2bd06e2b1324eab8aff5094c6d28 gnomesword-2.3.1.ebuild 1152
-SHA256 d6c6f02bd39c71ff0353b310544e851ce49098d07bcaf26bbafe8d34d184544d gnomesword-2.3.1.ebuild 1152
-MISC ChangeLog 3292 RMD160 0bea1437f2be8d27b696116c358b30c0d294aa3a SHA1 26e385e2dd42ed35d06684258c458d9b8c312152 SHA256 c5e9b6627138a207f1ec5fe6855988bec13bc157f5b9919b54d205afa9483857
-MD5 6ca55863f43e669d430414737956e488 ChangeLog 3292
-RMD160 0bea1437f2be8d27b696116c358b30c0d294aa3a ChangeLog 3292
-SHA256 c5e9b6627138a207f1ec5fe6855988bec13bc157f5b9919b54d205afa9483857 ChangeLog 3292
+EBUILD gnomesword-2.3.1-r1.ebuild 1307 RMD160 ab947bdc35e3ba8da01455ef8f5488e0de5f9d94 SHA1 736f96f4dee940a4a72ed7410601ad4ed2cef666 SHA256 60b11b8736c4553be63941698a05ed2a1e2c87a1898e355f4003261044ba4985
+MD5 948f0803f976c3abd44f8d1a6388f038 gnomesword-2.3.1-r1.ebuild 1307
+RMD160 ab947bdc35e3ba8da01455ef8f5488e0de5f9d94 gnomesword-2.3.1-r1.ebuild 1307
+SHA256 60b11b8736c4553be63941698a05ed2a1e2c87a1898e355f4003261044ba4985 gnomesword-2.3.1-r1.ebuild 1307
+MISC ChangeLog 3472 RMD160 1a687293813b44323bfebbcdb6ce6ca543b23c71 SHA1 74e82df0f55c65425a84d852064ab2c3b2eff6f0 SHA256 19d9e31a8c51c55631e07867de6662cdfd0deca87fdd52f6bd3510de1d80225c
+MD5 7a145fe4a187385e4ae4661d8d0a0697 ChangeLog 3472
+RMD160 1a687293813b44323bfebbcdb6ce6ca543b23c71 ChangeLog 3472
+SHA256 19d9e31a8c51c55631e07867de6662cdfd0deca87fdd52f6bd3510de1d80225c ChangeLog 3472
 MISC metadata.xml 225 RMD160 85b15c992c3c155290f10acea186147d766b0620 SHA1 31c995eec7e4afb352888c1d9c65e9107f894d0b SHA256 1dab477a800b766fe838154618bd7769afe79f427f3c05fa155ee1a411f5c006
 MD5 2b6eacf3e9bb95c67338d8392a040e63 metadata.xml 225
 RMD160 85b15c992c3c155290f10acea186147d766b0620 metadata.xml 225
@@ -23,6 +23,6 @@ SHA256 1dab477a800b766fe838154618bd7769afe79f427f3c05fa155ee1a411f5c006 metadata
 MD5 042b409aaddc3bf735316784447ce5c9 files/digest-gnomesword-2.1.7 253
 RMD160 c0e7557e0722f113a3856aa7f9a6a1341b0467f1 files/digest-gnomesword-2.1.7 253
 SHA256 4874acf66aa853f37fc4371a28cfc21f74152686cde5a1ffa8aac5d75d395ea6 files/digest-gnomesword-2.1.7 253
-MD5 21a63e574f45300f86e86389056907a5 files/digest-gnomesword-2.3.1 253
-RMD160 4f2d178e82734d920fff66c4e99d9e61052b851a files/digest-gnomesword-2.3.1 253
-SHA256 52d532c884135d36c5899696a2296a0f530214d08c2567c4fb429594d15c3fdb files/digest-gnomesword-2.3.1 253
+MD5 21a63e574f45300f86e86389056907a5 files/digest-gnomesword-2.3.1-r1 253
+RMD160 4f2d178e82734d920fff66c4e99d9e61052b851a files/digest-gnomesword-2.3.1-r1 253
+SHA256 52d532c884135d36c5899696a2296a0f530214d08c2567c4fb429594d15c3fdb files/digest-gnomesword-2.3.1-r1 253
diff --git a/app-text/gnomesword/files/digest-gnomesword-2.3.1 b/app-text/gnomesword/files/digest-gnomesword-2.3.1-r1
index 3c5d807b2862..3c5d807b2862 100644
--- a/app-text/gnomesword/files/digest-gnomesword-2.3.1
+++ b/app-text/gnomesword/files/digest-gnomesword-2.3.1-r1
diff --git a/app-text/gnomesword/gnomesword-2.3.1.ebuild b/app-text/gnomesword/gnomesword-2.3.1-r1.ebuild
index da468146ffa3..93fad9e7f8ff 100644
--- a/app-text/gnomesword/gnomesword-2.3.1.ebuild
+++ b/app-text/gnomesword/gnomesword-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.3.1.ebuild,v 1.1 2008/01/05 17:43:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.3.1-r1.ebuild,v 1.1 2008/01/07 03:01:27 beandog Exp $
 
 inherit libtool gnome2 eutils
 
@@ -10,19 +10,20 @@ SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="spell"
-RDEPEND=">=gnome-extra/gtkhtml-3.14
+IUSE="firefox seamonkey spell xulrunner"
+DEPEND=">=gnome-extra/gtkhtml-3.14
 	=app-text/sword-1.5.10*
 	>=x11-libs/gtk+-2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libgnomeprintui-2.2
 	>=gnome-base/libglade-2
 	dev-libs/libxml2
-	virtual/libc
+	xulrunner? ( net-libs/xulrunner )
+	!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
+	!xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
 	spell? (
 		app-text/gnome-spell
-		>=gnome-base/libbonoboui-2 )"
-DEPEND="${RDEPEND}
+		>=gnome-base/libbonoboui-2 )
 	>=dev-util/pkgconfig-0.12
 	>=dev-util/intltool-0.29
 	>=app-text/scrollkeeper-0.3.14"