diff --git a/www-plugins/adblock_plus/Manifest b/www-plugins/adblock_plus/Manifest
index c89066932..b68afa73a 100644
--- a/www-plugins/adblock_plus/Manifest
+++ b/www-plugins/adblock_plus/Manifest
@@ -1,4 +1,2 @@
-DIST adblock_plus-2.6.5.xpi 979610 SHA256 bbad327550b3eecc0cdbf7895c87b22f5781be53bef4be3ef0f8cff71372fb52 SHA512 b8abeb14b0a213b3e584ac4bf785e0fd627b61fa9749906964532f6be5bac5e3b47b7eb9361972953b907ccca7bf24e015e1fb9dc4393b175922435c1e6eabf2 WHIRLPOOL 19bea9b08f3b60403446eb4df88bf0907c7b67b1631e337b1315b01de2c4391518495ac0ba95b684630b861b9f9cdf0f092cf90d3b9cba5db462d7fe8569942f
-DIST adblock_plus-2.6.6.xpi 979699 SHA256 814a6f7f3fe42d02b3afa7047994c55606a48216e49d1eccab9c0f600e642f3c SHA512 5d8908fc8c300be88fc371721d0ecb0c2b55dffbda3819a6a6a6d085c59e09eb7a58e601cfad57743de9f5d6011dab0bee6923a62092437131dca7272c2a4af4 WHIRLPOOL f2ded0849dbe35c1e9c48736b29ce4c41a79df08e113b78b2ba776a3b279d3b5331d2333068b373372b6bd6c0f1348c6a0f0920324270bbaf774a85dadafb6c5
 DIST adblock_plus-2.6.7.xpi 985112 SHA256 9b550e2e30a2f4b702f853fab399c2b32f12254954ae27061c526ec29fb583fd SHA512 1991f856732e4ff80e97dfc019961181464e729829b38db26eea7983fe30d10e9bf5aac6b52b76b42b59d114fb80d1019f5c43ff22d838be896ee6212a7be168 WHIRLPOOL b3f7fd4272eed6034669c7608d5827d1e8e3520e7869cdf9205025d2b190e7287c1c3b57fabd13ce9ba661e93fc74145c9608ee56c1f7a8b21dc7c50e0c3f6cd
 DIST adblock_plus-9999.xpi 985112 SHA256 9b550e2e30a2f4b702f853fab399c2b32f12254954ae27061c526ec29fb583fd SHA512 1991f856732e4ff80e97dfc019961181464e729829b38db26eea7983fe30d10e9bf5aac6b52b76b42b59d114fb80d1019f5c43ff22d838be896ee6212a7be168 WHIRLPOOL b3f7fd4272eed6034669c7608d5827d1e8e3520e7869cdf9205025d2b190e7287c1c3b57fabd13ce9ba661e93fc74145c9608ee56c1f7a8b21dc7c50e0c3f6cd
