Remove obsolete net-libs/xulrunner from no-op RDEPEND wrt #409483 by Jauhien Piatlicki

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 23 insertions, 26 deletions

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index b06c4fdca6d4..bcb2db4a6d12 100644
--- a/www-client/conkeror/ChangeLog
+++ b/www-client/conkeror/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/conkeror
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.25 2012/03/24 17:41:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.26 2012/04/17 11:10:50 ssuominen Exp $
+
+  17 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> conkeror-0.9.4-r1.ebuild,
+  conkeror-1.0_pre20120223.ebuild:
+  Remove obsolete net-libs/xulrunner from no-op RDEPEND wrt #409483 by Jauhien
+  Piatlicki
 
 *conkeror-1.0_pre20120223 (24 Mar 2012)
 
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index 91b65f69300a..2da2844a06c1 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -6,24 +6,18 @@ AUX conkeror.sh 326 RMD160 798db77d5948b0e3d1c9064472fd54c1a6c319a7 SHA1 24a7f95
 DIST conkeror-0.9.4.tar.gz 277963 RMD160 d7b474b4a7bbcb3c67f825fa5417d037cbe5a636 SHA1 68618cdd5118ba575cb39d3d5f424147ed16b47f SHA256 50c7e2493d28033bed81e57c7c8b9d33db0a87cfe84e8963aff37a160cf964f2
 DIST conkeror-1.0_pre20120223.tar.gz 287013 RMD160 da0c4d077077ff26cd7abc81e879d4ee7057735a SHA1 dc7c760a2a89cd7a7ca507c90ab784262bbb8a2d SHA256 5c1a78bfd7f1ecbd10b60777c67f1c2d7b917b34e4bfc018c95ee0124d7efc4a
 DIST conkeror.png 5105 RMD160 f274986d7ffc6227959e4856b59d81b9cd67307e SHA1 4017f236c9518dea84e53e089199e9f6315c18dd SHA256 b11856c32bdec9e9b045df44aa37727f6a3ec18507d376bf27675bc7ee042667
