Merge updates from master

7 files changed, 25 insertions, 58 deletions

diff --git a/app-arch/alien/alien-8.95.ebuild b/app-arch/alien/alien-8.95.ebuild
index 1b611abb2174..e570cf8c1b38 100644
--- a/app-arch/alien/alien-8.95.ebuild
+++ b/app-arch/alien/alien-8.95.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~x86"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~x86"
 IUSE="+bzip2"
 
 RDEPEND="
diff --git a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
index be92c2652abe..bbb4ff5c9133 100644
--- a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
+++ b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
@@ -44,7 +44,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/cdk/cdk-5.0.20141106.ebuild b/dev-libs/cdk/cdk-5.0.20141106.ebuild
index 24afb5fdc26b..11073407dcf6 100644
--- a/dev-libs/cdk/cdk-5.0.20141106.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20141106.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples static-libs unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2[unicode?]"
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 5958230e4685..02b06bb3df89 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -659,14 +659,30 @@ _ninjaopts_from_makeopts() {
 	set -- ${MAKEOPTS}
 	while (( $# )); do
 		case $1 in
-			-j|-l|-k)
-				ninjaopts+=( $1 $2 )
-				shift 2
+			-j|-l)
+				if [[ $# -eq 1 || $2 == -* ]]; then
+					if [[ $1 == -j ]]; then
+						# absurdly high job limit
+						ninjaopts+=( $1 9999 )
+					else # -l
+						# remove load limit (like make does for -l)
+						ninjaopts+=( $1 0 )
+					fi
+					shift 1
+				else
+					ninjaopts+=( $1 $2 )
+					shift 2
+				fi
 				;;
-			-j*|-l*|-k*)
+			-j*|-l*)
 				ninjaopts+=( $1 )
 				shift 1
 				;;
+			-k)
+				# -k 0 = any number of tasks can fail
+				ninjaopts+=( $1 0 )
+				shift 1
+				;;
 			*) shift ;;
 		esac
 	done
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index ab7402e52fe7..43668413dee6 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,3 +1,2 @@
-DIST gradm-3.1-201507041117.tar.gz 91468 SHA256 098e1978731d456c8c1db696fa0b67d6f1310a87a996083a1b627671b4e0c1f5 SHA512 507d97477a1b28a0097467aba3085759c606a7ef1fd3b91d09cd7ffb9523408276d4fe504c4bb9b036c0ee6066e3edef9ebe0fb17b2d7e1156937fb6ca813daf WHIRLPOOL 392976e30a5e2ed765ab6ba09c8d03935cb6bc0f18519fc7764fc127bf2fe2ba2aa88d5a026e7d1a46d0406af1af60e9045a2ffa677d94fa4e8bd004fbb5ef5a
 DIST gradm-3.1-201507191652.tar.gz 91460 SHA256 2f14c357bf0459e502a4e108b76c3f6240aa484762d07bb1687796b9b9297a50 SHA512 94b655164369d3ae061ae74710db1098e743a435eecdee9faef77b39aa3fe58f552b4479e55c9546b3c25dea194dc490d9442fc404318628c77d1ecd05d6243e WHIRLPOOL 22041c8424bacccdb53eef953b2419a84b24318caac91e137c59b3b88a5ef57d32dfe31dcf8ddb0c36e35b935db0526b9778ac0650d6dfdf612a469ccdc17f78
 DIST gradm-3.1-201603152148.tar.gz 91549 SHA256 07f4decbc95ddfb8a88a35ab2960705fb48d0daf108afc09c2b752e2e86fd7b5 SHA512 a423db1dfdaa0b068970b92dc970d6e10bfc20695437e92d967b064c3efe05114ab6de672eec984ab2f048b67b12ec8c6667a71bc584f03e5d2f0ebab1476158 WHIRLPOOL 69b4808f71c55a51784397870d115b851dedd845f8bd588b75d7a39cab140e29eb20ec83542979d6265b203ec78c9a45bc6b1eecb6bcaa061450a3e8fac2512d
diff --git a/sys-apps/gradm/gradm-3.1.201507041117.ebuild b/sys-apps/gradm/gradm-3.1.201507041117.ebuild
deleted file mode 100644
index 130ae2d403d3..000000000000
--- a/sys-apps/gradm/gradm-3.1.201507041117.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit flag-o-matic toolchain-funcs versionator eutils udev
-
-MY_PV="$(replace_version_separator 2 -)"
-
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="https://dev.gentoo.org/~blueness/hardened-sources/gradm/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	pam? ( virtual/pam )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-gentoo-env-r3.patch
-	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-}
-
-src_compile() {
-	local target
-	use pam || target="nopam"
-
-	emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	fperms 711 /sbin/gradm
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode."
-	ewarn
-}
diff --git a/sys-apps/gradm/gradm-3.1.201603152148.ebuild b/sys-apps/gradm/gradm-3.1.201603152148.ebuild
index ab71f1287e14..aa0d4a45da1e 100644
--- a/sys-apps/gradm/gradm-3.1.201603152148.ebuild
+++ b/sys-apps/gradm/gradm-3.1.201603152148.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~blueness/hardened-sources/gradm/${PN}-${MY_PV}.
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="pam"
 
 RDEPEND=""