diff --git a/www-plugins/adblock_plus/adblock_plus-2.6.5.ebuild b/www-plugins/adblock_plus/adblock_plus-2.6.5.ebuild
deleted file mode 100644
index a6f4ad218..000000000
--- a/www-plugins/adblock_plus/adblock_plus-2.6.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="280498"
-DESCRIPTION="Firefox extension to block annoying ads automatically, no distractions."
-HOMEPAGE="http://adblockplus.org/en/firefox"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-	)"
diff --git a/www-plugins/adblock_plus/adblock_plus-2.6.6.ebuild b/www-plugins/adblock_plus/adblock_plus-2.6.6.ebuild
deleted file mode 100644
index 6cd2042aa..000000000
--- a/www-plugins/adblock_plus/adblock_plus-2.6.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="283972"
-DESCRIPTION="Firefox extension to block annoying ads automatically, no distractions."
-HOMEPAGE="http://adblockplus.org/en/firefox"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_thunderbird target_seamonkey target_firefox-bin target_thunderbird-bin target_seamonkey-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox thunderbird seamonkey firefox-bin thunderbird-bin seamonkey-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-	use target_thunderbird && MZA_TARGETS+=" thunderbird"
-	use target_thunderbird-bin && MZA_TARGETS+=" thunderbird-bin"
-	use target_seamonkey && MZA_TARGETS+=" seamonkey"
-	use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-		target_seamonkey? ( www-client/seamonkey )
-		target_seamonkey-bin? ( www-client/seamonkey-bin )
-		target_thunderbird? ( mail-client/thunderbird )
-		target_thunderbird-bin? ( mail-client/thunderbird-bin )
-	)"
diff --git a/www-plugins/adblock_plus/adblock_plus-2.6.7.ebuild b/www-plugins/adblock_plus/adblock_plus-2.6.7.ebuild
index 61155b2bc..c2e1cd95a 100644
--- a/www-plugins/adblock_plus/adblock_plus-2.6.7.ebuild
+++ b/www-plugins/adblock_plus/adblock_plus-2.6.7.ebuild
@@ -16,18 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_thunderbird target_seamonkey target_firefox-bin target_thunderbird-bin target_seamonkey-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox thunderbird seamonkey firefox-bin thunderbird-bin seamonkey-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-	use target_thunderbird && MZA_TARGETS+=" thunderbird"
-	use target_thunderbird-bin && MZA_TARGETS+=" thunderbird-bin"
-	use target_seamonkey && MZA_TARGETS+=" seamonkey"
-	use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
@@ -37,3 +25,18 @@ RDEPEND="
 		target_thunderbird? ( mail-client/thunderbird )
 		target_thunderbird-bin? ( mail-client/thunderbird-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox thunderbird seamonkey firefox-bin thunderbird-bin seamonkey-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+		use target_thunderbird && MZA_TARGETS+=" thunderbird"
+		use target_thunderbird-bin && MZA_TARGETS+=" thunderbird-bin"
+		use target_seamonkey && MZA_TARGETS+=" seamonkey"
+		use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/adblock_plus/adblock_plus-9999.ebuild b/www-plugins/adblock_plus/adblock_plus-9999.ebuild
index 2ae76eaed..6bcd948e7 100644
--- a/www-plugins/adblock_plus/adblock_plus-9999.ebuild
+++ b/www-plugins/adblock_plus/adblock_plus-9999.ebuild
@@ -16,18 +16,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_thunderbird target_seamonkey target_firefox-bin target_thunderbird-bin target_seamonkey-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox thunderbird seamonkey firefox-bin thunderbird-bin seamonkey-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-	use target_thunderbird && MZA_TARGETS+=" thunderbird"
-	use target_thunderbird-bin && MZA_TARGETS+=" thunderbird-bin"
-	use target_seamonkey && MZA_TARGETS+=" seamonkey"
-	use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
@@ -38,6 +26,21 @@ RDEPEND="
 		target_thunderbird-bin? ( mail-client/thunderbird-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox thunderbird seamonkey firefox-bin thunderbird-bin seamonkey-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+		use target_thunderbird && MZA_TARGETS+=" thunderbird"
+		use target_thunderbird-bin && MZA_TARGETS+=" thunderbird-bin"
+		use target_seamonkey && MZA_TARGETS+=" seamonkey"
+		use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/cookies_exportimport/cookies_exportimport-1.0-r2.ebuild b/www-plugins/cookies_exportimport/cookies_exportimport-1.0-r2.ebuild
index 7508a1e4d..44a5ec218 100644
--- a/www-plugins/cookies_exportimport/cookies_exportimport-1.0-r2.ebuild
+++ b/www-plugins/cookies_exportimport/cookies_exportimport-1.0-r2.ebuild
@@ -17,14 +17,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
@@ -36,3 +28,14 @@ RDEPEND="
 	# also see: bug https://bugs.gentoo.org/show_bug.cgi?id=515192
 #	epatch "${FILESDIR}/${PV}-install.rdf.patch" || die 'epatch failed'
 #}
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/cookies_exportimport/cookies_exportimport-9999.ebuild b/www-plugins/cookies_exportimport/cookies_exportimport-9999.ebuild
index 5f114f526..ec2fb5027 100644
--- a/www-plugins/cookies_exportimport/cookies_exportimport-9999.ebuild
+++ b/www-plugins/cookies_exportimport/cookies_exportimport-9999.ebuild
@@ -17,14 +17,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
@@ -36,3 +28,14 @@ src_prepare(){
 	# also see: bug https://bugs.gentoo.org/show_bug.cgi?id=515192
 	epatch "${FILESDIR}/${PV}-install.rdf.patch" || die 'epatch failed'
 }
+
+src_install(){
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+mozilla-addon_src_install
+}
diff --git a/www-plugins/exif_viewer/exif_viewer-2.00-r3.ebuild b/www-plugins/exif_viewer/exif_viewer-2.00-r3.ebuild
index 731c7a52d..0ced91607 100644
--- a/www-plugins/exif_viewer/exif_viewer-2.00-r3.ebuild
+++ b/www-plugins/exif_viewer/exif_viewer-2.00-r3.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/exif_viewer/exif_viewer-9999.ebuild b/www-plugins/exif_viewer/exif_viewer-9999.ebuild
index cd66f0b3b..2038fcf8d 100644
--- a/www-plugins/exif_viewer/exif_viewer-9999.ebuild
+++ b/www-plugins/exif_viewer/exif_viewer-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/firebug/Manifest b/www-plugins/firebug/Manifest
index 2e8cdee89..1215d911b 100644
--- a/www-plugins/firebug/Manifest
+++ b/www-plugins/firebug/Manifest
@@ -1,4 +1,2 @@
-DIST firebug-1.12.8b_p1.xpi 2298151 SHA256 35487d1b5bbade128dd230364b3619e7f0e6942fcb802a1896236e035d6fb32f SHA512 d013c90f442ecf90f0779d4bd2aed30c2fd522a562fc13ed8f9a143c87d18423f4cd9091377a98e42f7b81be58adfd5216299a5dfbb63e5819b7747f56c87a1b WHIRLPOOL 468d7e054fd529d5c901d2f07224c134c18801b52f6ad15c3845f44efad6c2e332d7c2be13e12086bb0c2d11c4ae7b6caa9cb3575cdeab91cef2229ea0aa057f
-DIST firebug-2.0.6.xpi 2551527 SHA256 41b593a5933be31a693af5f2208156a369b34fa608c6d5b207eec0d2fd0baad3 SHA512 59145a4633ef27c8fc20720d08372c1c91bf2663ffa1dc3077646da0ddb18e331212f289869e974e318eb76d68befed0ce3b44039cc1b4c13a8a86e268dea95b WHIRLPOOL d40bf46dcc3300fe67deef2ce598e1f646c0541a0aa11c26903206128c27d6846c418644f4ae8077af4d84b269ef30a6ade5b49ba33ccdd19d9b8022f4e2395b
 DIST firebug-2.0.7.xpi 2551635 SHA256 7a8b3de6691d20aef178621bf7f5e000f0271d1e6811a3f8a21984024c365016 SHA512 c90796ad76e6bce4a22f37cf6c790e237dd853fa5f8192a6ad213205739c4e4c9f64f20d6563d29da6ebe6424cf6ab98da4142d8b6a7d20f73d850a81bc3e68c WHIRLPOOL cbb24c56ab950349ef93b217cf6a479c40c0af458e04047f4276154b3d8d0a665d1a25168d4254f9adab8d1d93b888c632f7e64259902fa7c7b5004fc7b20ad7
 DIST firebug-9999.xpi 2551632 SHA256 6723fb792aa286016be9675ffb96dd314e707b7e3264d9c931807b0a0e14d767 SHA512 e6546021eba68e8e1b9373d8c595d16ee70c22c09f9b717f930a8ddae7afc7fc8a1cab7b102df8780823c3c200300c88979d1b460fd32e904c68fea4087d1f6a WHIRLPOOL e512ea10998b433e19c19fc90d2f8194248b70b357daea2382ce80c656805c4921e2831f201f19bf9114adb85e2d8f4ac42ad44ffbf44d0f12806f98a8ea716e
diff --git a/www-plugins/firebug/firebug-1.12.8b_p1.ebuild b/www-plugins/firebug/firebug-1.12.8b_p1.ebuild
index 4ff4594d4..e0527fc95 100644
--- a/www-plugins/firebug/firebug-1.12.8b_p1.ebuild
+++ b/www-plugins/firebug/firebug-1.12.8b_p1.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( >=www-client/firefox-23.0 )
 		target_firefox-bin? ( >=www-client/firefox-bin-23.0 )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/firebug/firebug-2.0.6.ebuild b/www-plugins/firebug/firebug-2.0.6.ebuild
deleted file mode 100644
index 20e65f241..000000000
--- a/www-plugins/firebug/firebug-2.0.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="282878"
-DESCRIPTION="Powerful web development tool for firefox"
-HOMEPAGE="http://getfirebug.com"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="BSD"
-SLOT="0"
-# blocked because it pulls firefox-bin when I want to keep firefox only
-KEYWORDS="~amd64 ~x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( >=www-client/firefox-31.2.0-r1 )
-		target_firefox-bin? ( >=www-client/firefox-bin-31.2.0-r1 )
-	)"
diff --git a/www-plugins/firebug/firebug-2.0.7.ebuild b/www-plugins/firebug/firebug-2.0.7.ebuild
index 1b2a2516c..6a22ae0e6 100644
--- a/www-plugins/firebug/firebug-2.0.7.ebuild
+++ b/www-plugins/firebug/firebug-2.0.7.ebuild
@@ -17,16 +17,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( >=www-client/firefox-31.2.0-r1 )
 		target_firefox-bin? ( >=www-client/firefox-bin-31.2.0-r1 )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/firebug/firebug-9999.ebuild b/www-plugins/firebug/firebug-9999.ebuild
index 09c0d983c..96f7cf391 100644
--- a/www-plugins/firebug/firebug-9999.ebuild
+++ b/www-plugins/firebug/firebug-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( >=www-client/firefox-31.2.0-r1 )
 		target_firefox-bin? ( >=www-client/firefox-bin-31.2.0-r1 )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src-install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/firecat/firecat-2.0.ebuild b/www-plugins/firecat/firecat-2.0.ebuild
deleted file mode 100644
index ae7ce1d94..000000000
--- a/www-plugins/firecat/firecat-2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-DESCRIPTION="Collection of firefox extensions for application security auditing and assessment."
-# HOMEPAGE="http://www.security-database.com/toolswatch/FireCAT-Firefox-Catalog-of,302.html"
-HOMEPAGE="http://www.firecat.fr/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	www-plugins/firebug
-	www-plugins/foxyproxy
-	www-plugins/hackbar
-	www-plugins/httpfox
-	www-plugins/live-http-headers
-	www-plugins/noscript
-	www-plugins/showip
-	www-plugins/user-agent-switcher
-	www-plugins/sql-inject-me
-	www-plugins/xss-me"
-DEPEND="${RDEPEND}"
diff --git a/www-plugins/firecat/firecat-2.1.ebuild b/www-plugins/firecat/firecat-2.1.ebuild
deleted file mode 100644
index 4a3ba511a..000000000
--- a/www-plugins/firecat/firecat-2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-DESCRIPTION="Collection of firefox extensions for application security auditing and assessment."
-# HOMEPAGE="http://www.security-database.com/toolswatch/FireCAT-Firefox-Catalog-of,302.html"
-HOMEPAGE="http://www.firecat.fr/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	www-plugins/adblock_plus
-	www-plugins/downthemall
-	www-plugins/exif_viewer
-	www-plugins/firebug
-	www-plugins/foxyproxy
-	www-plugins/hackbar
-	www-plugins/httpfox
-	www-plugins/live-http-headers
-	www-plugins/multi_links
-	www-plugins/noscript
-	www-plugins/proxy_selector
-	www-plugins/showip
-	www-plugins/sql-inject-me
-	www-plugins/status_4_evar
-	www-plugins/user-agent-switcher
-	www-plugins/web_developer
-	www-plugins/xss-me"
diff --git a/www-plugins/foxyproxy/Manifest b/www-plugins/foxyproxy/Manifest
index ab1568b3d..cdb1fe15a 100644
--- a/www-plugins/foxyproxy/Manifest
+++ b/www-plugins/foxyproxy/Manifest
@@ -1,4 +1,2 @@
-DIST foxyproxy-4.4.1.xpi 1007953 SHA256 d5bb8e9807ce252110c52f09dc1baf1060d5a9aee36aa5bc61d1cd411185c1d5 SHA512 01eecd2ad6c243b40b9de56dfdf7a3ffb052c01e2f06cb7b8d9c9cdd0ac998a446db4f67b2335167806c55e660fc987865f0e9ad80099bc8345b4254eb1f13d6 WHIRLPOOL 04566d382535c35452cf0a7114ba560b13f890138631bc154ebdac6ad5a6f5dbc54c020ef7237f90e196d5dc94c58cc81efc76238421ae30b20960044882222f
 DIST foxyproxy-4.5.5.xpi 976990 SHA256 56dc7075233db41e4d50304762e8f7518b8ebd6c65eeefc9cb72699e290bf749 SHA512 c0b22b40bb306196c770fb1da1662fbfe721cd6bca0ed55bffb02b70b7029a6dd76c678b7de440b01aa71b395146a24b7190e2d12c341fe91434bb4a8b830221 WHIRLPOOL a308512ce8a4ecf5dff869b40b850333ef367a61a0dbad79656010039d45ea67679fe4c095b40bfed7307803933ad8bcc3ae83990bdb572a03f4c3869d864b90
-DIST foxyproxy-4.5.xpi 921663 SHA256 3b1c2ab4fe5986349839089dc8331090d49612bb8a65c8a6b31f7782ff8be88e SHA512 c424d5ca59ffaf4373874314b8778d6f29ee698f2b282349f62434df50fcce6a955aa4e1c4eabcc8e09b516483ed00fbd0099861615647eb73def18706c6aa4f WHIRLPOOL 4e9cd599f23587ed1cd51513a896579bc1998058cc5dae2efeadd48f7ff3dd68c8715f16a154e7958a740a748c3cf23687450cf2df3c0f4749815b782bf2825d
 DIST foxyproxy-9999.xpi 976990 SHA256 56dc7075233db41e4d50304762e8f7518b8ebd6c65eeefc9cb72699e290bf749 SHA512 c0b22b40bb306196c770fb1da1662fbfe721cd6bca0ed55bffb02b70b7029a6dd76c678b7de440b01aa71b395146a24b7190e2d12c341fe91434bb4a8b830221 WHIRLPOOL a308512ce8a4ecf5dff869b40b850333ef367a61a0dbad79656010039d45ea67679fe4c095b40bfed7307803933ad8bcc3ae83990bdb572a03f4c3869d864b90
diff --git a/www-plugins/foxyproxy/foxyproxy-4.4.1.ebuild b/www-plugins/foxyproxy/foxyproxy-4.4.1.ebuild
deleted file mode 100644
index f13fcfd3b..000000000
--- a/www-plugins/foxyproxy/foxyproxy-4.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="274976"
-DESCRIPTION="A set of proxy management tools for firefox"
-HOMEPAGE="http://getfoxyproxy.org"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-	)"
diff --git a/www-plugins/foxyproxy/foxyproxy-4.5.5.ebuild b/www-plugins/foxyproxy/foxyproxy-4.5.5.ebuild
index f78162a3e..5c98b9dbe 100644
--- a/www-plugins/foxyproxy/foxyproxy-4.5.5.ebuild
+++ b/www-plugins/foxyproxy/foxyproxy-4.5.5.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/foxyproxy/foxyproxy-4.5.ebuild b/www-plugins/foxyproxy/foxyproxy-4.5.ebuild
deleted file mode 100644
index 714c71d46..000000000
--- a/www-plugins/foxyproxy/foxyproxy-4.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="290234"
-DESCRIPTION="A set of proxy management tools for firefox"
-HOMEPAGE="http://getfoxyproxy.org"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-	)"
diff --git a/www-plugins/foxyproxy/foxyproxy-9999.ebuild b/www-plugins/foxyproxy/foxyproxy-9999.ebuild
index b897118b3..c6c175311 100644
--- a/www-plugins/foxyproxy/foxyproxy-9999.ebuild
+++ b/www-plugins/foxyproxy/foxyproxy-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/hackbar/Manifest b/www-plugins/hackbar/Manifest
index 9a47315de..a8deea352 100644
--- a/www-plugins/hackbar/Manifest
+++ b/www-plugins/hackbar/Manifest
@@ -1,3 +1,2 @@
-DIST hackbar-1.6.2.xpi 48345 SHA256 9f3011239d09e8382d5315fbc43fa1f3007df85214db7603a5576a1f6c8e2731 SHA512 f5fc696979031d0c539474d6c51aca09c58280921ff18a44b974ef3e75fdd6aa490fa0d61a33d90aa88c721c13c25a611f6b8cae907ddad7bbcca98f9175bb35 WHIRLPOOL bd3440e6066b9b0a35adff5a8c2b02cf4a3b0f548744a3c6127cb95567c66d6a0d737d0bcade10762d3661c590904769671d2fe455defe985c7a3fd2241e4c2e
 DIST hackbar-1.6.3.xpi 49341 SHA256 789d15b2e6133d9c3cc37e285c74e129968efa45c0a297e0e45baf133939ade5 SHA512 6ed7447f23d0edb59057964c7515596a3272f31df30daeadfe784728d3dc29477fb794abfd7e4c363bd083dc63336e81adeba6e964a43d3c2f3a388c1f5d71ad WHIRLPOOL 9661d0c733130e75fbda38496ee7634e3a1510df4671ba015eca3b31a9c000a81015d44f900e7c082065549f62a2d46e8470c3a649988ff5b5409b7f8595febf
 DIST hackbar-9999.xpi 49341 SHA256 789d15b2e6133d9c3cc37e285c74e129968efa45c0a297e0e45baf133939ade5 SHA512 6ed7447f23d0edb59057964c7515596a3272f31df30daeadfe784728d3dc29477fb794abfd7e4c363bd083dc63336e81adeba6e964a43d3c2f3a388c1f5d71ad WHIRLPOOL 9661d0c733130e75fbda38496ee7634e3a1510df4671ba015eca3b31a9c000a81015d44f900e7c082065549f62a2d46e8470c3a649988ff5b5409b7f8595febf