-EBUILD conkeror-0.9.4-r1.ebuild 1552 RMD160 4d58ed2c1b9c0ccb6113b5aa38dbd91bf3cb7a2f SHA1 55263e93204f00ae0d4fa56211a3ecb544a4c644 SHA256 52b94956f42f66f95f60c9c347cdb4daa08c4c8b85e07e275c109a9925402c05
-EBUILD conkeror-1.0_pre20120223.ebuild 1619 RMD160 304f91b743e791142ef519bb2510fac619f850d2 SHA1 f68779c29acd2789d35ac6553782aaf8336c1ecb SHA256 4dc23cadffe749f5e868fbdb56419a610fb7ac893250f26000223291d1888d04
-MISC ChangeLog 3748 RMD160 e77c8a9731bea56dacb75ba702c4ce5f02cc3ee0 SHA1 9efc5df3c7f3135bf46602c4d4ba219f6fc6b48d SHA256 feba479bafd5d02b514a99e4b5c733100acd5a5b80cb1b94acf6bff081de47d9
+EBUILD conkeror-0.9.4-r1.ebuild 1571 RMD160 dc555653081c5e4f67c940e343408a405c72bef2 SHA1 4c2439de3babe3954303c1fdf1a119432b48ea0f SHA256 e34427e7419c6e50dfd6248425928d3356917d02e71905951cd8839d92771ac8
+EBUILD conkeror-1.0_pre20120223.ebuild 1580 RMD160 7b9a8b8ce8716af3b9f31b8a85b93a37aa1b2b9c SHA1 87d1dbee6e2e3911ca352f097f54eb004a299089 SHA256 b481392e3c9bb40837bbc5c4d2007b8567adb2a21a13e34c997e46d2c33c9166
+MISC ChangeLog 3961 RMD160 1d24b7d94ad9a17599804f20890fa88aab584915 SHA1 d2bb86f97f66b4d43b8ef774ca086ef7949ebc3f SHA256 5313fd931e07b68d22ebda3500a0f814ebdfb414b7c9d4f1f3ccf6b748f6dbe3
 MISC metadata.xml 785 RMD160 9878d693f2b8867ef4dc9639ab90804608d0695f SHA1 eaff23b02973e00eec33049f776d21076fcdcd1f SHA256 a0ee8ff9435e8fa585668a635233f4390f2db687e92a687d57e263a0b26db309
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPbggEAAoJEDxpGckxwJCBd2AQAJrtN/c1hgoSZOhmVa8ClbvV
-R76sodnOZmEmsaXLZYCYmA9i0+W21g7iJYED0QRuw6dhut1f9+0Z2w3l+pRv7XF2
-ZCEO3jud5B4eO7GVXZNBWMvGZjNzKr86sUhkilBFsVnL9+MeohwNqPbE9AXC90Vx
-tYGl093/6pTxdpI2BaeWTQCIxpyMrBGmrItylMryoLcz6sVBvFcaDcyfQ+VhhGf8
-0tTh1QZGK5WRj0GmSfRAYEb2W/ijf05XEZGS4vSRBGv1kTTnlWF53XVIEbYnlRky
-txUTjT/Eea8oPkMWn4e4W3ZJE+KbT/XMcWhCGGgV9VKjN0cDkgQdjJzuRADjrij3
-l91IJwKz1nnrBPEspS83mCFZt5WQ/tS8QJEBtzWWRkfTnqK21JWLRHHnjm551WS7
-gRjeCqZ4r3g04NtFn8nU8ZAU6ferRXH6yTJqvkyfC2I+dQMnP1n+P36VWRabtMgX
-V+1DF77qME3xJMoAywHNE9/OQdOJEHcbZbXjmCwbv7YYEDcb1+zACbRzhS9k+zRI
-uTq5uYphICTv9u4pir8+s1DM9wfmWIoXVCJXFOvIZoYDxw+g3sQ2xZ2v0c6Tfb/g
-iwwbprCzkf9O0ccSEH2zyaQ8gSaR2c/05b0kjs1cHOkXkl/PZFq+w6kn/VEuV+xO
-kFWaTfQPlHPtVowmYomq
-=9rAr
+iQEcBAEBAgAGBQJPjU9tAAoJEEdUh39IaPFNRD8H/AqGPCrvUg3/exy5BeVvYKYB
+Pe/3L97dlxIfN+zArhC/w9MaYKcWRVUjrpSymc5Ssc7GBxzHOlkRMaMjyjnkZGWT
++uyaUyw25ECT3mz9WSPosebc5vrAqnfVsGkpnJH4FkiAzx97I9pc2CRmQqoE2U94
+I91Q5P/E9mZO6sffN/uWgG3rpwmeGHnxoTYKpVYigXBwaMKwijkImt1fwEABqdvQ
++rGm4vhMtiSZyWXKXQ6AFbUCXkQ39K+LVVjLFBW/xCBC+wZ1seFQ731mkGaIOG4O
+bXVHKuKpq+Sn/1PatemP7IZQjxXqOGCwpiokRPMZkltJ+CRbOrOZHW/DzWOv5Oo=
+=Y7eb
 -----END PGP SIGNATURE-----
diff --git a/www-client/conkeror/conkeror-0.9.4-r1.ebuild b/www-client/conkeror/conkeror-0.9.4-r1.ebuild
index 3789c8bba9eb..7c178326a5f8 100644
--- a/www-client/conkeror/conkeror-0.9.4-r1.ebuild
+++ b/www-client/conkeror/conkeror-0.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9.4-r1.ebuild,v 1.3 2012/02/24 14:53:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9.4-r1.ebuild,v 1.4 2012/04/17 11:10:50 ssuominen Exp $
 
 EAPI=4
 
@@ -20,9 +20,9 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=net-libs/xulrunner-1.9.1"
+RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${P}.tar.gz
diff --git a/www-client/conkeror/conkeror-1.0_pre20120223.ebuild b/www-client/conkeror/conkeror-1.0_pre20120223.ebuild
index 79b501e0d1ca..67e942bc1dd3 100644
--- a/www-client/conkeror/conkeror-1.0_pre20120223.ebuild
+++ b/www-client/conkeror/conkeror-1.0_pre20120223.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20120223.ebuild,v 1.1 2012/03/24 17:41:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20120223.ebuild,v 1.2 2012/04/17 11:10:50 ssuominen Exp $
 
 EAPI=4
 
@@ -20,11 +20,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( >=net-libs/xulrunner-1.9.1
-		>=www-client/firefox-5.0
-		>=www-client/firefox-bin-5.0 )"
+RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${P}.tar.gz