Version bump, bug 394221. Remove old.

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

5 files changed, 41 insertions, 34 deletions

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index 4ae6c3e24b2e..4ec274e16715 100644
--- a/www-client/conkeror/ChangeLog
+++ b/www-client/conkeror/ChangeLog
@@ -1,6 +1,12 @@
 # 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.20 2011/04/26 09:40:59 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.21 2011/12/10 11:01:06 ulm Exp $
+
+*conkeror-0.9.4 (10 Dec 2011)
+
+  10 Dec 2011; Ulrich Mueller <ulm@gentoo.org> -conkeror-0.9.2.ebuild,
+  +conkeror-0.9.4.ebuild:
+  Version bump, bug 394221. Remove old.
 
   26 Apr 2011; Thomas Kahle <tomka@gentoo.org> conkeror-0.9.3-r1.ebuild:
   x86 stable per bug 361225
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index 7f4b1cca90da..b791f23d8adf 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX conkeror.desktop 353 RMD160 897129e3c2fd95aa2c8b1f87bf2c1111b40525d7 SHA1 274e9761c20533f0720ff4958ded155a6888786d SHA256 dae4a96195bac52b9aee261c8ff82058990cefed2506fb42d222eb30a6c1d8e5
-DIST conkeror-0.9.2.tar.gz 264911 RMD160 f1908019d08a9d4e3452ac20e2fc31a1d6448835 SHA1 0e64d650b825655130b219b9c3326c207aebfbd7 SHA256 525200da9f5aeeb26449fc5580947c283bf68fb2c991bf3c3436f8d8d05c5b0b
 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.2.ebuild 1737 RMD160 9302b5c1fed3bf65c5367b5415d8e7cb0b574d67 SHA1 b664ef51878486e612dcf813dc0e3d825581aecb SHA256 b71d1f8e115c14869600d57adcd37cb0189db07365fe2b53110ad8d3c11f7d34
-EBUILD conkeror-0.9.3-r1.ebuild 1699 RMD160 ab38190f9e2cd68cff1398838031232733314556 SHA1 706eea621d18401c297ae41672ea53b63f67f8b9 SHA256 f7133ddd3f579b4dc666c3db150c95273e66493c141f63334815bcef747a44ab
-EBUILD conkeror-0.9.3_p20110401.ebuild 1808 RMD160 a01d5a28d4f49b8b5dfcbb98e689d440f140b38b SHA1 2d85f004be3bf163d3e1b9fe4ff04e81412e0e44 SHA256 837855f183732af3cf83952fb70cb3b14c0b4fd94fd136369aa970bd7d30d9c6
-MISC ChangeLog 2824 RMD160 e727eb4ac91f26ca4150ad7b7c5bd28b46fdd1ea SHA1 b25c815a9cf4223ff539eb0fe4e91dc2929e888b SHA256 7899603f661b16de62a9568828f681542c300cf44dc1f1984ded0c7a05753a25
+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
 MISC metadata.xml 785 RMD160 9878d693f2b8867ef4dc9639ab90804608d0695f SHA1 eaff23b02973e00eec33049f776d21076fcdcd1f SHA256 a0ee8ff9435e8fa585668a635233f4390f2db687e92a687d57e263a0b26db309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59twkACgkQfXuS5UK5QB1HSgQAjHnWLa2OKUgEkl4nx+OgWO9A
-qgYzvbd2OwfQQ66Gfr0hX2Pz/z5/0L9mDZrx21dKkGWfP+py1lczRHJCR8tgGAEq
-sQLEtGcbI/625aci9zctpjPcgGE9qH7peZmmo21xmy0MsxdzejcT6XC4jMjK5D9B
-oWM4g/U3MsuPgeuEjPU=
-=fbex
+iEYEARECAAYFAk7jPj4ACgkQOeoy/oIi7uwqHACgjxdIB4eupgVp8VUP66aCzZbJ
+eaUAnRno0Ca58G5mkLnwF0wNE76ooMOS
+=oUW5
 -----END PGP SIGNATURE-----
diff --git a/www-client/conkeror/conkeror-0.9.3-r1.ebuild b/www-client/conkeror/conkeror-0.9.3-r1.ebuild
index 504f0549dce5..75d2e4a961ee 100644
--- a/www-client/conkeror/conkeror-0.9.3-r1.ebuild
+++ b/www-client/conkeror/conkeror-0.9.3-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.3-r1.ebuild,v 1.3 2011/04/26 09:40:59 tomka Exp $
+# $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 $
 
 EAPI=3
 
@@ -13,7 +13,8 @@ HOMEPAGE="http://conkeror.org/"
 SRC_URI="mirror://gentoo/${P}.tar.gz
 	mirror://gentoo/conkeror.png"
 
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+# 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=""
diff --git a/www-client/conkeror/conkeror-0.9.3_p20110401.ebuild b/www-client/conkeror/conkeror-0.9.3_p20110401.ebuild
index 2e6ce65a5774..1ff4df43ab07 100644
--- a/www-client/conkeror/conkeror-0.9.3_p20110401.ebuild
+++ b/www-client/conkeror/conkeror-0.9.3_p20110401.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.3_p20110401.ebuild,v 1.1 2011/04/03 17:18:53 ulm Exp $
+# $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
 
@@ -14,7 +14,8 @@ SRC_URI="mirror://gentoo/${P%_*}.tar.gz
 	mirror://gentoo/${P}.patch.gz
 	mirror://gentoo/conkeror.png"
 
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+# 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=""
diff --git a/www-client/conkeror/conkeror-0.9.2.ebuild b/www-client/conkeror/conkeror-0.9.4.ebuild
index b4adbfc19db0..a0d75bba2bf0 100644
--- a/www-client/conkeror/conkeror-0.9.2.ebuild
+++ b/www-client/conkeror/conkeror-0.9.4.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2.ebuild,v 1.3 2010/05/25 21:11:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9.4.ebuild,v 1.1 2011/12/10 11:01:06 ulm Exp $
 
-EAPI=3
+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/snapshot/0b8239a885e397faa878ea475ac07b5769ffcebc.tar.gz
+# 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"
 
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+# 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"
 
 S="${WORKDIR}/${PN}"
 
@@ -29,27 +30,27 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
+	emake CFLAGS="${CFLAGS}"
 }
 
 src_install() {
 	insinto /usr/lib/${PN}
 	doins -r branding chrome components content defaults help locale modules \
-		search-engines style tests || die
-	doins application.ini Info.plist || die
+		search-engines style tests
+	doins application.ini chrome.manifest Info.plist
 
 	exeinto /usr/lib/${PN}
-	doexe conkeror-spawn-helper || die
+	doexe conkeror-spawn-helper
 	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
+	doexe contrib/run-conkeror
+	dosym /usr/lib/${PN}/contrib/run-conkeror /usr/bin/conkeror
+	domenu "${FILESDIR}/conkeror.desktop"
+	doicon "${WORKDIR}/conkeror.png"
 
-	doman contrib/man/conkeror.1 || die
-	dodoc CREDITS || die
+	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 || die
+	sed -e "s:/etc/gre.d:\"${EPREFIX}/etc/gre.d\":g" -i "${ED}"/usr/lib/conkeror/contrib/run-conkeror
 }
 
 pkg_postinst() {