gentoo resync : 01.01.2018

11 files changed, 112 insertions, 141 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 3812e4577dc7..c47be61e1b62 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index cf90a6e004da..1d318dc1bafc 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -45,6 +45,6 @@ EBUILD glibc-2.24-r4.ebuild 5047 BLAKE2B 295eeb6cecff9f9b33d428a3f52d68a5af0c92a
 EBUILD glibc-2.25-r10.ebuild 4965 BLAKE2B 060110e8a01add709b5fd4892d7cdaeb71ec3a2300b27f21b103933ac60b3118c075a7dba70d8886d363953323be8473f8cc9fb672456c24fa324674465c9534 SHA512 bf04ea4805336e34479195dc136827ff78c752eb415f54b9a23924d28851554ca9bd9c68a8be264a810e7e74e536d43be5645fa54d79fb00ea2714116bf8d9eb
 EBUILD glibc-2.25-r9.ebuild 5038 BLAKE2B 6bf0e5ad7ff8403fdf35e001418446cb5bc09c4407f28ee04be3e5bf0ab3bb5da57128cea4e4943c81a615b7704ef4e1805d61540b39702702da3723eeee8ada SHA512 e28ab996019d8f3b80523ca4ae2c42857e469ce61eb01d1c248699a37d141223bac5c345b14bd50d18fedd173818d6bc94ab0bcd37aa565cd695bdbbc7dd7b6b
 EBUILD glibc-2.26-r3.ebuild 25373 BLAKE2B b39fb75551e268f4942457d3aa8a06b7e707032ba68388d8303f43bb047299ce976844384d28c0de7d9a0947a769fe7f96beabb4a60c45790465a0fe4c92a556 SHA512 fb21295d3bc781df3882b3eabb1f3d95d7d1465bfd28a4bd45a79a593c3ad61f042d147c0d1dc835e206a3e0fff975724a1295725fbe81a8718307d315719ccd
-EBUILD glibc-2.26-r5.ebuild 25594 BLAKE2B d127817d3554218ee16cae19a1e959083950675e0aaeadaba9185425f28a17141b5d9a578e28dc4b58a376444a8df41a8fac9632f82382e427adfd755132ff6b SHA512 11196cf14c1891e13bc7b6e2b6e687dfd85c6b59328902bd6adf5e068b87e2c96253408e9d8ba8a8c2b7f47b7818017d43b46411be9ea30231c0708866b19da6
+EBUILD glibc-2.26-r5.ebuild 25579 BLAKE2B 8e1717b52232878c58a752bab7f0216130ba67e8372b4d4bfa3dbdb8f4f30bf82d09afa08bc0e09742a5f4a9c408558921087634740719cc46a214b2635f149f SHA512 db50eb559993b128ed09c22c258b051849720f3cc0d72867ddfb76c8b99c90602d279a79f7dad958e58c237e28903424477fd1f980ddc87080719f96d9123970
 EBUILD glibc-9999.ebuild 25821 BLAKE2B c52ab7226bd30f3d3cc674575e8022a84c040e04ae5221ef7e479c71dcb5d74c7d721a8d02aecee42341dbf1c2f111ea3d472d9cd33f83b1f4b0d837af8b7cea SHA512 ead08f31af0d81a53203146e7a6001d3c9b8e182a7ab524efb7fe70188fdf4aa0250c65f02b06e996c2cd2ee705ac7f6394ab7f98ed539125c44d048703ca139
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-2.26-r5.ebuild b/sys-libs/glibc/glibc-2.26-r5.ebuild
index abde9e62f95f..c5a076afbdb0 100644
--- a/sys-libs/glibc/glibc-2.26-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,8 +18,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	KEYWORDS=""
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index a61e8a9ab335..b9ba877f35cc 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,4 +1,6 @@
 AUX libapparmor-2.10-symbol_visibility.patch 215 BLAKE2B 5f24a528a37f9fa652284fcefc18860d9e8811c6eb792d7f1d47d4568af26064d4a57d27409e4cfdffc434468af6b03b5228b4d6435998db26e27a8cd2f159a8 SHA512 3c0935fb5d229f0442904bee11a2469b8f73c01ea3e93245170fdb532fc136186416c24a6c3f36ecadc4266b5a611dc6204a11c30e133cf49e2186a7b4d620cd
 DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
