avoid use_if_iuse. Bump epubreader, classic-theme-restorer, noscript

11 files changed, 31 insertions, 12 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index dbe1b49b..eb57196a 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jan 2015; Martin Väth <martin@mvath.de>:
+  avoid use_if_iuse in mv_mozextenstion.eclass to be fully pms compatible
+
+  24 Jan 2015; Martin Väth <martin@mvath.de>:
+  Remove auteps from mv_mozextension.eclass
+
   14 Aug 2013; Martin Väth <martin@mvath.de>:
   Simplify EPREFIX
 
diff --git a/eclass/mv_mozextension.eclass b/eclass/mv_mozextension.eclass
index 45a7a359..8d20aad8 100644
--- a/eclass/mv_mozextension.eclass
+++ b/eclass/mv_mozextension.eclass
@@ -30,27 +30,25 @@ case ${EAPI:-0} in
 	die "EAPI ${EAPI} no longer supported by ${ECLASS}";;
 esac
 
-IUSE=
+MV_MOZ_IUSE=
 RDEPEND='|| ('
-REQUIRED_USE='|| ('
 case ${MV_MOZ_MOZILLAS} in
 *fire*)
-	IUSE="${IUSE}${IUSE:+ }firefox firefox-bin"
+	MV_MOZ_IUSE="${MV_MOZ_IUSE}${MV_MOZ_IUSE:+ }firefox firefox-bin"
 	RDEPEND="${RDEPEND}
 	firefox? ( >=www-client/firefox-21 )
 	firefox-bin? ( >=www-client/firefox-bin-21 )"
-	REQUIRED_USE="${REQUIRED_USE} firefox firefox-bin";;
 esac
 case ${MV_MOZ_MOZILLAS} in
 *sea*)
-	IUSE="${IUSE}${IUSE:+ }seamonkey seamonkey-bin"
+	MV_MOZ_IUSE="${MV_MOZ_IUSE}${MV_MOZ_IUSE:+ }seamonkey seamonkey-bin"
 	RDEPEND="${RDEPEND}
 	seamonkey? ( www-client/seamonkey )
 	seamonkey-bin? ( www-client/seamonkey-bin )"
-	REQUIRED_USE="${REQUIRED_USE} seamonkey seamonkey-bin";;
 esac
 RDEPEND="${RDEPEND} )"
-REQUIRED_USE="${REQUIRED_USE} )"
+IUSE=${MV_MOZ_IUSE}
+REQUIRED_USE="|| ( ${MV_MOZ_IUSE} )"
 
 DEPEND='app-arch/unzip'
 
