Version bump, bug 394221. Remove old.

(Portage version: 2.1.10.39/cvs/Linux x86_64)

4 files changed, 32 insertions, 23 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/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() {