8 files changed, 21 insertions, 34 deletions
diff --git a/dev-php/PEAR-OLE/Manifest b/dev-php/PEAR-OLE/Manifest
index 867ed0fbbdcc..dd9089cc3321 100644
--- a/dev-php/PEAR-OLE/Manifest
+++ b/dev-php/PEAR-OLE/Manifest
@@ -1,2 +1 @@
-DIST OLE-0.6.1.tgz 12111 SHA256 9fd4ed5eaa07f831324df5c910584418803a7f73f0c818e85ea92fa78714587f SHA512 3c03eb0faa24525404aa611c0c38316d449e4ae21ec0478482f4d8813f061b82c1ad9699e1d1d481202051f3562c71ca2d0428f7b3fc208120364a55b5952115 WHIRLPOOL ce88ebb9c770df3c7ba0e7bef4f5eecc8a251a4fd5d658de65517e5f799effe450bfedd452bf85c021156527e8e482faef23de9f66eff556e667ecd5b83688af
 DIST OLE-1.0.0RC2.tgz 13981 SHA256 a0f3ad85845801ad8f7c6cf1695e048c960a72b183946613ddbca4567fed9164 SHA512 9d0b236da4a0f82f272cf2e5642246ca35f83b9d21f1cc41ebe32d536949e9c7fce8d3bee0dce051f692a0283e1203d5ba2bacbe339f72cad4c83eb7a7b7e884 WHIRLPOOL 232cfbbe3c39cdd52455fd9f060c8983002e80f178dda25627d6a88c51af22dc5ae7f71577a4679ef9aed15ad4cae5ae4e6791cf215e286e1460bfdde8fefa58
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-0.6.1.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-0.6.1.ebuild
deleted file mode 100644
index d51cacf87c65..000000000000
--- a/dev-php/PEAR-OLE/PEAR-OLE-0.6.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit php-pear-r1
-
-DESCRIPTION="Package for reading and writing OLE containers"
-LICENSE="PHP-2.02 PHP-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r1.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r1.ebuild
index f8318c5d2cc4..1be070498061 100644
--- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r1.ebuild
+++ b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
index af5e9e6faf9e..b103443ad437 100644
--- a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
+++ b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01
 	examples? ( GPL-2+ OFL-1.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild
deleted file mode 100644
index b010f71521c1..000000000000
--- a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit php-pear-r1
-
-DESCRIPTION="Render text using FIGlet fonts"
-
-LICENSE="PHP-2.02 GPL-2+ OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass
index 67f7e2d65b42..73d852410b91 100644
--- a/eclass/multiprocessing.eclass
+++ b/eclass/multiprocessing.eclass
@@ -96,7 +96,7 @@ get_nproc() {
 # no way to represent infinity, we return ${inf} (defaults to 999) if the user
 # has -j without a number.
 makeopts_jobs() {
-	[[ $# -eq 0 ]] && set -- ${MAKEOPTS}
+	[[ $# -eq 0 ]] && set -- "${MAKEOPTS}"
 	# This assumes the first .* will be more greedy than the second .*
 	# since POSIX doesn't specify a non-greedy match (i.e. ".*?").
 	local jobs=$(echo " $* " | sed -r -n \
@@ -117,7 +117,7 @@ makeopts_jobs() {
 # If no limit is specified or --load-average is used without a number, ${inf}
 # (defaults to 999) is returned.
 makeopts_loadavg() {
-	[[ $# -eq 0 ]] && set -- ${MAKEOPTS}
+	[[ $# -eq 0 ]] && set -- "${MAKEOPTS}"
 	# This assumes the first .* will be more greedy than the second .*
 	# since POSIX doesn't specify a non-greedy match (i.e. ".*?").
 	local lavg=$(echo " $* " | sed -r -n \
diff --git a/eclass/tests/multiprocessing_makeopts_jobs.sh b/eclass/tests/multiprocessing_makeopts_jobs.sh
index ef477277ab3b..cc4f91b69436 100755
--- a/eclass/tests/multiprocessing_makeopts_jobs.sh
+++ b/eclass/tests/multiprocessing_makeopts_jobs.sh
@@ -10,14 +10,20 @@ inherit multiprocessing
 test-makeopts_jobs() {
 	local exp=$1; shift
 	tbegin "makeopts_jobs($1${2+; inf=${2}}) == ${exp}"
-	local act=$(makeopts_jobs "$@")
-	[[ ${act} == "${exp}" ]]
-	tend $? "Got back: ${act}"
+	local indirect=$(MAKEOPTS="$*" makeopts_jobs)
+	local direct=$(makeopts_jobs "$@")
+	if [[ "${direct}" != "${indirect}" ]] ; then
+		tend 1 "Mismatch between MAKEOPTS/cli: '${indirect}' != '${direct}'"
+	else
+		[[ ${direct} == "${exp}" ]]
+		tend $? "Got back: ${act}"
+	fi
 }
 
 tests=(
 	999 "-j"
 	999 "--jobs"
+	999 "-j -l9"
 	1 ""
 	1 "-l9 -w"
 	1 "-l9 -w-j4"
diff --git a/eclass/tests/multiprocessing_makeopts_loadavg.sh b/eclass/tests/multiprocessing_makeopts_loadavg.sh
index 6b976beb1aef..ffa679d13e29 100755
--- a/eclass/tests/multiprocessing_makeopts_loadavg.sh
+++ b/eclass/tests/multiprocessing_makeopts_loadavg.sh
@@ -10,9 +10,14 @@ inherit multiprocessing
 test-makeopts_loadavg() {
 	local exp=$1; shift
 	tbegin "makeopts_loadavg($1${2+; inf=${2}}) == ${exp}"
-	local act=$(makeopts_loadavg "$@")
-	[[ ${act} == "${exp}" ]]
-	tend $? "Got back: ${act}"
+	local indirect=$(MAKEOPTS="$*" makeopts_loadavg)
+	local direct=$(makeopts_loadavg "$@")
+	if [[ "${direct}" != "${indirect}" ]] ; then
+		tend 1 "Mismatch between MAKEOPTS/cli: '${indirect}' != '${direct}'"
+	else
+		[[ ${direct} == "${exp}" ]]
+		tend $? "Got back: ${act}"
+	fi
 }
 
 tests=(