diff --git a/www-plugins/hackbar/hackbar-1.6.2-r2.ebuild b/www-plugins/hackbar/hackbar-1.6.2-r2.ebuild
deleted file mode 100644
index e286f4c9f..000000000
--- a/www-plugins/hackbar/hackbar-1.6.2-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="186008"
-DESCRIPTION="Simple security audit / penetration test tool."
-HOMEPAGE="http://code.google.com/p/hackbar"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-	)"
diff --git a/www-plugins/hackbar/hackbar-1.6.3.ebuild b/www-plugins/hackbar/hackbar-1.6.3.ebuild
index c8b01ecc6..59939d7ab 100644
--- a/www-plugins/hackbar/hackbar-1.6.3.ebuild
+++ b/www-plugins/hackbar/hackbar-1.6.3.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/hackbar/hackbar-9999.ebuild b/www-plugins/hackbar/hackbar-9999.ebuild
index 83d50878c..234aa1471 100644
--- a/www-plugins/hackbar/hackbar-9999.ebuild
+++ b/www-plugins/hackbar/hackbar-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/httpfox/Manifest b/www-plugins/httpfox/Manifest
index 0c124df1a..337e9859f 100644
--- a/www-plugins/httpfox/Manifest
+++ b/www-plugins/httpfox/Manifest
@@ -1,3 +1,2 @@
-DIST httpfox-0.8.12.xpi 135673 SHA256 be7ba60c4c49372314433f971ac8f3b3c6b3ad98879c8d9a26bc88bd51773452 SHA512 2f7909990edae2e16038bad1f12716e080a46071622f1af1c24e4226d15506b62fba3fc0de4f71004a15520a02787dc0eda47fee7fb0cf99964fe5fa51dbd8d3 WHIRLPOOL 4c69e475781192c86670c45b0def04357050372eef49674e2a09279d864aaad45859c55dd2858b92a7ba1b4aab65353c94de4c8673d75ceb4e86c6dfff99f1b0
 DIST httpfox-0.8.14.xpi 135016 SHA256 3d3368ac60100a96093ca763c4ce989592bbdf0d8a6dadf31300e9e1eb6af2a4 SHA512 b5ee093a182057f9eabc1ef1e1bf054bc0ef6a628c24f38803818f891ea008afb5f7191838d10c29f3734a1205f75601bbab30f9bbdb030b6da6f54bdd678fa7 WHIRLPOOL 6485ad71723285797e18f919dcee7b153ca2f7370c08b8f8cbd230fcca790d95e7b4548014ee523e0b2d3a4ac774ceef1ae9af4475012482e5679a3b1389e09f
 DIST httpfox-9999.xpi 135016 SHA256 3d3368ac60100a96093ca763c4ce989592bbdf0d8a6dadf31300e9e1eb6af2a4 SHA512 b5ee093a182057f9eabc1ef1e1bf054bc0ef6a628c24f38803818f891ea008afb5f7191838d10c29f3734a1205f75601bbab30f9bbdb030b6da6f54bdd678fa7 WHIRLPOOL 6485ad71723285797e18f919dcee7b153ca2f7370c08b8f8cbd230fcca790d95e7b4548014ee523e0b2d3a4ac774ceef1ae9af4475012482e5679a3b1389e09f
