Version bump. Add icon. Remove old.

(Portage version: 2.2_rc55/cvs/Linux i686)

4 files changed, 20 insertions, 54 deletions

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index eeaa34ec091a..9789e0085f45 100644
--- a/www-client/conkeror/ChangeLog
+++ b/www-client/conkeror/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/conkeror
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.4 2009/08/08 17:23:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.5 2009/12/05 22:02:02 ulm Exp $
+
+*conkeror-0.9.1 (05 Dec 2009)
+
+  05 Dec 2009; Ulrich Mueller <ulm@gentoo.org>
+  -conkeror-0.9_pre20090401.ebuild, -conkeror-0.9_pre20090724.ebuild,
+  +conkeror-0.9.1.ebuild, files/conkeror.desktop:
+  Version bump. Add icon. Remove old.
 
 *conkeror-0.9_pre20090724 (08 Aug 2009)
 
diff --git a/www-client/conkeror/conkeror-0.9_pre20090401.ebuild b/www-client/conkeror/conkeror-0.9.1.ebuild
index f0d81242ecaa..2ac37ad50c82 100644
--- a/www-client/conkeror/conkeror-0.9_pre20090401.ebuild
+++ b/www-client/conkeror/conkeror-0.9.1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9_pre20090401.ebuild,v 1.2 2009/04/29 19:51:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9.1.ebuild,v 1.1 2009/12/05 22:02:02 ulm Exp $
 
 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?a=snapshot;h=master;sf=tgz
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+# snapshot from http://repo.or.cz/w/conkeror.git/snapshot/0b8239a885e397faa878ea475ac07b5769ffcebc.tar.gz
+# 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 )"
 SLOT="0"
@@ -19,6 +21,11 @@ RDEPEND=">=net-libs/xulrunner-1.9"
 
 S="${WORKDIR}/${PN}"
 
+src_unpack() {
+	unpack ${P}.tar.gz
+	cp "${DISTDIR}/conkeror.png" . || die
+}
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die
 }
@@ -35,6 +42,7 @@ src_install() {
 	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
 
 	doman contrib/man/conkeror.1 || die
 	dodoc CREDITS || die
diff --git a/www-client/conkeror/conkeror-0.9_pre20090724.ebuild b/www-client/conkeror/conkeror-0.9_pre20090724.ebuild
deleted file mode 100644
index 7c76a8fdb902..000000000000
--- a/www-client/conkeror/conkeror-0.9_pre20090724.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9_pre20090724.ebuild,v 1.1 2009/08/08 17:23:23 ulm Exp $
-
-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?a=snapshot;h=master;sf=tgz
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=net-libs/xulrunner-1.9"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-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
-
-	exeinto /usr/lib/${PN}
-	doexe conkeror-spawn-helper || die
-	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
-
-	doman contrib/man/conkeror.1 || die
-	dodoc CREDITS || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/conkeror/files/conkeror.desktop b/www-client/conkeror/files/conkeror.desktop
index 144896a11b62..fcf6123c9d44 100644
--- a/www-client/conkeror/files/conkeror.desktop
+++ b/www-client/conkeror/files/conkeror.desktop
@@ -4,7 +4,7 @@ Version=1.0
 Name=Conkeror
 GenericName=Web Browser
 Comment=Conkeror is a Mozilla-based web browser whose design is inspired by GNU Emacs
-Icon=browser
+Icon=conkeror
 TryExec=/usr/bin/conkeror
 Exec=/usr/bin/conkeror %u
 Terminal=false