Depend on <firefox-26 until bug 497024 is properly fixed. Remove old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

5 files changed, 27 insertions, 82 deletions

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index 66cafc36597b..38e39a406dc9 100644
--- a/www-client/conkeror/ChangeLog
+++ b/www-client/conkeror/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/conkeror
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.37 2013/10/27 14:24:45 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.38 2014/01/04 22:28:16 ulm Exp $
+
+  04 Jan 2014; Ulrich Müller <ulm@gentoo.org> conkeror-1.0_pre20120223.ebuild,
+  -conkeror-1.0_pre20130711.ebuild, conkeror-1.0_pre20131017.ebuild:
+  Depend on <firefox-26 until bug 497024 is properly fixed. Remove old.
 
 *conkeror-1.0_pre20131017 (27 Oct 2013)
 
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index 0f261b9874ed..e3a117998daa 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -5,25 +5,23 @@ AUX conkeror-r1.sh 260 SHA256 82bd1f26e22f758d898b21590181db1a45a857f7a54acb90d2
 AUX conkeror.desktop 353 SHA256 dae4a96195bac52b9aee261c8ff82058990cefed2506fb42d222eb30a6c1d8e5 SHA512 ea48c755c800d2df417d5461e07a41305545de4086e22bf741804c60bb6d7f002685481eb505593c02f5948887026f5b9f15f853794c0c85c9aba7c060cf0f64 WHIRLPOOL 03697e3ab72862f56a2ff0867cc271bcb62d1cf89831c43d73d0d5ffa6a6989628fc02697d9be5cfe2c3c0436b297c283063687b5aba2fa4cf87b1e441aa3818
 AUX conkeror.sh 197 SHA256 39845d8a9417855c1f67da6755be3ebd59ef29301d3a40bb4cb8bb890a15721c SHA512 173ecdacd3f1783b96e699f03b7bc937d8050f5944c92a54fea1a192e93c784513a2086cbc49f56692ef9f94203e074632dbe34aed576f73a946a737625ecb97 WHIRLPOOL 20edc4a227477d10bfb447d360d2d35e3a07fe909e030a6f48106070e0b4b864fcbe1be3179e73e49925e6ae6c5e13dec94f951eabd675f5c6fd728f2990d2c5
 DIST conkeror-1.0_pre20120223.tar.gz 287013 SHA256 5c1a78bfd7f1ecbd10b60777c67f1c2d7b917b34e4bfc018c95ee0124d7efc4a SHA512 3cfe06fd642d3a4f872b1523ef1fb7086ecf3be6ae1a2ae020507df1e9a9970eb21b75495f364122c8f40ed3dd7b04f76f622fcd14e05e20af6e12a25d872ee6 WHIRLPOOL 75efb51ad76068d929cf22d3f8b090d415bc6fc29e998b1d4a5a9da352632d43b8c15b2950c508bfd2c37586e1e7c819f4e4e2aad9492ee962b123b19c6d4f12