diff --git a/www-plugins/httpfox/httpfox-0.8.12-r1.ebuild b/www-plugins/httpfox/httpfox-0.8.12-r1.ebuild
deleted file mode 100644
index 1d4dad4ee..000000000
--- a/www-plugins/httpfox/httpfox-0.8.12-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="217452"
-DESCRIPTION="A HTTP analyzer addon for Firefox"
-HOMEPAGE="http://code.google.com/p/httpfox"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-	)"
diff --git a/www-plugins/httpfox/httpfox-0.8.14.ebuild b/www-plugins/httpfox/httpfox-0.8.14.ebuild
index d996f3a94..e2d77227f 100644
--- a/www-plugins/httpfox/httpfox-0.8.14.ebuild
+++ b/www-plugins/httpfox/httpfox-0.8.14.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/httpfox/httpfox-9999.ebuild b/www-plugins/httpfox/httpfox-9999.ebuild
index fe86160b1..8d0466ccc 100644
--- a/www-plugins/httpfox/httpfox-9999.ebuild
+++ b/www-plugins/httpfox/httpfox-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/live-http-headers/live-http-headers-0.17-r3.ebuild b/www-plugins/live-http-headers/live-http-headers-0.17-r3.ebuild
index e157d067a..238d424ea 100644
--- a/www-plugins/live-http-headers/live-http-headers-0.17-r3.ebuild
+++ b/www-plugins/live-http-headers/live-http-headers-0.17-r3.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/live-http-headers/live-http-headers-9999.ebuild b/www-plugins/live-http-headers/live-http-headers-9999.ebuild
index 30344616a..c9c9b5224 100644
--- a/www-plugins/live-http-headers/live-http-headers-9999.ebuild
+++ b/www-plugins/live-http-headers/live-http-headers-9999.ebuild
@@ -16,20 +16,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index e466b5985..a437707f6 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1,5 +1,2 @@
-DIST noscript-2.6.9.11.xpi 544303 SHA256 568122b4834baf2113648317baf294879700178df157780a9c89582280338ba8 SHA512 8171be8e304221613c9a2f5f5df787fd283bdb456e54c793b26b6241df69e06ae748245be4bf2aa974827abe46338fa30cc097d658056464829fed8997a82031 WHIRLPOOL 7d264216e24ba2857ac5a1d2bb128eee57c76f2b1e588f9c5b3a47df3f587154ccf599d1aee6d2ff2fe67adf9c91dd1367e5d3e177bf64a1eee3d4d52583d748
-DIST noscript-2.6.9.3.xpi 542926 SHA256 d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a SHA512 303641ef9fd0671cd89e5c0042a8823e5982b37e1ddc52d293b5ef7b26ac61ccbd308c89c5fdd161fdf53c78d5460e028166e0fe0d948513a84e4828c59e48dc WHIRLPOOL 74d0b1441079105cec2afa55e7a9049571df8579cb8451956f33a09ab79a8861123bb9806e50dc34193f67c15d891300b264b17b2b4dd753813d179ce81a7161
-DIST noscript-2.6.9.33.xpi 561731 SHA256 0190552fca9d8091a4f89ad6edc8b62d969b9d58ff481db5d0c1c90698e4ba62 SHA512 ebd3f9cd7b2bdb7b3b63098333b06c17c56354993fdc8809122e6238d29e3caf2b791ae12f03461badc60ae74ebc44540145a609adc36568f09c52ababc6c99a WHIRLPOOL 2820523a74e5d20c8a8afaad937d9d6b20da5ef230113c4e198ea305d88fa99ae35581c2bf49b96e97403e8fc4f75645014c23ae2aa362b5c8e69557c6b28502
 DIST noscript-2.6.9.34.xpi 561789 SHA256 d17e3eeb8cc6ddc6c6cabd002184eced5c8cf061c9d337bac2085e7d2daceacd SHA512 5f771e9582b814f2415c216efd5a5c9bab1b3968240fedfbb7190c53cbc5a2b20e58a7be4ef222472eb785aefa5aaf66e7cce1e4a0ebe8ecc7e17dc3f10e0210 WHIRLPOOL e57fb42f7bd12562a16822e6b9eeb62dd46a3d2e029da7fe0e5f3931406c6260c8e32491e49bd830d5f679072ba28f322ca3da0072862ee6d3c674d4d86df1bb
 DIST noscript-9999.xpi 561731 SHA256 0190552fca9d8091a4f89ad6edc8b62d969b9d58ff481db5d0c1c90698e4ba62 SHA512 ebd3f9cd7b2bdb7b3b63098333b06c17c56354993fdc8809122e6238d29e3caf2b791ae12f03461badc60ae74ebc44540145a609adc36568f09c52ababc6c99a WHIRLPOOL 2820523a74e5d20c8a8afaad937d9d6b20da5ef230113c4e198ea305d88fa99ae35581c2bf49b96e97403e8fc4f75645014c23ae2aa362b5c8e69557c6b28502
