Add new snapshot, support firefox as alternative dependency. Remove old.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 30 insertions, 90 deletions

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index 1314a11bc490..b06c4fdca6d4 100644
--- a/www-client/conkeror/ChangeLog
+++ b/www-client/conkeror/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2012/02/24 14:53:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.25 2012/03/24 17:41:47 ulm Exp $
+
+*conkeror-1.0_pre20120223 (24 Mar 2012)
+
+  24 Mar 2012; Ulrich Müller <ulm@gentoo.org> -conkeror-0.9.3-r1.ebuild,
+  -conkeror-0.9.3_p20110401.ebuild, +conkeror-1.0_pre20120223.ebuild:
+  Add new snapshot, support firefox as alternative dependency. Remove old.
 
   24 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   conkeror-0.9.4-r1.ebuild:
diff --git a/www-client/conkeror/conkeror-0.9.3_p20110401.ebuild b/www-client/conkeror/conkeror-0.9.3_p20110401.ebuild
deleted file mode 100644
index 1ff4df43ab07..000000000000
--- a/www-client/conkeror/conkeror-0.9.3_p20110401.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9.3_p20110401.ebuild,v 1.2 2011/12/10 11:01:06 ulm Exp $
-
-EAPI=3
-
-inherit eutils 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/${P}.patch.gz
-	mirror://gentoo/conkeror.png"
-
-# CC-BY-SA-3.0 for conkeror.png
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CCPL-Attribution-ShareAlike-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=net-libs/xulrunner-1.9"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${P%_*}.tar.gz ${P}.patch.gz
-	cp "${DISTDIR}/conkeror.png" . || die
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}.patch"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	insinto /usr/lib/${PN}
-	doins -r branding chrome components content defaults help locale modules \
-		search-engines style tests || die
-	doins application.ini chrome.manifest Info.plist || die
-
-	exeinto /usr/lib/${PN}
-	doexe conkeror-spawn-helper || die
-	exeinto /usr/lib/${PN}/contrib
-	doexe contrib/run-conkeror || die
-	dosym /usr/lib/${PN}/contrib/run-conkeror /usr/bin/conkeror || die
-	domenu "${FILESDIR}/conkeror.desktop" || die
-	doicon "${WORKDIR}/conkeror.png" || die
-
-	doman contrib/man/conkeror.1 || die
-	dodoc CREDITS || die
-	# Use the XULRunner found in the Prefix, not the system's one
-	sed -e "s:/etc/gre.d:\"${EPREFIX}/etc/gre.d\":g" -i "${ED}"/usr/lib/conkeror/contrib/run-conkeror || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/conkeror/conkeror-0.9.3-r1.ebuild b/www-client/conkeror/conkeror-1.0_pre20120223.ebuild
index 75d2e4a961ee..79b501e0d1ca 100644
--- a/www-client/conkeror/conkeror-0.9.3-r1.ebuild
+++ b/www-client/conkeror/conkeror-1.0_pre20120223.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.3-r1.ebuild,v 1.4 2011/12/10 11:01:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20120223.ebuild,v 1.1 2012/03/24 17:41:47 ulm Exp $
 
-EAPI=3
+EAPI=4
 
 inherit eutils fdo-mime
 
@@ -16,11 +16,13 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 # CC-BY-SA-3.0 for conkeror.png
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=net-libs/xulrunner-1.9"
+RDEPEND="|| ( >=net-libs/xulrunner-1.9.1
+		>=www-client/firefox-5.0
+		>=www-client/firefox-bin-5.0 )"
 
 S="${WORKDIR}/${PN}"
 
@@ -30,27 +32,26 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
+	emake CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	insinto /usr/lib/${PN}
+	insinto /usr/share/${PN}
 	doins -r branding chrome components content defaults help locale modules \
-		search-engines style tests || die
-	doins application.ini chrome.manifest Info.plist || die
-
-	exeinto /usr/lib/${PN}
-	doexe conkeror-spawn-helper || die
-	exeinto /usr/lib/${PN}/contrib
-	doexe contrib/run-conkeror || die
-	dosym /usr/lib/${PN}/contrib/run-conkeror /usr/bin/conkeror || die
-	domenu "${FILESDIR}/conkeror.desktop" || die
-	doicon "${WORKDIR}/conkeror.png" || die
-
-	doman contrib/man/conkeror.1 || die
-	dodoc CREDITS || die
-	# Use the XULRunner found in the Prefix, not the system's one
-	sed -e "s:/etc/gre.d:\"${EPREFIX}/etc/gre.d\":g" -i "${ED}"/usr/lib/conkeror/contrib/run-conkeror || die
+		search-engines style tests
+	doins application.ini chrome.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.sh" conkeror
+	domenu "${FILESDIR}/conkeror.desktop"
+	doicon "${WORKDIR}/conkeror.png"
+
+	doman contrib/man/conkeror.1
+	dodoc CREDITS
 }
 
 pkg_postinst() {