@@ -98,7 +96,7 @@ xpi_unpack() {
 
 		case ${xpi} in
 		./*|/*)
-			srcdir='';;
+			srcdir=;;
 		*)
 			srcdir="${DISTDIR}/";;
 		esac
@@ -150,7 +148,7 @@ xpi_install_dirs() {
 
 mv_mozextension_install() {
 	local MOZILLA_EXTENSIONS_DIRECTORY
-	use_if_iuse "${1}" || return 0
+	has "${1}" ${MV_MOZ_IUSE} && use "${1}" || return 0
 	MOZILLA_EXTENSIONS_DIRECTORY=${2}
 	xpi_install_dirs
 }
diff --git a/www-plugins/classic-theme-restorer/ChangeLog b/www-plugins/classic-theme-restorer/ChangeLog
index ffbf1572..3ca685dc 100644
--- a/www-plugins/classic-theme-restorer/ChangeLog
+++ b/www-plugins/classic-theme-restorer/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*classic-theme-restorer-1.2.9.4 (13 Feb 2015)
+
+  13 Feb 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
 *classic-theme-restorer-1.2.9.2 (01 Feb 2015)
 
   01 Feb 2015; Martin Väth <martin@mvath.de>:
diff --git a/www-plugins/classic-theme-restorer/Manifest b/www-plugins/classic-theme-restorer/Manifest
index abc452e5..34034bcb 100644
--- a/www-plugins/classic-theme-restorer/Manifest
+++ b/www-plugins/classic-theme-restorer/Manifest
@@ -1 +1 @@
-DIST classic_theme_restorer_customize_ui-1.2.9.2-fx.xpi 455284 SHA256 52e20161f53bb710ffcc7f159249a8e7daf1f91c013a804d402ccf30af230ffe SHA512 31fd6cab91aeccc7624e4fba24fa6258895b8363f980295ca2110db93ed938488b76a9569687af12e863506ada48ba0cc2f8f30602a8e9cf965611c4d9a5eacc WHIRLPOOL 81be0c7979334d726eb02e8d9552a51cf6be52042506dcb7452b359b1b3225244373060dd13d67fd38606b2a0e4a6386e969ed7ac3de1296b579d64c7089d08a
+DIST classic_theme_restorer_customize_ui-1.2.9.4-fx.xpi 453934 SHA256 23496146cef6a007a3f060f18dedd548f0eb3f4716afd22cca7f04275464b82d SHA512 88e54c86a2a5f2a2ffd9fcf71d7d276f919886ff88882d1a3b8cae4ec02f7ecb98c8ae85bd49dc4299c5e2852617aaf9bfbedea99a761a8e1ad7458608f5c655 WHIRLPOOL 38fc2ce356f58c71b3b213e7141b2b9a036903d9d143cacd0a0c31009605fd3c4c4b9af72000fee040053f95a9dc31face8b1cc297c4865e8f384ac546271320
diff --git a/www-plugins/classic-theme-restorer/classic-theme-restorer-1.2.9.2.ebuild b/www-plugins/classic-theme-restorer/classic-theme-restorer-1.2.9.4.ebuild
index 6bb4d8de..6bb4d8de 100644
--- a/www-plugins/classic-theme-restorer/classic-theme-restorer-1.2.9.2.ebuild
+++ b/www-plugins/classic-theme-restorer/classic-theme-restorer-1.2.9.4.ebuild
diff --git a/www-plugins/epubreader/ChangeLog b/www-plugins/epubreader/ChangeLog
index bfae3d53..4caa6973 100644
--- a/www-plugins/epubreader/ChangeLog
+++ b/www-plugins/epubreader/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*epubreader-1.5.0.4 (13 Feb 2015)
+
+  13 Feb 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
 *epubreader-1.5.0.3 (02 Feb 2015)
 
   02 Feb 2015; Martin Väth <martin@mvath.de>:
diff --git a/www-plugins/epubreader/Manifest b/www-plugins/epubreader/Manifest
index 8977d97d..737881d2 100644
--- a/www-plugins/epubreader/Manifest
+++ b/www-plugins/epubreader/Manifest
@@ -1 +1 @@
-DIST epubreader-1.5.0.3-fx+sm.xpi 266317 SHA256 63be028d4599d71acc69f8b4837b6090fe585ffa7904e615bb3757575faf5735 SHA512 b87237fa9feda0dfbed027f45f4c900a830470a6ad9a2df381f64f52c2f2ef8996a81bf747f653776f774b188447824c68275eba9cf354fbf52bb6ca1d9852d7 WHIRLPOOL 2aceedd8e9eb894ddc36ceec7573469aea93e536494b1181a767f5e335725b99903a1031360cf18e3e3b9e6179c876d7638474b63a3db241f3a430cd80ee7815
+DIST epubreader-1.5.0.4-fx+sm.xpi 266319 SHA256 3b073a245abaec34e760c6e8af07ca52f0001b973b065a2fe1d590890f3e4efc SHA512 ada1746944fe98547bf56e37cf1059b0c53e15cf62f83f19f7ea67ae4e02b8f39d94753391d4aa1ec002263f7edeb8cee646366cf49bbfd4c0df49b7f8de656a WHIRLPOOL 23d4d3d4f30c09c2fb12450ec1154d72a9bf4f8eb9b07aea1a43c51bc9e1f5f1d2a0a06fb5bb2bc1c3511b66fe62b02b25b9bfc11659f85aa95130b7b4325920
diff --git a/www-plugins/epubreader/epubreader-1.5.0.3.ebuild b/www-plugins/epubreader/epubreader-1.5.0.4.ebuild
index 83e94bf5..83e94bf5 100644
--- a/www-plugins/epubreader/epubreader-1.5.0.3.ebuild
+++ b/www-plugins/epubreader/epubreader-1.5.0.4.ebuild
diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
index ad2f5615..4d40e62c 100644
--- a/www-plugins/noscript/ChangeLog
+++ b/www-plugins/noscript/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*noscript-2.6.9.13 (13 Feb 2015)
+
+  13 Feb 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
 *noscript-2.6.9.12 (07 Feb 2015)
 
   07 Feb 2015; Martin Väth <martin@mvath.de>:
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index c87d41eb..a80a8a4a 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1 +1 @@
-DIST noscript-2.6.9.12.xpi 544404 SHA256 91f6218774424246d2989cfb8c3a62b8520271ee882a5a41f741bbab9ceb16bb SHA512 dffbf05dd60e678140999b2abeb28154a808a942ee78165459dc560b58fd05c3a1b9cbcef3decfbd5cfc78fb35bf8993260f0c3e8a9c1600f7a1e7a94368ce2b WHIRLPOOL ddb63668b281546e138fbe5e7353e228915883788dee826ee4a44af50ec971379d7586ccc38fbe348faeb259b502db8bd038fdb924e81965281ce516f77b4eb9
+DIST noscript-2.6.9.13.xpi 544242 SHA256 cc020e9272ab315419159721fa7160960f38a359f468253173f62b463cc624b6 SHA512 8d94eac4818271ce0310afcd3ee40fd6ac922bc9d03a2cde92bc269176b39d033843b2653e000f587aec33fb978fcc7b562946f0f772a1cfd0be869101d3cc91 WHIRLPOOL 78a1263018ac7102a8b91ac477f96912f5a7081d63606b6dbd518a5a9b57aaeee67456d984adbb0af9e63f728e6859fa667116b19ede57c675b135e2ad8afedb
diff --git a/www-plugins/noscript/noscript-2.6.9.12.ebuild b/www-plugins/noscript/noscript-2.6.9.13.ebuild
index 82dc8b3b..82dc8b3b 100644
--- a/www-plugins/noscript/noscript-2.6.9.12.ebuild
+++ b/www-plugins/noscript/noscript-2.6.9.13.ebuild