diff --git a/www-plugins/noscript/noscript-2.6.9.11.ebuild b/www-plugins/noscript/noscript-2.6.9.11.ebuild
deleted file mode 100644
index 0b81f4f13..000000000
--- a/www-plugins/noscript/noscript-2.6.9.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="293382"
-DESCRIPTION="Allow active content in firefox to run only from trusted sites."
-HOMEPAGE="http://noscript.net"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_seamonkey target_firefox-bin target_seamonkey-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox seamonkey firefox-bin seamonkey-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-	use target_seamonkey && MZA_TARGETS+=" seamonkey"
-	use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-		target_seamonkey? ( www-client/seamonkey )
-		target_seamonkey-bin? ( www-client/seamonkey-bin )
-	)"
diff --git a/www-plugins/noscript/noscript-2.6.9.3.ebuild b/www-plugins/noscript/noscript-2.6.9.3.ebuild
deleted file mode 100644
index 524993705..000000000
--- a/www-plugins/noscript/noscript-2.6.9.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="281416"
-DESCRIPTION="Allow active content in firefox to run only from trusted sites."
-HOMEPAGE="http://noscript.net"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-	)"
diff --git a/www-plugins/noscript/noscript-2.6.9.33.ebuild b/www-plugins/noscript/noscript-2.6.9.33.ebuild
deleted file mode 100644
index 1bf8b1548..000000000
--- a/www-plugins/noscript/noscript-2.6.9.33.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="332462"
-DESCRIPTION="Allow active content in firefox to run only from trusted sites."
-HOMEPAGE="http://noscript.net"
-SRC_URI="https://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_seamonkey target_firefox-bin target_seamonkey-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox seamonkey firefox-bin seamonkey-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-	use target_seamonkey && MZA_TARGETS+=" seamonkey"
-	use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-		target_seamonkey? ( www-client/seamonkey )
-		target_seamonkey-bin? ( www-client/seamonkey-bin )
-	)"
diff --git a/www-plugins/noscript/noscript-2.6.9.34.ebuild b/www-plugins/noscript/noscript-2.6.9.34.ebuild
index b045670ff..ac2bf6fd5 100644
--- a/www-plugins/noscript/noscript-2.6.9.34.ebuild
+++ b/www-plugins/noscript/noscript-2.6.9.34.ebuild
@@ -16,16 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_seamonkey target_firefox-bin target_seamonkey-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox seamonkey firefox-bin seamonkey-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-	use target_seamonkey && MZA_TARGETS+=" seamonkey"
-	use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
@@ -33,3 +23,16 @@ RDEPEND="
 		target_seamonkey? ( www-client/seamonkey )
 		target_seamonkey-bin? ( www-client/seamonkey-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox seamonkey firefox-bin seamonkey-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+		use target_seamonkey && MZA_TARGETS+=" seamonkey"
+		use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/noscript/noscript-9999.ebuild b/www-plugins/noscript/noscript-9999.ebuild
index 1038a08ec..f4d1d23c0 100644
--- a/www-plugins/noscript/noscript-9999.ebuild
+++ b/www-plugins/noscript/noscript-9999.ebuild
@@ -16,16 +16,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_seamonkey target_firefox-bin target_seamonkey-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox seamonkey firefox-bin seamonkey-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-	use target_seamonkey && MZA_TARGETS+=" seamonkey"
-	use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
@@ -34,6 +24,19 @@ RDEPEND="
 		target_seamonkey-bin? ( www-client/seamonkey-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox seamonkey firefox-bin seamonkey-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+			use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+		use target_seamonkey && MZA_TARGETS+=" seamonkey"
+		use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/proxy_selector/Manifest b/www-plugins/proxy_selector/Manifest
index 07d541863..793f377f5 100644
--- a/www-plugins/proxy_selector/Manifest
+++ b/www-plugins/proxy_selector/Manifest
@@ -1,3 +1,2 @@
-DIST proxy_selector-0.80.7.xpi 34322 SHA256 ea240d5483d46f9016c94b48c0d1f610095f01538e23a4fc23b3aa1550b6b9c2 SHA512 587fb3f568b2b5c9dc5a53e2361438128d59a10bd2e15f80cb9deea2baefb246c8f0accf4fb68238e0f49a90949ee941a6bfb7b93fec17365778e3726d8dc2df WHIRLPOOL c01ff3c83525244b8d8c4f227286c01a6992810ab3cb8b9106984252d01720de497c3829be643b2cf0fc29af8c45f2fb64717c9443f4a99b3cfa33a47d435fdc
 DIST proxy_selector-1.22.xpi 45481 SHA256 1d29f241a4f7b87e8f421a2a32039de03864f6c1d39f34725ac0aa97529a0377 SHA512 212a463a0f0d2e94900c32d6cd5613dc3c1db8f1b0835ef62e16ba73aa27b0b6e48e88597bddc1bf3edd6c19686ccb63c271080b95199bd47f435afd1411d919 WHIRLPOOL 634ee7269ea568df7bcf071c9bf3db5460c38e2200fe79899da7242d2c28d171bf5e16604cc3c86caa9b9e103863d3e8f21072459faef013928c9e8139c2211d
 DIST proxy_selector-9999.xpi 45481 SHA256 1d29f241a4f7b87e8f421a2a32039de03864f6c1d39f34725ac0aa97529a0377 SHA512 212a463a0f0d2e94900c32d6cd5613dc3c1db8f1b0835ef62e16ba73aa27b0b6e48e88597bddc1bf3edd6c19686ccb63c271080b95199bd47f435afd1411d919 WHIRLPOOL 634ee7269ea568df7bcf071c9bf3db5460c38e2200fe79899da7242d2c28d171bf5e16604cc3c86caa9b9e103863d3e8f21072459faef013928c9e8139c2211d
diff --git a/www-plugins/proxy_selector/proxy_selector-0.80.7-r2.ebuild b/www-plugins/proxy_selector/proxy_selector-0.80.7-r2.ebuild
deleted file mode 100644
index 3939114e2..000000000
--- a/www-plugins/proxy_selector/proxy_selector-0.80.7-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="158829"
-DESCRIPTION="Lets you switch local proxies in firefox. A fork of multiproxy switch."
-HOMEPAGE="http://addons.mozilla.org/en-US/firefox/addon/proxy-selector"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-	)"
diff --git a/www-plugins/proxy_selector/proxy_selector-1.22.ebuild b/www-plugins/proxy_selector/proxy_selector-1.22.ebuild
index 24f29216b..9a0c871f2 100644
--- a/www-plugins/proxy_selector/proxy_selector-1.22.ebuild
+++ b/www-plugins/proxy_selector/proxy_selector-1.22.ebuild
@@ -14,17 +14,9 @@ SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
 LICENSE="MPL-1.1"
 SLOT="0"
 # fails to unpack, some problem with the packaging of the xpi?
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
@@ -37,3 +29,14 @@ RDEPEND="
 #	unzip -qo "${DISTDIR}/${A}" -d "${WORKDIR}/"
 #    fi
 #}
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-add_src_install
+}
diff --git a/www-plugins/proxy_selector/proxy_selector-9999.ebuild b/www-plugins/proxy_selector/proxy_selector-9999.ebuild
index 0d3e8e22c..b07effc41 100644
--- a/www-plugins/proxy_selector/proxy_selector-9999.ebuild
+++ b/www-plugins/proxy_selector/proxy_selector-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/ringleader/Manifest b/www-plugins/ringleader/Manifest
index 95676d92c..8d81a956c 100644
--- a/www-plugins/ringleader/Manifest
+++ b/www-plugins/ringleader/Manifest
@@ -1,3 +1 @@
-DIST ringleader-0.3_pre20130917.xpi 198319 SHA256 0d077d674966b7b864e1719fc7abdcb14c01a54ad8f103c394fc93104a284144 SHA512 929ac0ee6abb3d5f2fdfab93fb7833f90117c3f28cd0b092cc427251214989696c8d6de68d599d54bddec0997b23d54129e0710fa103ffc7e61bba7c0e38e34f WHIRLPOOL c3d2dcf4a155d572156d9882f19ee5f12df935a36e1361170d3d915673e8d88a998e6fcabe14b6ed5b621c95b013ebdc78a68da954cec3b5a787546bdef19189
-DIST ringleader-0.3_pre20140502.xpi 26726 SHA256 80f900b8cc4f59bbc39458a3c1a65254d05b6f29e090633f9d8846ea10f19270 SHA512 4bfcd96ed1c640c6e4ad1700a5977634a22d6eae4b36760cdb464926dd22b973791e7bd6ac299be7ef631244db53da4d3c4ab5a89ade8b9adb6425abcf2e0935 WHIRLPOOL 13cd6fc8c6292822b68f11d28521d5b806006745d5aabff7b24aa3f9db96a0b330b8abe597479822afdab57b884f94bac287743c4447af78fb9c11e62af7a806
 DIST ringleader-0.3_pre20140710.xpi 27068 SHA256 75f68c060d75a07c4ad5a61d09a773f27ecd11143f55f206f55538705d8597cf SHA512 a24224773a8b973047de61b6f81c3307c5e45179bcbd0eb72c54f8324a74d0fdd1f46642c7dc1cdf213a035c0dc14f1350c1bbd2e1f37f160d1b56185dc59a6f WHIRLPOOL 819d98a28143085649793dcc9b26a7df5c30adb394446049256cad97fb7bee88fe5c3cb48db0a71926c86bc85e352f58fa19fb8f21b2f923c519635fe1398aec