+DIST apparmor-2.12.tar.gz 7258450 BLAKE2B c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c SHA512 d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
 EBUILD libapparmor-2.11.1.ebuild 2161 BLAKE2B 5bfc0b49a9e20f583c7839743b3e4e33075de37df75f44233648d2f198ae178e74f02916af31a99088ad3ae2f120e01af4da6b6dc11e5af8ed716811453a954f SHA512 8f54f44882c3732d2cefdf069eb9329c273b7838c0cd4dc535b8a3b0cac5d9244a75f7872d14a3be94d7ffa6452bea79189895fd2ff30973ebb5b4a94373fb81
+EBUILD libapparmor-2.12.0.ebuild 2167 BLAKE2B 7f11e5826d820d0a38cfca75256050da6b56c23f812adafb7a401d14b1148ac23b05060bee5bf0905594c888ef07a09abc50d9e23702fd13ff0d26bf1b96dccb SHA512 3d2d82b3636829de6eb1aad76096a901e0559aac8430eeda4ffc54b93a6f5bd67c7bc9d5f5293c590b5a1f671dc3698ce57b417b995d5e5accf948b29e71953e
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-libs/libapparmor/libapparmor-2.12.0.ebuild b/sys-libs/libapparmor/libapparmor-2.12.0.ebuild
new file mode 100644
index 000000000000..026e70ab2e84
--- /dev/null
+++ b/sys-libs/libapparmor/libapparmor-2.12.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools-utils distutils-r1 perl-functions versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Library to support AppArmor userspace utilities"
+HOMEPAGE="http://apparmor.net/"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +perl +python static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-lang/perl )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig	)"
+
+S=${WORKDIR}/apparmor-${MY_PV}/libraries/${PN}
+
+RESTRICT="test"
+
+src_prepare() {
+	rm -r m4 || die "failed to remove bundled macros"
+	epatch "${FILESDIR}"/${PN}-2.10-symbol_visibility.patch
+	autotools-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with perl) \
+		$(use_with python)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile -C src
+	autotools-utils_src_compile -C include
+	use doc && autotools-utils_src_compile -C doc
+	use perl && autotools-utils_src_compile -C swig/perl
+
+	if use python ; then
+		pushd "${BUILD_DIR}"/swig/python > /dev/null
+		emake libapparmor_wrap.c
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install -C src
+	autotools-utils_src_install -C include
+	use doc && autotools-utils_src_install -C doc
+
+	if use perl ; then
+		autotools-utils_src_install -C swig/perl
+		perl_set_version
+		insinto "${VENDOR_ARCH}"
+		doins "${BUILD_DIR}"/swig/perl/LibAppArmor.pm
+
+		# bug 620886
+		perl_delete_localpod
+		perl_fix_packlist
+	fi
+
+	if use python ; then
+		pushd "${BUILD_DIR}"/swig/python > /dev/null
+		distutils-r1_src_install
+
+		python_moduleinto LibAppArmor
+		python_foreach_impl python_domodule LibAppArmor.py
+		popd > /dev/null
+	fi
+}
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 11ba284cda17..285478f008b7 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,7 +3,6 @@ DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609
 DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
 DIST musl-1.1.18.tar.gz 936274 BLAKE2B 981be737026eddb4527507ec9975531dba25d165b0b064076cc3a900bdf98c3d25ee130a3d615e4b9635ef3ffcc256bf00d21180eb8d04b61d9ec8b6bc531fb6 SHA512 4d55c92efe41dfdd9fff6aca5dda76a632a3be60d10e5a7f66a4731d8f7040fb0a20b998965ba4d069b4f8a3527fcd7388e646cb66afc649c4d0cc6c3d358c9c
-EBUILD musl-1.1.18-r1.ebuild 3099 BLAKE2B 9276b448d12043734ca17d60b731747868813976676ee6ad30cc818cbe50e3b4cd862c901ddeaf07f77957d61dd24f24977aeb1407e7621c60f31a16fab93cc7 SHA512 f6b766d6157eb4415dd8faebeb93f71e0d127d71396380b1372f5d324c32b85c23673d922d9e700c4154d92a06d6262a5cf2e95ecbd641360ff37679b430daa4
 EBUILD musl-1.1.18.ebuild 3082 BLAKE2B ffc41a796597676ecddae84376909dca5cb96555a71edaa2d4e44ba20427f31cc1819ee8eb7b7cdcfc6721552019cb944bf93e25e07f54c021b8f58c9e44af7b SHA512 4e1d2fe1a2484b8af7d94388212aea5343591df09633e9382b5d389fc7695e2e38215f14b29fe98c027bb244a8ca8c8c798aa020701eab6d1a0a21e425efaddf