-DIST conkeror-1.0_pre20130711.tar.gz 299682 SHA256 dd4947623d5dfd76475b7eade3a5888f8d5f70100b0444588a9fa0fad1a9b837 SHA512 4bee42059c0a72572916e2d20647a65df8f2f3e6606973cde8d8631bd2044d0e4eede9ec755a047188e3ff4f02c65eb08b7ba5ef08b3656d131c1b6cffb3934d WHIRLPOOL 6bfb8355e86aaf5e5badeefe2d47eba3a6e80a2bd9568f5d7e9d1a3e8fa90d27fcb7cba8389eb6611cde3e9a03c0e9bab2115e70d2abb4402eaa1e43eece2061
 DIST conkeror-1.0_pre20131017.tar.gz 299661 SHA256 899af79c22949b38852f56909f8f815e40b7869f59c842418469fa31eb0dea7c SHA512 7287f9426b5faaf12fe902e1ce1d449ab190956f24c42ca9bcc5453337eb943bcbd04ab5d8621f959992df8620afd442e2b00592dcefd24dd55f5cefc524fcea WHIRLPOOL 39ef75d8f09515b075724ca4c3b7c207c50c0ccbc4c87f84ed3c3ce24efa25034b8278cd2da78a31db43357e7742cf4d6b661a10aadb212002093043d04c1b2c
 DIST conkeror.png 5105 SHA256 b11856c32bdec9e9b045df44aa37727f6a3ec18507d376bf27675bc7ee042667 SHA512 fd44e2732a74ab6a54ef4a946f20619aa74d24d2244b0d6bedfa6d4680bc3247d297565550d8c3a5cc4a8ca608761ccb8f61e71cbe0c2851d400f8fa426e034f WHIRLPOOL 3fe3ea1f7f1caaa737ed3777b6b8cb6e10f971b5853a0a89de65c78e75323e8f01f01ea46d01fbff47dd97452e7a114b353322b4d8764a4d2bacf755c8fa3c66
-EBUILD conkeror-1.0_pre20120223.ebuild 1600 SHA256 4e9c983681efb62ec324c29eb36764f68ff655e93b2a5b5de8dbe3d3bf3214ed SHA512 9fbad6cf1635cc9d7c7a616d53689e3c0f99fa162a650cfdbf3188db1ecebbd05550dfbe176d25cc37d0eb2bee227e4d3567f2d9a03cd644206f9d7ad3a74097 WHIRLPOOL 6bacae32dd74b754526f0630924ac6ab5885d40e93ee5b660de8f6f2919be01534c953bf4d1460041d5b11267303c037fd4985ce3732018e9ea9bf7fe2342b8d
-EBUILD conkeror-1.0_pre20130711.ebuild 1583 SHA256 7c37518901f9633d61153c314658720059935e3173e5043a7724c9972a4743cc SHA512 2978857821c644f6f5d6de4769a0e544f7034b9d8836162547ca72fb1f6e61425c9308262f19474e34660099aea781379439c8dc179c57d6a424fcf80a94226a WHIRLPOOL 8d56ac5e39915be4ab28b1f97eece876cd8b7bb7b3106ac382efb2437364a315ae29214a065b4a2d99eabc62bc47658491635622e2555cc7894490b11928e56a
-EBUILD conkeror-1.0_pre20131017.ebuild 1583 SHA256 d31c5a8a75b50955c40ada8611a85e716766edd8660b8385554904bb6343bf3c SHA512 09495d017bdbecfa828989e45f9ce70b877f518c89d26adf23084f2ccde69ffc2dfbc318c52c9ee0233a1621c9462a54cb413205cc88644b769f6e1d9c15cb73 WHIRLPOOL 85af1fcc694117886427826d13e020f6a3c2a88ca0dc7459aeec9d2f8625b62cdf84fa580e98cdcd21a5640da70fb4262123108041bfbff2024cfa417aa4ea91
-MISC ChangeLog 5772 SHA256 bdfedce1c11c419a887fd945eeaf71d99c3255e390d2c2342fe30ff2e4e8fbb2 SHA512 f1f51f8c8a46233b7337d87be9f12d979e5e305dc2c62c1415dbf8886653a372341ebe5e79c8f5c23bc9b766e6fb2282209c89a724d2df53b67596e719a7741f WHIRLPOOL 0151ac673b9147107c3b7802e9eb558b47d52e4533ea62f2a19fbe403540285d84b3a5e044687dec9eb2f859ec052fd66366c01550ea6aac2510c3cc064d497d
+EBUILD conkeror-1.0_pre20120223.ebuild 1661 SHA256 3bee02dce9a064f22a1c9fa8a231e53ab950e8d728bce9381ffb64bb7210cc75 SHA512 1e65e667e1e829550f89bd47289d0ee5c0db8db7fb972c5a6a6951b564a1ecc3c9d1dbcd4a3b53c267a2b2954e8ecabff18d9f3586627b5d395bc66ddf5c9566 WHIRLPOOL 7320ebf814012371d05c319d266718fd82370230951d494df4f57cfa9eccbcd6002a6aeee97d6704ba29053e5d7fc40b8f112e7d890dc7aea8a7fad6a75ed864
+EBUILD conkeror-1.0_pre20131017.ebuild 1643 SHA256 3fc7373c0f9394f559c90428b5c9c6389335ae1bb28ad9e2b5af41abc8643604 SHA512 cdb72493889bf497dd9cacf45b051e6a3e1c44a8ec937a3863b43d3a23f0c0e1761fe0e4f6571c2dd8578dc07cce59a5e1ab3189a6b1b78f0765cd20ad9db2fa WHIRLPOOL 119806f092708a7115f314eddb492085c1855fb0559c4f741741b7d75c682e08abc4f174730ec1b6ffe40ed81c9947b7cc2bd1e59de9b707facf93f62da038da
+MISC ChangeLog 5994 SHA256 ab6e90ca8611aca2508d0536337e432900fd15a433604a89b0f1b3a731aa54a7 SHA512 c979a9b7cfb025a6e560d8145cccca702d313e1f8f5b61b1ee4fe356ae5f7f42c2ff0b3fe89b8dafeee4fb780031808e3a71176f2d99a9c73d0a3024fb904118 WHIRLPOOL 2879099d7a55f02879370bdb4a67f41d7fc287d53b30a98351f4b19648d402992d21d905321db82471fc5abd8ed44347c0902035e06a2a631b93f17cf0f097ce
 MISC metadata.xml 785 SHA256 a0ee8ff9435e8fa585668a635233f4390f2db687e92a687d57e263a0b26db309 SHA512 bb9e6dcd8566bfcbfb37b70f7589052f768440661bf08de92dd116577ac801d9a1c4cecd918c0e3f691ef73dc015ed71a62fdd3e09945057bc249a85ef9456be WHIRLPOOL 96059be3f8f61b6de21e6e6c8b87e34413fa2d5a42dc8e34340b25ea6e13b15a7e32d622144dd4dc6fb5fb5fd21e3401784aac6128151ed818ae0ee76eb2532d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJSbSKXAAoJEJQzkH1pP7W4sPML/3U6/inXLjk0Xjo7mcDWSH5F