diff --git a/www-plugins/ringleader/ringleader-0.3_pre20130917.ebuild b/www-plugins/ringleader/ringleader-0.3_pre20130917.ebuild
deleted file mode 100644
index 8d7e88768..000000000
--- a/www-plugins/ringleader/ringleader-0.3_pre20130917.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-GITHUB_REVISION="342d9bbeddc15722516d32a59d4962078d7ad235"
-
-DESCRIPTION="FxPnH is a Firefox addon which makes it possible to use Firefox with Plug-n-Hack providers"
-HOMEPAGE="https://github.com/mozmark/ringleader"
-SRC_URI="https://github.com/mozmark/ringleader/raw/${GITHUB_REVISION}/fx_pnh.xpi -> ${P}.xpi"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( >=www-client/firefox-24.1.1 )
-		target_firefox-bin? ( >=www-client/firefox-bin-24.1.1 )
-	)"
diff --git a/www-plugins/ringleader/ringleader-0.3_pre20140502.ebuild b/www-plugins/ringleader/ringleader-0.3_pre20140502.ebuild
deleted file mode 100644
index 695b3d27c..000000000
--- a/www-plugins/ringleader/ringleader-0.3_pre20140502.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-GITHUB_REVISION="71e09a8e0d70928eff205dc933b516b9b5f50884"
-
-DESCRIPTION="FxPnH is a Firefox addon which makes it possible to use Firefox with Plug-n-Hack providers"
-HOMEPAGE="https://github.com/mozmark/ringleader"
-SRC_URI="https://github.com/mozmark/ringleader/raw/${GITHUB_REVISION}/fx_pnh.xpi -> ${P}.xpi"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( >=www-client/firefox-24.1.1 )
-		target_firefox-bin? ( >=www-client/firefox-bin-24.1.1 )
-	)"
diff --git a/www-plugins/ringleader/ringleader-0.3_pre20140710.ebuild b/www-plugins/ringleader/ringleader-0.3_pre20140710.ebuild
index ff6b8786d..9dc7fff45 100644
--- a/www-plugins/ringleader/ringleader-0.3_pre20140710.ebuild
+++ b/www-plugins/ringleader/ringleader-0.3_pre20140710.ebuild
@@ -17,16 +17,20 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( >=www-client/firefox-24.1.1 )
 		target_firefox-bin? ( >=www-client/firefox-bin-24.1.1 )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+        mozilla-addon_src_install
