Version bump. Add icon. Remove old.

Package-Manager: portage-2.2_rc55/cvs/Linux i686

5 files changed, 29 insertions, 64 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/Manifest b/www-client/conkeror/Manifest
index 78a22e1028ce..c636874d276b 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX conkeror.desktop 352 RMD160 3ace51276b409b60ef768f3ce03bcad7d5a68cd3 SHA1 bcee2b64fad256bbed7b11696bd7a4ec315085a7 SHA256 38d2ff76070355983b173e9870679cccda787fc0c69d003b314275ad3d3ec7ea
-DIST conkeror-0.9_pre20090401.tar.gz 230297 RMD160 8dd0bf2fd62b6e5659a05489d466b442cdef72ac SHA1 4459a2e1751fed7eea7ab665f31fc60f3af98b2b SHA256 aac2fd1cccda272e02929225dc6c8ad7c4a85dc84309f2ddecb6743e72800e82
-DIST conkeror-0.9_pre20090724.tar.gz 234383 RMD160 d03eb9f7f893c754974dc3b394d46751d6c9c2a4 SHA1 0608bbc064b301e4356194d8b9e348d5fecd87b6 SHA256 ec903c118457cb0ce60f88e21596d9be46d85b84c42b25d08ae521db66fd4b29
-EBUILD conkeror-0.9_pre20090401.ebuild 1289 RMD160 42d19cdd9d1775c7edac0263a06d699fedcc6bb2 SHA1 35d0dd7a1580a91c27f5ef428a524fc620b63b9a SHA256 d9a74e5073e53507c76734a6f7064bcf1842f33d963838b429f0651147a4fdfe
-EBUILD conkeror-0.9_pre20090724.ebuild 1286 RMD160 488f39f4d4858553ccb858e98a4358875d24146b SHA1 4d34f0086c3fbf36260351c6b161c54fbc6ba89a SHA256 401ffcef9793f29f9027db48ec0e8628f1af7b5b2340e12a0b35658bd56a88b7
-MISC ChangeLog 787 RMD160 a8c1c62bf3bb09a6aaeb37020788e4dc57540e58 SHA1 348c549e0cfebb3a58c49f38df8b96bc98d6cf63 SHA256 33cf8b85c427ea30940662206cc0513aada974f2886e0c4129d16122c41514f2
+AUX conkeror.desktop 353 RMD160 897129e3c2fd95aa2c8b1f87bf2c1111b40525d7 SHA1 274e9761c20533f0720ff4958ded155a6888786d SHA256 dae4a96195bac52b9aee261c8ff82058990cefed2506fb42d222eb30a6c1d8e5
+DIST conkeror-0.9.1.tar.gz 240966 RMD160 c89ed05f026c621f8911e809f17f063f7b991f3c SHA1 8e6e95b27369c9d989e7b9107d4dcfb523225180 SHA256 c258f1ea8fc543b04c3dc5f87a984597587da0fbf894cce5b266f0d777c97fb4
+DIST conkeror.png 4973 RMD160 69f8df5ed865bb5b4babf4289b6e199af63acc4c SHA1 2aec51c4a95eb1bc9c34b1dcec5c518e5f1d9a54 SHA256 601e7a9c812999cbd287c3d4184428f9605aa191b20c972c4fc247699abfdb24
+EBUILD conkeror-0.9.1.ebuild 1535 RMD160 ef7640b462d8850bf58c8dd1c7503ddfb0dd59bf SHA1 a7aba65959683c7191b74feea960dd2964120abf SHA256 49d886fa3312bf6fac6fd89e4836c5060411a9d4c37acf6eb00deeff1f10c871
+MISC ChangeLog 1024 RMD160 5ea87ca4a69d2c2ae7414c6b94d70a8ff1600d9d SHA1 c5e262e7d77651bc0203ada76c71cbb64dc6002a SHA256 aad7996a7a2a5afa97f7159aa0113db6ebf9a7609323e0158a49df00bac87c9b
 MISC metadata.xml 806 RMD160 b93d1f72c51a8a9f96e2b472bfb418e3218256e0 SHA1 cdcdebab3784884e4b047fb9fdc740f341433eb1 SHA256 e803edcb66756cf96234f2f2a1d59fa86642a6ad324ab34df9ad7a290e1298d6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkp9tQoACgkQOeoy/oIi7uwtoACgrsT7NOc3+vo7YM5Bhh7eVAM+
-d5EAoIh13kqfUO5CG7ifPPcvVnaXpJim
-=vJkS
+iEYEARECAAYFAksa2PoACgkQOeoy/oIi7uxFdgCcCVl748cniNrvcauv3zVpxXqe
+Ri8AoOn7PUuF5/9dAYKjUZ59HQ20XfvZ
+=jYQ4
 -----END PGP SIGNATURE-----
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