Change install location from /usr/lib to /usr/share. Use our own wrapper script instead of the contributed one.

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

4 files changed, 34 insertions, 14 deletions

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index 4ec274e16715..ff328f6e4e13 100644
--- a/www-client/conkeror/ChangeLog
+++ b/www-client/conkeror/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/conkeror
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.21 2011/12/10 11:01:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.22 2011/12/10 19:09:40 ulm Exp $
+
+*conkeror-0.9.4-r1 (10 Dec 2011)
+
+  10 Dec 2011; Ulrich Mueller <ulm@gentoo.org> -conkeror-0.9.4.ebuild,
+  +conkeror-0.9.4-r1.ebuild, +files/conkeror.sh:
+  Change install location from /usr/lib to /usr/share. Use our own wrapper
+  script instead of the contributed one.
 
 *conkeror-0.9.4 (10 Dec 2011)
 
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index b791f23d8adf..ab3b2222eef8 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA1
 
 AUX conkeror.desktop 353 RMD160 897129e3c2fd95aa2c8b1f87bf2c1111b40525d7 SHA1 274e9761c20533f0720ff4958ded155a6888786d SHA256 dae4a96195bac52b9aee261c8ff82058990cefed2506fb42d222eb30a6c1d8e5
+AUX conkeror.sh 326 RMD160 798db77d5948b0e3d1c9064472fd54c1a6c319a7 SHA1 24a7f95ea170a881d2f8aee041942a34755355ae SHA256 8c80cb831a821a5bbf1d299db68f7a78c7aea78f2787f4a759043878dc63ac9d
 DIST conkeror-0.9.3.tar.gz 269394 RMD160 7cf2c897aefc2bff9f6924c9f6d97651f586dcb1 SHA1 090dd1f420fdda5d7e979d200cd29c9211e5de83 SHA256 430848c6f1fff433771fcafa3bd7df30377bedff7db9293846d1cd7944b7409f
 DIST conkeror-0.9.3_p20110401.patch.gz 32702 RMD160 da47fe2c5a15bf82a4e1b353971ffebc341ca941 SHA1 69e29afa050710d9912587de09bd7a88b265febc SHA256 87fce1cf4d90bb8ecf5fe45e19ba34232a359bf5d1737f2f18973ea33d261114
 DIST conkeror-0.9.4.tar.gz 277963 RMD160 d7b474b4a7bbcb3c67f825fa5417d037cbe5a636 SHA1 68618cdd5118ba575cb39d3d5f424147ed16b47f SHA256 50c7e2493d28033bed81e57c7c8b9d33db0a87cfe84e8963aff37a160cf964f2
 DIST conkeror.png 5105 RMD160 f274986d7ffc6227959e4856b59d81b9cd67307e SHA1 4017f236c9518dea84e53e089199e9f6315c18dd SHA256 b11856c32bdec9e9b045df44aa37727f6a3ec18507d376bf27675bc7ee042667
 EBUILD conkeror-0.9.3-r1.ebuild 1761 RMD160 e5c02303ffec7688c4a2baca5a16563302cd4d6f SHA1 b3889efefbdcbf63ec2bb2957c540ffd888b7b36 SHA256 8e25309536350b762f7c67c3c117a847a1cb5e6c7fb467c89a611757c5340d8d
 EBUILD conkeror-0.9.3_p20110401.ebuild 1872 RMD160 8156d932ec5fdfb3c9686c0a676d99e1c802b24b SHA1 5d40911d43637a57873bbe45c09b42ec627a7c76 SHA256 f74c868ad20ae236513f866877b7cddb67437ce4c2f149c66af93253372a6995
-EBUILD conkeror-0.9.4.ebuild 1685 RMD160 5373a7efae097bdca18748bf2e19d008b88d2ef5 SHA1 c6bd44f67f5b1fc812ecb89c3995490312524485 SHA256 5ecb73405fab3915852d89b8ceb8f8824ebc6c3cae74d1c5c303fba8c0c39a2f
-MISC ChangeLog 2991 RMD160 0dee4fa97ab04a20f2872681560f4e98d5cf31dd SHA1 e8e6b3a8875ab38201c59d899c3ca5db710c7499 SHA256 22626de3ce3d0f6961ab71233f57e3a6c5ddce65f86aa41daec2a13fc4d7757b
+EBUILD conkeror-0.9.4-r1.ebuild 1547 RMD160 e3a3c8e395f0ac7e202a713939e177d7ee164e08 SHA1 0e4a2e9160f9062c7d27d11af1aaa3804b083f02 SHA256 258bdebd4bda38626b99a6a36fb436b364a4bd32af109e49a5f6d3ad5431bfd8
+MISC ChangeLog 3262 RMD160 b76927de95df6e4fbb2209dff32667a51cffdc5e SHA1 0db339d6dffa68c3065a5276276e58200d11e68a SHA256 abbe6d11c697e842a7b37b90aa783c80579fcae9c194d47a952c632e652ec2ec
 MISC metadata.xml 785 RMD160 9878d693f2b8867ef4dc9639ab90804608d0695f SHA1 eaff23b02973e00eec33049f776d21076fcdcd1f SHA256 a0ee8ff9435e8fa585668a635233f4390f2db687e92a687d57e263a0b26db309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7jPj4ACgkQOeoy/oIi7uwqHACgjxdIB4eupgVp8VUP66aCzZbJ
-eaUAnRno0Ca58G5mkLnwF0wNE76ooMOS
-=oUW5
+iEYEARECAAYFAk7jsMAACgkQOeoy/oIi7uxQpACg2VdD2ZGi/puZQ+7TT/FESeSo
+wOQAn3NBFbd+LxcyogWBYhPOFm0Qp2Vo
+=xF1g
 -----END PGP SIGNATURE-----
diff --git a/www-client/conkeror/conkeror-0.9.4.ebuild b/www-client/conkeror/conkeror-0.9.4-r1.ebuild
index a0d75bba2bf0..7373745bbf8f 100644
--- a/www-client/conkeror/conkeror-0.9.4.ebuild
+++ b/www-client/conkeror/conkeror-0.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2011/12/10 11:01:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9.4-r1.ebuild,v 1.1 2011/12/10 19:09:40 ulm Exp $
 
 EAPI=4
 
@@ -34,23 +34,22 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/lib/${PN}
+	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/lib/${PN}
+	exeinto /usr/libexec/${PN}
 	doexe conkeror-spawn-helper
-	exeinto /usr/lib/${PN}/contrib
-	doexe contrib/run-conkeror
-	dosym /usr/lib/${PN}/contrib/run-conkeror /usr/bin/conkeror
+	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
-	# 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
 }
 
 pkg_postinst() {
diff --git a/www-client/conkeror/files/conkeror.sh b/www-client/conkeror/files/conkeror.sh
new file mode 100644
index 000000000000..31c6bc98cd0f
--- /dev/null
+++ b/www-client/conkeror/files/conkeror.sh
@@ -0,0 +1,13 @@
+#!/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
+exit 1