Remove old. Don't look for xulrunner in wrapper script.

(Portage version: 2.1.10.56/cvs/Linux x86_64)

3 files changed, 8 insertions, 71 deletions

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index 4f31dba99225..9f9c63cae7c7 100644
--- a/www-client/conkeror/ChangeLog
+++ b/www-client/conkeror/ChangeLog
@@ -1,6 +1,10 @@
 # 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.30 2012/04/19 01:35:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.31 2012/04/19 05:37:13 ulm Exp $
+
+  19 Apr 2012; Ulrich Müller <ulm@gentoo.org> -conkeror-0.9.4-r1.ebuild,
+  files/conkeror.sh:
+  Remove old. Don't look for xulrunner in wrapper script.
 
   19 Apr 2012; Jeff Horelick <jdhore@gentoo.org>
   conkeror-1.0_pre20120223.ebuild:
diff --git a/www-client/conkeror/conkeror-0.9.4-r1.ebuild b/www-client/conkeror/conkeror-0.9.4-r1.ebuild
deleted file mode 100644
index 4be5f2b0a151..000000000000
--- a/www-client/conkeror/conkeror-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.5 2012/04/17 13:04:54 ulm Exp $
-
-EAPI=4
-
-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/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.1"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cp "${DISTDIR}/conkeror.png" . || die
-}
-
-src_compile() {
-	emake 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 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() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/conkeror/files/conkeror.sh b/www-client/conkeror/files/conkeror.sh
index 31c6bc98cd0f..38e135f59c32 100644
--- a/www-client/conkeror/files/conkeror.sh
+++ b/www-client/conkeror/files/conkeror.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 # Wrapper script for conkeror
 
-for cmd in xulrunner-2.0 xulrunner-1.9.2 firefox; do
-    xr=$(type -p ${cmd})
-    if [[ -n ${xr} ]]; then
-	[[ ${cmd} = firefox ]] && xr="${xr} -app"
-	exec ${xr} /usr/share/conkeror/application.ini "$@"
-    fi
-done
-
-echo "$0: xulrunner or firefox required, but not found." >&2
+xr=$(type -p firefox)
+[[ -n ${xr} ]] && exec "${xr}" -app /usr/share/conkeror/application.ini "$@"
+echo "$0: firefox required, but not found." >&2
 exit 1