-XpfEUmZIpOmK4jMt5e1+dM3A7CyYxKLItC5WBMbTbsPL6NmiAZzBc7HGb1TAxT/A
-lfeN6ZkpSpdBD/4csy7M/uqubrI01GXyTBjUCxn7qOVG4RjcYa55IDDwIr1IiIHd
-BQIuKps8WglI5DqIiWDZ4YaoKvB+WkWcTGAd1dzYWxCV6xGUOPjs8m59ULcbEgKU
-PU5l5IQOn/k08GH4Jlx6hw4rd/xSIjrm05IfkTvvm5qT9879eSq/ZcPfYmb5kQBl
-AMcLfg6dGST8KVAWt6CA2aZaC9AFrsR1oVKX57/Gj4BlNrrjRxjjbD0yVV7eIjnT
-bRvMwiFfbRwWtcoCi6chCvGwp0taIHOjyOpn+kteie0NPi0ZeKF7+hPk84Y1bTqn
-7OtamDUQ3Vl4o072oWAwiRRnqW3U+8HJsYMwV7CPdsBDPkZMmERPwQ4hZtG4LKKT
-iWdF7+0G4XCH3LRJQhq3W58cfOVto6nUfujj0OJ2rA==
-=7/3V
+iQGcBAEBCAAGBQJSyIvvAAoJEJQzkH1pP7W4NJ4L/2lC+qRdEQGQ2pP1ckNBTPik
+6jniMBklyBqU0ZRpvjzJ3eKYcItbrnphZoy8h2bYpUa+fMB9U0yvkZNtRA6fOa58
+xKaVQifgrGx+EYs7gSb2w7iqQ8Jh5OM65ZXrjtTIaiYxs4vEQLTc4eECMwJO+uDU
+AG3NFzcORs5fUiPPuv3d+4g0NbCxkoeP6FM0YmqOz6ffVKcKki8PMts4olV2C0Qk
+iMk/sFPRSOqGMzwb9wRJmWov2DHBGF4Xmaxx0MFyMxn8YiVoHNtBcbJyO8UV3Hog
+1J8HxIKVyXeDM+8Ql7Aop3X2geKLHr9wmCyRwmla2G48omFuenDpuyitBkWo/pUx
+7FL3a2eiWyU5iJBabpsDO5+tbmscqYbSRLJcm4y0EIwUIoSoWTD5kGPiSX+jhPHS
+fXkxV7Z1ZXwaYEMYIGa5xYvdmpor4+4QupcoeSnWkyclz5zL1CxPRAOwT4GtEXD8
+ke2qWteezLBH4FH4sl2rBhhD6kNuDzD0DocARcIfsA==
+=LQkR
 -----END PGP SIGNATURE-----
