Bump www-plugins and support seamonkey etc via mv_mozextension.eclass

4 files changed, 39 insertions, 64 deletions

diff --git a/www-plugins/better-privacy/ChangeLog b/www-plugins/better-privacy/ChangeLog
index 81fed5bf..6945ee73 100644
--- a/www-plugins/better-privacy/ChangeLog
+++ b/www-plugins/better-privacy/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  06 Jun 2010; Martin Väth <martin@mvath.de>
+  +better-privacy-1.47.4-r1.ebuild -better-privacy-1.47.4.ebuild:
+  Switch to new mv_mozextension.eclass:
+  Installs also for other mozilla variants like seamonkey.
+
 *better-privacy-1.47.4 (22 Apr 2010)
 
   22 Apr 2010; Martin Väth <martin@mvath.de>
diff --git a/www-plugins/better-privacy/Manifest b/www-plugins/better-privacy/Manifest
index 18f6e55f..2b6ae5b8 100644
--- a/www-plugins/better-privacy/Manifest
+++ b/www-plugins/better-privacy/Manifest
@@ -1,4 +1,4 @@
 DIST betterprivacy-1.47.4-sm+fx.xpi 110021 RMD160 8bae58a544312460d416c759f425780d92191bac SHA1 dae915b9337880aefc335947d5a37a3d0750a1e1 SHA256 e1f1e83ac608f0fdc33f66f60db4f47863e605eb8d8b52b1b99ca0b62ede1ba1
-EBUILD better-privacy-1.47.4.ebuild 1700 RMD160 3b323ed32a0c86a91411d84c2e5a10c703e36928 SHA1 49affddd6ce73bc8d704dee80640e36559f06618 SHA256 21bb4aa12f8d6db18efa9c7cd5d60260424c9300bc748b9c6550a724683939b4
-MISC ChangeLog 703 RMD160 1f3b1d03601d1430a44292ffb9d247dc33b6689c SHA1 477a89b9bf6d36bba696d976c23d9a2e2e07022a SHA256 4ae88b42f31f09a4ed37afa40212f5e8e7a82a7092856b5939fdf368f0f7a416
+EBUILD better-privacy-1.47.4-r1.ebuild 834 RMD160 cdfd4da9dad329b7af9feb9ec4c6db5a1ffca673 SHA1 f8d7fe7502520594b5b7b7d1fa5434834a82d9f1 SHA256 df03e3e2f83180fb9a67252b07b7c97edc0a0272f9797ad7302b6285c29b5965
+MISC ChangeLog 933 RMD160 3d5b2fd7b551ff570749f45fcc778810bd3fc854 SHA1 eec55368896c4035747119ad14aa9881339a4a3e SHA256 9f23bfb6af3504ccd07624b240d782f9ee3574e4a0353eb8589d5ceca06c0289
 MISC metadata.xml 264 RMD160 4c10b5dfc6857fcb2e9cdc91ff64bb5d4a5c2204 SHA1 69886f7e401bdf99a78d428ff4361991607e86c6 SHA256 dd28333300fc1ec2dbd96450bddbdd9e1061c1eff809e687442c53c91c05d86d
diff --git a/www-plugins/better-privacy/better-privacy-1.47.4-r1.ebuild b/www-plugins/better-privacy/better-privacy-1.47.4-r1.ebuild
new file mode 100644
index 00000000..20513369
--- /dev/null
+++ b/www-plugins/better-privacy/better-privacy-1.47.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+EAPI="3"
+inherit mv_mozextension
+RESTRICT="mirror"
+
+DESCRIPTION="Firefox plugin for long time cookies like ~/.adobe/Flash_Player/AssetCache/*/*"
+HOMEPAGE="https://addons.mozilla.org/firefox/addon/6623"
+MY_P="${P/-/}"
+MY_P="${MY_P%_alpha*}"
+MY_P="${MY_P%_beta*}"
+MY_P="${MY_P}-sm+fx"
+FILENAME="${MY_P}.xpi"
+SRC_URI="https://addons.mozilla.org/de/firefox/downloads/latest/6623/${FILENAME}"
+case "${PV}" in
+*_alpha*|*_beta*)
+SRC_URI="https://addons.mozilla.org/de/firefox/downloads/file/76929/${FILENAME}?confirmed -> ${FILENAME}"
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+flash"
+
+ALL_DEPEND="flash? ( www-plugins/adobe-flash )"
+RDEPEND="${RDEPEND}
+${ALL_DEPEND}"
+DEPEND="${DEPEND}
+${ALL_DEPEND}"
+
diff --git a/www-plugins/better-privacy/better-privacy-1.47.4.ebuild b/www-plugins/better-privacy/better-privacy-1.47.4.ebuild
deleted file mode 100644
index 16efdc35..00000000
--- a/www-plugins/better-privacy/better-privacy-1.47.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-EAPI="2"
-inherit mozextension multilib
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox plugin for long time cookies like ~/.adobe/Flash_Player/AssetCache/*/*"
-HOMEPAGE="https://addons.mozilla.org/firefox/addon/6623"
-MY_P="${P/-/}"
-MY_P="${MY_P%_alpha*}"
-MY_P="${MY_P%_beta*}"
-MY_P="${MY_P}-sm+fx"
-FILENAME="${MY_P}.xpi"
-SRC_URI="https://addons.mozilla.org/de/firefox/downloads/latest/6623/${FILENAME}"
-case "${PV}" in
-*_alpha*|*_beta*)
-SRC_URI="https://addons.mozilla.org/de/firefox/downloads/file/76929/${FILENAME}?confirmed -> ${FILENAME}"
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+flash"
-
-RDEPEND="flash? ( www-plugins/adobe-flash )
-|| (
-	>=www-client/mozilla-firefox-bin-1.5.0.7
-	>=www-client/mozilla-firefox-1.5.0.7
-)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	xpi_unpack "${FILENAME}"
-}
-
-# xpi_install is buggy: The detection of emid fails
-my_xpi_install() {
-	local emid
-	x="${1}"
-	cd ${x}
-	# determine id for extension
-	emid=$(sed -n -e '/install-manifest/,$ { /<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q }' ${x}/install.rdf) \
-		&& [ -n "${emid}" ] || die "failed to determine extension id"
-	insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid}
-	doins -r "${x}"/* || die "failed to copy extension"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME
-	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-		my_xpi_install "${S}"/"${MY_P}"
-	fi
-	if has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/opt/firefox"
-		my_xpi_install "${S}"/"${MY_P}"
-	fi
-}