Re-add xulrunner dependency to the stable version, as it doesn't work with firefox. Re-add minimum version requirement for the unstable version.

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 28 insertions, 17 deletions

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index bcb2db4a6d12..335cf0e4f42c 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.26 2012/04/17 11:10:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.27 2012/04/17 13:04:54 ulm Exp $
+
+  17 Apr 2012; Ulrich Müller <ulm@gentoo.org> conkeror-0.9.4-r1.ebuild,
+  conkeror-1.0_pre20120223.ebuild:
+  Re-add xulrunner dependency to the stable version, as it doesn't work with
+  firefox. Re-add minimum version requirement for the unstable version.
 
   17 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> conkeror-0.9.4-r1.ebuild,
   conkeror-1.0_pre20120223.ebuild:
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index 2da2844a06c1..00140acbc04d 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -6,18 +6,24 @@ 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 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
+EBUILD conkeror-0.9.4-r1.ebuild 1545 RMD160 90303bc536cfbc9b07eaa3cf704ea65c91d9d92c SHA1 ccbec09cda30a26a7382a043bcffb82984616a70 SHA256 2c29375c118865370fe9e1f964653e022fe2d9c3d0e7840671aa08e24cd48425
+EBUILD conkeror-1.0_pre20120223.ebuild 1588 RMD160 0c04e0fde7bf6b36ea3b399ca14bffcc76313f00 SHA1 e8454449b4186a623cc65b6bf7c9df8cdcadd9b5 SHA256 605818e9d2befeb1ecfc83b4b5f10eab78b5fb33146e3b6d1e2cf20cf3b50700
+MISC ChangeLog 4213 RMD160 aa3bbc4e83e36a8a55bb294bf3a8109c20e9c172 SHA1 d43864d677adee38f73c48b1711b2dd7dde3a49a SHA256 e993bdbf0ecb7f10945be5734f8c281e148542a5968489700720313342d97a34
 MISC metadata.xml 785 RMD160 9878d693f2b8867ef4dc9639ab90804608d0695f SHA1 eaff23b02973e00eec33049f776d21076fcdcd1f SHA256 a0ee8ff9435e8fa585668a635233f4390f2db687e92a687d57e263a0b26db309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPjU9tAAoJEEdUh39IaPFNRD8H/AqGPCrvUg3/exy5BeVvYKYB
-Pe/3L97dlxIfN+zArhC/w9MaYKcWRVUjrpSymc5Ssc7GBxzHOlkRMaMjyjnkZGWT
-+uyaUyw25ECT3mz9WSPosebc5vrAqnfVsGkpnJH4FkiAzx97I9pc2CRmQqoE2U94
-I91Q5P/E9mZO6sffN/uWgG3rpwmeGHnxoTYKpVYigXBwaMKwijkImt1fwEABqdvQ
-+rGm4vhMtiSZyWXKXQ6AFbUCXkQ39K+LVVjLFBW/xCBC+wZ1seFQ731mkGaIOG4O
-bXVHKuKpq+Sn/1PatemP7IZQjxXqOGCwpiokRPMZkltJ+CRbOrOZHW/DzWOv5Oo=
-=Y7eb
+iQIcBAEBAgAGBQJPjWtdAAoJEDxpGckxwJCBnDgQAILHYUF2z53oGOWETw/mG2nA
+fQl/ESzMdJDbMLbO4y4dLlPKYOzC6w0ORRRbg2ABssYXzwgrdjYCZ37isQvR5biw
+Xmgl/wBItk/uSPxrFOgvKd55FYSLJZCPUrmK3IszVsVNp6HpeoKxuAb7WdpfVzqj
+jzuVhxyuqlnSVEWZIsCwUZZPCAPv4dQP8eBjPkSWpOtGHClZ40rV+OEvbu55Wxo1
+wp44wwCMbjBjxtxOa3/l/9WBj+xAuCMmGBZOkakmCFygwvhvd3fJAAIdm3BwQsK8
+wPCGN5w/l0LNhTzFU29/jXATDkU8Ca0M8OyuWO7hapeQJPm8b/bH+wGPtpgbcMft
+DhZWr4xa876k58F4xdwUIYmMKTRfxZ9IzrfVL9ON4rCs1bLet9zbUV7B6m9XoXCL
+Lt0k66sV2F+c+lBWu2cPfgbA9sxfcPNJgxuFNJCqQKIEB+sNowk57/6/q89pfJHk
+iqas1Nysb4LXovqUnqIMX/F0Lr6i2ffnMv+SiUPjkGz59gVfk8j3LVYuzNpjL/2u
+DGLlYQ7CQjMFdVlVJ7Wey8n3lCPaYcsAO4n2QOT/6ktStc3wJe0rD6BDU72t9GCl
+0ll1YfDHk+xIPjvKy/QXWyyh5Flo/onqgh+jRMRQg5fxX3pCKuSk1VUSGyCS9iTM
+t8aY5ScSglmLa3LeijxU
+=oVOa
 -----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 7c178326a5f8..4be5f2b0a151 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.4 2012/04/17 11:10:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9.4-r1.ebuild,v 1.5 2012/04/17 13:04:54 ulm Exp $
 
 EAPI=4
 
@@ -20,9 +20,9 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
+RDEPEND=">=net-libs/xulrunner-1.9.1"
 
-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 67e942bc1dd3..bacced4e2e52 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.2 2012/04/17 11:10:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20120223.ebuild,v 1.3 2012/04/17 13:04:54 ulm Exp $
 
 EAPI=4
 
@@ -20,9 +20,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
+RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-5.0 )"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${P}.tar.gz