diff --git a/www-client/conkeror/conkeror-1.0_pre20120223.ebuild b/www-client/conkeror/conkeror-1.0_pre20120223.ebuild
index 9315ca7ef0a0..1fd254fae1d6 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-2013 Gentoo Foundation
+# Copyright 1999-2014 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.7 2013/02/07 22:42:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20120223.ebuild,v 1.8 2014/01/04 22:28:16 ulm Exp $
 
 EAPI=4
 
@@ -20,7 +20,8 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-5.0 )"
+RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-26 )
+		( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-26 ) )"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/www-client/conkeror/conkeror-1.0_pre20130711.ebuild b/www-client/conkeror/conkeror-1.0_pre20130711.ebuild
deleted file mode 100644
index b7927aefec8d..000000000000
--- a/www-client/conkeror/conkeror-1.0_pre20130711.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20130711.ebuild,v 1.2 2013/08/17 20:49:51 ulm Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs fdo-mime
-
-DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs"
-HOMEPAGE="http://conkeror.org/"
-# snapshot from http://repo.or.cz/w/conkeror.git
-# conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	mirror://gentoo/conkeror.png"
-
-# CC-BY-SA-3.0 for conkeror.png
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 )"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cp "${DISTDIR}/conkeror.png" . || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r branding chrome components content defaults help locale modules \
-		search-engines style tests
-	doins application.ini *.manifest Info.plist
-
-	exeinto /usr/libexec/${PN}
-	doexe conkeror-spawn-helper
-	dosym ../../libexec/${PN}/conkeror-spawn-helper \
-		/usr/share/${PN}/conkeror-spawn-helper
-
-	newbin "${FILESDIR}/conkeror-r1.sh" conkeror
-	domenu "${FILESDIR}/conkeror.desktop"
-	doicon "${WORKDIR}/conkeror.png"
-
-	doman contrib/man/conkeror.1
-	dodoc CREDITS
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/conkeror/conkeror-1.0_pre20131017.ebuild b/www-client/conkeror/conkeror-1.0_pre20131017.ebuild
index e154ab1886da..6dd08610e698 100644
--- a/www-client/conkeror/conkeror-1.0_pre20131017.ebuild
+++ b/www-client/conkeror/conkeror-1.0_pre20131017.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20131017.ebuild,v 1.1 2013/10/27 14:24:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20131017.ebuild,v 1.2 2014/01/04 22:28:16 ulm Exp $
 
 EAPI=5
 
@@ -18,7 +18,8 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 )"
+RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-26 )
+		( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-26 ) )"
 
 S="${WORKDIR}/${PN}"