New snapshot. Fix wrapper script, bug 457820.

Package-Manager: portage-2.1.11.51/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

4 files changed, 98 insertions, 15 deletions

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index e1cc18821df1..f98897d869a4 100644
--- a/www-client/conkeror/ChangeLog
+++ b/www-client/conkeror/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2013/02/07 22:42:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.34 2013/02/17 22:34:54 ulm Exp $
+
+*conkeror-1.0_pre20130213 (17 Feb 2013)
+
+  17 Feb 2013; Ulrich Müller <ulm@gentoo.org> +files/conkeror-r1.sh,
+  +conkeror-1.0_pre20130213.ebuild:
+  New snapshot. Fix wrapper script, thanks to Jauhien Piatlicki
+  <piatlicki@gmail.com> in bug 457820.
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org> conkeror-1.0_pre20120223.ebuild,
   conkeror-1.0_pre20120527.ebuild:
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index d34b4b7f5148..be4af3fc7ef5 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -1,29 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX conkeror-r1.sh 260 SHA256 82bd1f26e22f758d898b21590181db1a45a857f7a54acb90d2a879ff8fcad30d SHA512 d65b7b8f38382a73236d2057862b8e473f62a68cd20ff8794723dabf5a84aebb16e006cacff7d6d3696f906c20ef31ef739df1f4fcb42b06ba3fd315d8d14afd WHIRLPOOL e4c6c8c7ea9220870c271872d85921d111d6b1edc492a5cd178c32e4bcb9449533ea1dc7b6cb7199de87ac48005e929fa926677c77c4840a941fe8c38acbe8c6
 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
 DIST conkeror-1.0_pre20120527.tar.gz 290066 SHA256 77a0790a187fe018ad540bcfc70feb4ee9754a2feb896f536310f365cab15a15 SHA512 e5ccee767cb8b37a4eb881ee71f83f5da76d9a753f6dbac100499ea402c25684bfb6eac435ae5b4ceb78fd075d9e50db1c025446dd55871eb7f6fb02f3cef34b WHIRLPOOL 19984d31c97449a3fe2989f76a8bc2923435a06be76ead0264327e50cc581ebbbf74cddfe6e8d18b8dafa97b4f6fc23662e0f2fb37b9f8ec8cec81396d810524
+DIST conkeror-1.0_pre20130213.tar.gz 298309 SHA256 7432ef654269da136ac5e2936c1188b743d69f3d90222ad1b22e52564b2b0645 SHA512 93efcd34ffde1f1ee942367d990883b85e4f533bcec6f7cc7c908a04841009fe62bcc76fa0f50a52bf7dc2f8969430ad3ebbc6aab3941e4d72972a03408ab19e WHIRLPOOL 5fdb4c7c9c3d30a72c72cedc1f8a3ed30b283d24a888a2b911eb8c495ab8cfa71bdc7a9b4077735a23eda588317d5219e6764d67c231dd903565249c176ea954
 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_pre20120527.ebuild 1597 SHA256 178a0b296119cc05a80cb14064a052781286e8c2d69e919910e16fcd407e0029 SHA512 81a0d2eda2f5aabeb9b8ee91f7d8717b3f6e3ca74e35519df53d48410f761fe34ef7829ad47e49b727436034fc3154691fb55c49ae6dc8ec6b3b7f2f33fa02ca WHIRLPOOL bfb30b3ef69cf466f179e85d5d1dd895f7e3dfa2002df31cf476c8a7519856498930bf8db2f0865dea88f0e8b8a034a0208ed64741181f366ec5da99765a7a84
-MISC ChangeLog 5019 SHA256 70304fb9b026b8da8fb4ac4c1c6898acc010f3a9964e181dace65c23ae20a3ef SHA512 8a6522bb6e8d2b54d2919a06b97e33e62b1203c68d85478b8d9708ce60d78244b5028aef96f1e28b3f6bc55bc3c1ec744a66acac7a5e7646eb143da497152797 WHIRLPOOL 81f1bc288c741dc6d30aa049f7c900434e281d09ca3c3bf7ce6fe114b3903a04d55468bb80a1ae683da591a53a1f94259d0cd6f133120ed3ffbf81e8f59ba46a
+EBUILD conkeror-1.0_pre20130213.ebuild 1600 SHA256 007b02b29efd31f82599a6ba89e027e897da109d60e99a552e6dfa2b1f5a92d9 SHA512 394d8e05b6a9ce6ccebab57ee0d57c37c6ca99665ae806f9029f30431e74db76df90e27c202c578715ffe40d0161f82264aa5da0480be83cfd533c69dbda3a37 WHIRLPOOL e034e8be34ef44591613bed01d12f0bae8f42f54ff441e0de23143efebcd36f889dd707fb75cd03ff8f460ebaa3afbb135509b71debf00e0115442bd9d23f8c8
+MISC ChangeLog 5270 SHA256 721d5c24622cec856c1f02a243a84e12134ab81cfb056e64592d94415d10f6c6 SHA512 124c57dc59289dfbb350353596db59b2168ab11cd2abb4c477b1b063994775d2e1bba7a41b5e9b400847b0e46496b46739f979980834447807fd7692def5ecc5 WHIRLPOOL e32106956844a07875d2e20ef3138b2f7ad90914afd3551b7ac635b3330ca48d3c37440753fc0fcd13f9ac08a49d01c0822da9065f80a81a5fe51599c63720b8
 MISC metadata.xml 785 SHA256 a0ee8ff9435e8fa585668a635233f4390f2db687e92a687d57e263a0b26db309 SHA512 bb9e6dcd8566bfcbfb37b70f7589052f768440661bf08de92dd116577ac801d9a1c4cecd918c0e3f691ef73dc015ed71a62fdd3e09945057bc249a85ef9456be WHIRLPOOL 96059be3f8f61b6de21e6e6c8b87e34413fa2d5a42dc8e34340b25ea6e13b15a7e32d622144dd4dc6fb5fb5fd21e3401784aac6128151ed818ae0ee76eb2532d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFC7SAAoJEDxpGckxwJCB9xwP/2Zl2eqV0iAF8VH1HQv08vlc
