Install missing chrome.manifest file. Remove intermediate versions.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 12 insertions, 66 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/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
-}