-EBUILD musl-9999.ebuild 3099 BLAKE2B 9276b448d12043734ca17d60b731747868813976676ee6ad30cc818cbe50e3b4cd862c901ddeaf07f77957d61dd24f24977aeb1407e7621c60f31a16fab93cc7 SHA512 f6b766d6157eb4415dd8faebeb93f71e0d127d71396380b1372f5d324c32b85c23673d922d9e700c4154d92a06d6262a5cf2e95ecbd641360ff37679b430daa4
+EBUILD musl-9999.ebuild 3086 BLAKE2B fc772d8b5b84f2baa5fd727b85856e2c912f2b9076241c55b314b9c1dd382f827b38535c1911f317a96c563cf9e968eb48b9833667bb7a06c45d57d5c5e2dc64 SHA512 ca447c747b0e4e3a124323f2dfc2a91cbafa2613784f2e7814ea856a97232c0140352403189663d2dfaf3cbf32a72f3b6760b96e09ef572c73d1d31c333d9874
 MISC metadata.xml 452 BLAKE2B f6d26f456e1a1005b0103c6921d59504dcacddfaf9ec3c788f6f626df670ec7e979a8a66626d7de24d0b850651bf095610c191d520b67915a701bf8564189fc4 SHA512 676d8122179a5cb56e0b9c7aeb7f0aec8c19b5d7b604a19c9ee01aeca837a74cc4284e87cc743d0eaf527f0c79afdfeb1f238c204a8a6c1c5590b2718bbc9b03