-RZ+LsHDECc/cbf9u+IrzY64psxfiaqXyi2RahuQGsglc8e/HiRHJDZWIuu1Mnpc0
-i+b6/5akul80CanoDR6+lcCcuO4lQD7K0cf7RcPxTM+tIAhCqD+UDXlatt0DPmUs
-g7uT8dEA9xBzXL6dyBHzep2GK58//mxBCmR48K7kmi1KPMNillfJUrNof22M/c/I
-lW0cjIddqhm+ZFpjHQqomcz1BhFBeNr1B5jAwAEy0iHGYnxu1RfougSdP0d4gy/v
-CGYgC7H9lFCwqv6+iXavzsnekF4sR+FBzPA/L7WSqI0Higib8ciXb9CaMwgb7Jgj
-MC+sBnCZBCIHJ3E8BGrJtesP4bXcpkppAuTO8WjlIUo3GFhu31BiwhM+tLxjVLrU
-oxCk1ZtO4UYaTMlDJF84Hh+kbgHjLZvE2UpzNF8ESmIBH/YSyLA0qORT2t3dddYq
-ZOR8Y0Prw2RuFDtRnf9nnhFPdGoGBv1kcnzMx3vtez+7dDFo7BOIbW5WAKQBUjbO
-qyq99/rHsAe1J4/62HSRqrMDNFzR3KTiTJpPc70NMsYJZ7WN4YSIad7ynCPNmzev
-77009ervaqFqgYtM3cvn0Pw9IDSmQDTcorJRg8Ue3cAXAYOENics+iQpstOYdZr8
-uY8LI7sfKN794386HBLT
-=QKx3
+iQIcBAEBCAAGBQJRIVwNAAoJEDxpGckxwJCBe5EP/1wo4RWzXtwUEtPE0SLaLRzH
+zpHK9S6Uu4aAT9EAEaCPQGbG4TbQiTAzRb/8dG1eXww7UMzeerR57IEFI2C8fcyc
+1m1+BTUsKYq6Y1Q/HBL+M8VsEXPShdLwha5M2UmxPDQyjvPSxyJ4K24A9DaWSIur
+ZHBt2ravLE8ZGBU31ZYJO1UHhEiRJGlca6ChPwSMzYPXgrVk50UXVLyW81jwURpV
+FsBrEzysfNktU8EhvOB1c8wI2GW4neh2iswOpmVmhr2DT3mrC08zruJFL5zj3FPi
+EihUDFRAWySXTchbJfTpYtSeME4fvRx2hRwZBg9O45MNH097ArqGjGPz718BBVPL
+XOHUrNBVFaYGDM63TWIV6HGKsS8aSmbAC8Q9q3SKeVwtTCl2mhgDKDVlHYukjWO6
+xbbxFErP496on23U+bwvVWizcd8e2OtYgwDHItTXqFyzc/T+btlLzZNgzgkiWPRd
+ITkNnPWQdUeBbMUmxcuSn/d4VE5yFKgc3few2NrdjQarRZufLmFzLoEUzWD7W4kb
+CBs4PWvv8YqNevx3tpO41FawB2goI1u+sparF3QY/VlpYHdVYWEaaRIBm1ABjUOl
+M4X03XpGUw+o6u90rROylXm/brXIyRpr4sfl9cif35ddhnzkuEiQt/3hkZ1MRqEC
+ABd+4scdHWw8IOA/VnvI
+=83nO
 -----END PGP SIGNATURE-----
diff --git a/www-client/conkeror/conkeror-1.0_pre20130213.ebuild b/www-client/conkeror/conkeror-1.0_pre20130213.ebuild
new file mode 100644
index 000000000000..44ed524db583
--- /dev/null
+++ b/www-client/conkeror/conkeror-1.0_pre20130213.ebuild
@@ -0,0 +1,61 @@
+# 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_pre20130213.ebuild,v 1.1 2013/02/17 22:34:54 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"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-5.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/files/conkeror-r1.sh b/www-client/conkeror/files/conkeror-r1.sh
new file mode 100644
index 000000000000..e00077b78f1e
--- /dev/null
+++ b/www-client/conkeror/files/conkeror-r1.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Wrapper script for conkeror
+
+for cmd in firefox firefox-bin; do
+    xr=$(type -p ${cmd})
+    if [[ -n ${xr} ]]; then
+ 	exec "${xr}" -app /usr/share/conkeror/application.ini "$@"
+    fi
+done
+
+echo "$0: firefox required, but not found." >&2
+exit 1