+}
+
diff --git a/www-plugins/showip/Manifest b/www-plugins/showip/Manifest
index c10e2a636..d4a337c10 100644
--- a/www-plugins/showip/Manifest
+++ b/www-plugins/showip/Manifest
@@ -1,3 +1,2 @@
-DIST showip-2.7.2.xpi 48124 SHA256 ddda16b063448c89ba841b76bcc987451cb1970be16c5e9d0aa76860c4a12af1 SHA512 fb37a797e4ad6e56f8b8c30de65901ed3ce02612621a9fa6af93e8846c52807c1344396a5403c63330ac0adea912af70f231daab4a68ff55e29fe36b50da7286 WHIRLPOOL 117d54e6d311f588ffc7c7b45ecc2104a468a2264c135bb62910f0ed97c0deed240bc12eb112638b69ba72dbb224997802d78bdf1e3503a5026f5c9b0fc5ed23
 DIST showip-2.7.7.xpi 50578 SHA256 63cc43b1837577f35648bc0e6725e2067a207513560f29d4c0dfa68e4a5a7f75 SHA512 a0d483b5c6668723a6e437e3ab2c4c9e8f8a860e11108ccde7722a3e0a8700915d986fb52560e612d8dbc0b0785d72ca35dc484182e0045d405407f08d58a91d WHIRLPOOL 4cd90275906c47e3ec2dad8521d09b260c1de02a9e4b346abc5f36ec17329b8bfec817085667ef34990c534169a4815a7e7436af035aefa49ca516202869b880
 DIST showip-9999.xpi 50578 SHA256 63cc43b1837577f35648bc0e6725e2067a207513560f29d4c0dfa68e4a5a7f75 SHA512 a0d483b5c6668723a6e437e3ab2c4c9e8f8a860e11108ccde7722a3e0a8700915d986fb52560e612d8dbc0b0785d72ca35dc484182e0045d405407f08d58a91d WHIRLPOOL 4cd90275906c47e3ec2dad8521d09b260c1de02a9e4b346abc5f36ec17329b8bfec817085667ef34990c534169a4815a7e7436af035aefa49ca516202869b880