diff --git a/sys-libs/musl/musl-1.1.18-r1.ebuild b/sys-libs/musl/musl-1.1.18-r1.ebuild
deleted file mode 100644
index c4a1c90aaf5a..000000000000
--- a/sys-libs/musl/musl-1.1.18-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
-	inherit git-r3
-	SRC_URI="
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://dev.gentoo.org/~blueness/musl-misc/getent.c
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://dev.gentoo.org/~blueness/musl-misc/getent.c
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crosscompile_opts_headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-}
-
-src_configure() {
-	tc-getCC ${CTARGET}
-	just_headers && export CC=true
-
-	local sysroot
-	is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix=${sysroot}/usr \
-		--syslibdir=${sysroot}/lib \
-		--disable-gcc-wrapper || die
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
-	fi
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
-	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
-		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
-		cp "${FILESDIR}"/ldconfig.in "${T}" || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
-	fi
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	[ "${ROOT}" != "/" ] && return 0
-
-	ldconfig || die
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index c4a1c90aaf5a..9e0e184d6562 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -59,7 +59,7 @@ src_configure() {
 	just_headers && export CC=true
 
 	local sysroot
-	is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
+	is_crosscompile && sysroot=/usr/${CTARGET}
 	./configure \
 		--target=${CTARGET} \
 		--prefix=${sysroot}/usr \
@@ -88,7 +88,7 @@ src_install() {
 	# musl provides ldd via a sym link to its ld.so
 	local sysroot
 	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
 	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
 
 	if [[ ${CATEGORY} != cross-* ]] ; then
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 0c3b046fcc25..a973754312e8 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -12,6 +12,6 @@ AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb
 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6
 DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
 DIST ncurses-6.0.tar.gz 3131891 BLAKE2B 68670ebdaba28c7a750631da01a0e3681b476cc9e9ae6fd9eae5a254f41fab5f1a5df5fa9897a92d1da751f1cc0b72f2ffee4603865900e67fcbb949c102cf78 SHA512 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
-EBUILD ncurses-5.9-r101.ebuild 5384 BLAKE2B 8a6e5a94500baafff73a3f67cafe9e02ac9c1886040143a2bcc825d1b4021f2180453e0cfe4b69d7206fbd613b8a0d3f37b442c8bee3c13a2f580b3043f7f193 SHA512 ecaf855054e211bbc3a098d78fb84112a27aff2a3d0d48d1b7a02355b60e8705161b1b6418535b804f8ca78920c86f4f1b3e24047a7e024df8987f7eecc63429
-EBUILD ncurses-6.0-r1.ebuild 8734 BLAKE2B 3e7ff44ec9af73dee87609970ac5266cc920510ccf7f9951dcf5573eec177e5869738639c1a63b829f2f846ad60b9725eab01e02f9783ce2767972e2a2fca69e SHA512 7cf7364394f5e81124ad32fdb8f25dd495f80b5a795c2925921434c1cfdb251064d262de70a9303aeba25f7b17494a95b0e3b7fcc267972696e2c04e3a685666
+EBUILD ncurses-5.9-r101.ebuild 5295 BLAKE2B dccde970635c874070f52a3fe1cd49f6f2c21a3360299596d49db2d57ec9be4c9319fe1d38af49949d8528ced9559ffa8d01d339a5f44b3181cf6405f68a0a5b SHA512 e7505e1b91925abed6feb120da09ec578276c467fef6b3e99fa8ebf74e4abecc130507406919ea1c49e7f9e4738e9c0b4dc20f9964b603de50dba2abe637f1ad
+EBUILD ncurses-6.0-r1.ebuild 8645 BLAKE2B c74fd055fbcdd72c4f3a8d719ef568d015f4edb57ce9167497307689d069148ad4a8789014ae81d7b277c324cbe1189dc0f2205c50b915899b542ef63be875ec SHA512 6eba919e6333c4833455784a377257a6d8dd7d134daf9a536113327487c8f2a191da942f9bea76fb963b0c04a64cd6ac7065b2c32e30fd1e61df302d6d424fdc
 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
index 76b8a76d3a72..c722d68f3208 100644
--- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # This version is just for the ABI .5 library
 
 EAPI="5"
 
-inherit eutils toolchain-funcs multilib-minimal multiprocessing
+inherit eutils toolchain-funcs multilib-minimal
 
 MY_PV=${PV:0:3}
 MY_P=${PN}-${MY_PV}
@@ -55,8 +55,6 @@ src_configure() {
 		$(usex unicode 'ncursesw' '')
 	)
 
-	multijob_init
-
 	# When installing ncurses, we have to use a compatible version of tic.
 	# This comes up when cross-compiling, doing multilib builds, upgrading,
 	# or installing for the first time.  Build a local copy of tic whenever
@@ -69,16 +67,15 @@ src_configure() {
 		CXXFLAGS=${BUILD_CXXFLAGS} \
 		CPPFLAGS=${BUILD_CPPFLAGS} \
 		LDFLAGS="${BUILD_LDFLAGS} -static" \
-		multijob_child_init do_configure cross --without-shared --with-normal
+		do_configure cross --without-shared --with-normal
 	fi
 	multilib-minimal_src_configure
-	multijob_finish
 }
 
 multilib_src_configure() {
 	local t
 	for t in "${NCURSES_TARGETS[@]}" ; do
-		multijob_child_init do_configure "${t}"
+		do_configure "${t}"
 	done
 }
 
diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
index 2ab63de41d4c..d98b23afb751 100644
--- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal
 
 MY_PV=${PV:0:3}
 PV_SNAP=${PV:4}
@@ -61,8 +61,6 @@ src_configure() {
 		$(use unicode && usex threads 'ncursestw' '')
 	)
 
-	multijob_init
-
 	# When installing ncurses, we have to use a compatible version of tic.
 	# This comes up when cross-compiling, doing multilib builds, upgrading,
 	# or installing for the first time.  Build a local copy of tic whenever
@@ -87,16 +85,15 @@ src_configure() {
 		CXXFLAGS=${BUILD_CXXFLAGS} \
 		CPPFLAGS=${BUILD_CPPFLAGS} \
 		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
-		multijob_child_init do_configure cross --without-shared --with-normal
+		do_configure cross --without-shared --with-normal
 	fi
 	multilib-minimal_src_configure
-	multijob_finish
 }
 
 multilib_src_configure() {
 	local t
 	for t in "${NCURSES_TARGETS[@]}" ; do
-		multijob_child_init do_configure "${t}"
+		do_configure "${t}"
 	done
 }