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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

4 files changed, 14 insertions, 67 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/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}"