diff --git a/www-plugins/showip/showip-2.7.2.ebuild b/www-plugins/showip/showip-2.7.2.ebuild
deleted file mode 100644
index 430997904..000000000
--- a/www-plugins/showip/showip-2.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="281822"
-DESCRIPTION="Firefox extensions which shows the IP address(es) of the current page in the status bar."
-HOMEPAGE="http://code.google.com/p/firefox-showip"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-	)"
diff --git a/www-plugins/showip/showip-2.7.7.ebuild b/www-plugins/showip/showip-2.7.7.ebuild
index d96d46528..784404e45 100644
--- a/www-plugins/showip/showip-2.7.7.ebuild
+++ b/www-plugins/showip/showip-2.7.7.ebuild
@@ -16,18 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_thunderbird target_seamonkey target_firefox-bin target_thunderbird-bin target_seamonkey-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox thunderbird seamonkey firefox-bin thunderbird-bin seamonkey-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-	use target_thunderbird && MZA_TARGETS+=" thunderbird"
-	use target_thunderbird-bin && MZA_TARGETS+=" thunderbird-bin"
-	use target_seamonkey && MZA_TARGETS+=" seamonkey"
-	use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
@@ -37,3 +25,18 @@ RDEPEND="
 		target_thunderbird? ( mail-client/thunderbird )
 		target_thunderbird-bin? ( mail-client/thunderbird-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox thunderbird seamonkey firefox-bin thunderbird-bin seamonkey-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+		use target_thunderbird && MZA_TARGETS+=" thunderbird"
+		use target_thunderbird-bin && MZA_TARGETS+=" thunderbird-bin"
+		use target_seamonkey && MZA_TARGETS+=" seamonkey"
+		use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/showip/showip-9999.ebuild b/www-plugins/showip/showip-9999.ebuild
index a7bbffaba..c0f209b09 100644
--- a/www-plugins/showip/showip-9999.ebuild
+++ b/www-plugins/showip/showip-9999.ebuild
@@ -16,18 +16,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_thunderbird target_seamonkey target_firefox-bin target_thunderbird-bin target_seamonkey-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox thunderbird seamonkey firefox-bin thunderbird-bin seamonkey-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-	use target_thunderbird && MZA_TARGETS+=" thunderbird"
-	use target_thunderbird-bin && MZA_TARGETS+=" thunderbird-bin"
-	use target_seamonkey && MZA_TARGETS+=" seamonkey"
-	use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
@@ -38,6 +26,21 @@ RDEPEND="
 		target_thunderbird-bin? ( mail-client/thunderbird-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox thunderbird seamonkey firefox-bin thunderbird-bin seamonkey-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+		use target_thunderbird && MZA_TARGETS+=" thunderbird"
+		use target_thunderbird-bin && MZA_TARGETS+=" thunderbird-bin"
+		use target_seamonkey && MZA_TARGETS+=" seamonkey"
+		use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/sql-inject-me/sql-inject-me-0.4.7-r2.ebuild b/www-plugins/sql-inject-me/sql-inject-me-0.4.7-r2.ebuild
index d9e0eb492..9ea487570 100644
--- a/www-plugins/sql-inject-me/sql-inject-me-0.4.7-r2.ebuild
+++ b/www-plugins/sql-inject-me/sql-inject-me-0.4.7-r2.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/sql-inject-me/sql-inject-me-9999.ebuild b/www-plugins/sql-inject-me/sql-inject-me-9999.ebuild
index 5aa86ebf8..3e0e701d9 100644
--- a/www-plugins/sql-inject-me/sql-inject-me-9999.ebuild
+++ b/www-plugins/sql-inject-me/sql-inject-me-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/sqlite_manager/sqlite_manager-0.8.1.ebuild b/www-plugins/sqlite_manager/sqlite_manager-0.8.1.ebuild
index 32c0c67b2..e178dc9ec 100644
--- a/www-plugins/sqlite_manager/sqlite_manager-0.8.1.ebuild
+++ b/www-plugins/sqlite_manager/sqlite_manager-0.8.1.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/sqlite_manager/sqlite_manager-9999.ebuild b/www-plugins/sqlite_manager/sqlite_manager-9999.ebuild
index 295db17eb..a19ba39d8 100644
--- a/www-plugins/sqlite_manager/sqlite_manager-9999.ebuild
+++ b/www-plugins/sqlite_manager/sqlite_manager-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/user-agent-switcher/user-agent-switcher-0.7.3-r4.ebuild b/www-plugins/user-agent-switcher/user-agent-switcher-0.7.3-r4.ebuild
index 957274b5b..7232784f1 100644
--- a/www-plugins/user-agent-switcher/user-agent-switcher-0.7.3-r4.ebuild
+++ b/www-plugins/user-agent-switcher/user-agent-switcher-0.7.3-r4.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/user-agent-switcher/user-agent-switcher-9999.ebuild b/www-plugins/user-agent-switcher/user-agent-switcher-9999.ebuild
index 6ef471fca..1bda51bd2 100644
--- a/www-plugins/user-agent-switcher/user-agent-switcher-9999.ebuild
+++ b/www-plugins/user-agent-switcher/user-agent-switcher-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/web_developer/web_developer-1.2.5-r2.ebuild b/www-plugins/web_developer/web_developer-1.2.5-r2.ebuild
index a1542df02..9a7f0895d 100644
--- a/www-plugins/web_developer/web_developer-1.2.5-r2.ebuild
+++ b/www-plugins/web_developer/web_developer-1.2.5-r2.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/web_developer/web_developer-9999.ebuild b/www-plugins/web_developer/web_developer-9999.ebuild
index db86f36a5..209c40004 100644
--- a/www-plugins/web_developer/web_developer-9999.ebuild
+++ b/www-plugins/web_developer/web_developer-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."
diff --git a/www-plugins/xss-me/xss-me-0.4.6-r4.ebuild b/www-plugins/xss-me/xss-me-0.4.6-r4.ebuild
index a4bf61bec..0ab3d81b7 100644
--- a/www-plugins/xss-me/xss-me-0.4.6-r4.ebuild
+++ b/www-plugins/xss-me/xss-me-0.4.6-r4.ebuild
@@ -16,16 +16,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
+
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
diff --git a/www-plugins/xss-me/xss-me-9999.ebuild b/www-plugins/xss-me/xss-me-9999.ebuild
index e61beaf8a..b9e3fe6c1 100644
--- a/www-plugins/xss-me/xss-me-9999.ebuild
+++ b/www-plugins/xss-me/xss-me-9999.ebuild
@@ -16,20 +16,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
-# symlink all possible target paths if this is set
-if use symlink_all_targets; then
-	MZA_TARGETS="firefox firefox-bin"
-else
-	use target_firefox && MZA_TARGETS+=" firefox"
-	use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-fi
-
 RDEPEND="
 	!symlink_all_targets? (
 		target_firefox? ( www-client/firefox )
 		target_firefox-bin? ( www-client/firefox-bin )
 	)"
 
+src_install() {
+	# symlink all possible target paths if this is set
+	if use symlink_all_targets; then
+		MZA_TARGETS="firefox firefox-bin"
+	else
+		use target_firefox && MZA_TARGETS+=" firefox"
+		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
+	fi
+	mozilla-addon_src_install
+}
+
 pkg_postinst() {
 	ewarn "This ebuild installs the latest STABLE version !"
 	ewarn "It is used by the maintainer to check for new versions ..."