Install missing chrome.manifest file. Remove intermediate versions.

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

4 files changed, 18 insertions, 74 deletions

diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index fbfe7ffb1c47..624cb84746a6 100644
--- a/www-client/conkeror/ChangeLog
+++ b/www-client/conkeror/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/conkeror
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.16 2010/10/11 16:58:09 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.17 2011/04/03 15:41:21 ulm Exp $
+
+*conkeror-0.9.3-r1 (03 Apr 2011)
+
+  03 Apr 2011; Ulrich Mueller <ulm@gentoo.org>
+  -conkeror-0.9.2_p20100830.ebuild, -conkeror-0.9.3.ebuild,
+  +conkeror-0.9.3-r1.ebuild:
+  Install missing chrome.manifest file. Remove intermediate versions.
 
 *conkeror-0.9.3 (11 Oct 2010)
 
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index 5a0285fa9638..84d325b5fbf6 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -3,18 +3,16 @@ 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.2_p20100830.tar.gz 267328 RMD160 f96463b428d1de585771f4ab35fc25aeef45b352 SHA1 6f74521603e86ecd0e2d3ac9f56a01b95a2d54d7 SHA256 36b43a3e6c3da9b1ff174d8c10bbf622a993926dfd7e542a13781b6461e05a93
 DIST conkeror-0.9.3.tar.gz 269394 RMD160 7cf2c897aefc2bff9f6924c9f6d97651f586dcb1 SHA1 090dd1f420fdda5d7e979d200cd29c9211e5de83 SHA256 430848c6f1fff433771fcafa3bd7df30377bedff7db9293846d1cd7944b7409f
 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.2_p20100830.ebuild 1690 RMD160 bb1888e2be3c1b2528bfd791e6df411cd4d4a5d9 SHA1 9bed4a6805340453757dd032dd4b60198154b9f7 SHA256 681be1b1b96934d6728c671800554afe6d96c66333f09b8563c4ba77f4860c63
-EBUILD conkeror-0.9.3.ebuild 1680 RMD160 c29350c072241aa5977b0796fa6d14a058c2bdf9 SHA1 62d4dbbd3dae393d33633ba31a5b00fa22ad9197 SHA256 9f71cee735f3f2f8e65ae30fc131d8397878311ff9a609fc50c36d669e5ec2aa
-MISC ChangeLog 2276 RMD160 8a6b2cef6ddd24bdf38df63528c051e392cff376 SHA1 fe9a6899f2660b0d574ef17d07757d76dcbd60ec SHA256 88bfec0978159f46457d63f39ff09da938910a0704648d595ab04cf050767011
+EBUILD conkeror-0.9.3-r1.ebuild 1699 RMD160 8e6ee8037dee663f142c46b339e8a9e8e3299613 SHA1 8e166735d3cc483ff0c7ac31d83b2c3e7124422a SHA256 dc9b6299d37d1c6e287cbb62a1b5dbb5c4a76c948c40eedd74643959416d5eea
+MISC ChangeLog 2517 RMD160 36b72f5378faee15bc997be444ed5c5312525913 SHA1 26ea0764feafc739a8cd41a4fe0143c5d4b9cad3 SHA256 ec1907da9838f386335d440e6974f3e505357b0f5fbcbad8641324f613862099
 MISC metadata.xml 806 RMD160 b93d1f72c51a8a9f96e2b472bfb418e3218256e0 SHA1 cdcdebab3784884e4b047fb9fdc740f341433eb1 SHA256 e803edcb66756cf96234f2f2a1d59fa86642a6ad324ab34df9ad7a290e1298d6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyzQpgACgkQOeoy/oIi7uxL3wCg5hSTxA/i9MfmjDqs8vnScRFM
-XYsAoOSVS43gxwBHkp/KMIy31afFimf1
-=Tvoj
+iEYEARECAAYFAk2YlVkACgkQOeoy/oIi7uzjdgCghMZZcv6wng64wYhScctTlnL+
+HQsAoIs8aHyFYMUzd66V6ENYT0StkikP
+=+xXe
 -----END PGP SIGNATURE-----
diff --git a/www-client/conkeror/conkeror-0.9.2_p20100830.ebuild b/www-client/conkeror/conkeror-0.9.3-r1.ebuild
index ec4e95f56aa6..77b0a46dc0f5 100644
--- a/www-client/conkeror/conkeror-0.9.2_p20100830.ebuild
+++ b/www-client/conkeror/conkeror-0.9.3-r1.ebuild
@@ -1,6 +1,6 @@
-# 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_p20100830.ebuild,v 1.1 2010/09/12 06:15:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9.3-r1.ebuild,v 1.1 2011/04/03 15:41:21 ulm Exp $
 
 EAPI=3
 
@@ -36,7 +36,7 @@ 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
+	doins application.ini chrome.manifest Info.plist || die
 
 	exeinto /usr/lib/${PN}
 	doexe conkeror-spawn-helper || die
diff --git a/www-client/conkeror/conkeror-0.9.3.ebuild b/www-client/conkeror/conkeror-0.9.3.ebuild
deleted file mode 100644
index 5fa83999ed84..000000000000
--- a/www-client/conkeror/conkeror-0.9.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.1 2010/10/11 16:58:09 ulm Exp $
-
-EAPI=3
-
-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
-# 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"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-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
-}
-
-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
-	doicon "${WORKDIR}/conkeror.png" || die
-
-	doman contrib/man/conkeror.1 || die
-	dodoc CREDITS || die
-	# 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
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}