gentoo resync : 02.01.2018

14 files changed, 418 insertions, 95 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index c47be61e1b62..93736519de5d 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 7b3522bc4107..717354e1ad16 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -2,7 +2,9 @@ AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b
 DIST e2fsprogs-libs-1.43.3.tar.gz 599387 BLAKE2B decdb20114ad7b00754ecfe5658de6446cac8f2861a131cde71b6440934f5e66cbef7e5ef9945a15c6bccb3da0ca49d8f7bc04be59ee3565a03a16f850cdfbd1 SHA512 a1a5c01be1d020d858b958694747ba4f35032cd55bff71078cfddc31a818790ce4ead25fcf5e2aceca42c0faaf1635b6d8e3a2c7b87caac7f6fbbe5a44ceb411
 DIST e2fsprogs-libs-1.43.6.tar.gz 595409 BLAKE2B a5edf65b637b7f3fab16174a695baa232b8aeab6e8d28140a3a68ed63eee309949ca85a28f33d15199068fffe9174ef76b28f403ec09118296a458611592a36e SHA512 80a643ba349aac79c88548e9692066f777c5f9e82e309b348606a8078de456171535e6e5df91f73ca3db9d03bb539b1a19883cf74615357bdf77f3bd20cc0b11
 DIST e2fsprogs-libs-1.43.7.tar.gz 595431 BLAKE2B 12677792ff602586fa41f15c16a19b9d4135be8a4d8e4f26d40a8ee5b09254bec34f3ec6186b386fe0ef5690f26b2be54a46931eb5c76bf0693ce5877927fdc4 SHA512 b57c069d2e95588823fd69169378dd9d8a04ca77daa1a5dda8398cd198ace6184a3cb08507ae2b195de399caa4d197306043749f4a3010bccd942ba00d44162b
+DIST e2fsprogs-libs-1.43.8.tar.gz 596246 BLAKE2B 6847f177ccfdb06b49f58951b258647ec11b1237e3d33e44c2f7c6b93569445010914921d9447c842eba141c31a9982c72558dc6eb62fb2b24d1574a3204b1a8 SHA512 3127351310542326102dbbe84dade4043ff7f3046fb84e3364036a0975103a0aa146ba02400400e73affa658b93a69d0cb14855c2ab8f6da5b88d9ea0f17c9e8
 EBUILD e2fsprogs-libs-1.43.3.ebuild 1866 BLAKE2B 85c2912077fb0b2d9673a17ea16880a8b3f3b481134dd7c7057261811095bfe2bb72510338b0cd817363b319b5dee3f1848143f931bf5b98940dbc1af40b587e SHA512 d3b5cd55e334010d636fe72f5ec54b8ef4383327b242bb4be9bb496107c96d0cf83f47886dae2f915b4f7b6d9f53595b0effe7911a74770e18a20321c272dc60
 EBUILD e2fsprogs-libs-1.43.6.ebuild 1855 BLAKE2B 54e3174ce5891be2774b6921eaf9cf790d28f78f532ecbf214607877b95d6e294535231278ddd4748727d6a66e8805201b12b4d87047f26be0a2cd4c6e6d35b8 SHA512 629a6b920429ea98277618a32d7145ee5ed4a5b7fb98f2ad610ce9f9f13f877b4b99264900417d4341f4a411532fbc1218a529d288c3ceb405508bfa5f308c44
 EBUILD e2fsprogs-libs-1.43.7.ebuild 1864 BLAKE2B 0c8a29e52c2523ad58698611cb6aa16ec9e25f044aa7a7914d17af353f09f9359270976200eb2bfc667e783b2288b17da4336711200339e5fe5c7c24fc9cb6e3 SHA512 50f0993a527c7f75747615272875ef4f2d74799242c389fa8258e6dfcd0f86d29706bf12b8dd29be1de39bfcf49627ee991dc15d217c182fb66b54ffd97c0d97
+EBUILD e2fsprogs-libs-1.43.8.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.8.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.8.ebuild
new file mode 100644
index 000000000000..68c23f47263a
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac
+
+inherit toolchain-funcs eutils multilib-minimal
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+IUSE="nls static-libs"
+
+RDEPEND="!sys-libs/com_err
+	!sys-libs/ss
+	!<sys-fs/e2fsprogs-1.41.8"
+DEPEND="nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${P%_pre*}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+)
+
+src_prepare() {
+	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
+	default
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(tc-is-static-only || echo --enable-elf-shlibs)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+	)
+	# we use blkid/uuid from util-linux now
+	if use kernel_linux ; then
+		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+		myconf+=( --disable-lib{blkid,uuid} )
+	fi
+	ac_cv_path_LDCONFIG=: \
+	ECONF_SOURCE="${S}" \
+	CC="$(tc-getCC)" \
+	BUILD_CC="$(tc-getBUILD_CC)" \
+	BUILD_LD="$(tc-getBUILD_LD)" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake V=1 STRIP=: DESTDIR="${D}" install || die
+	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
+	# configure doesn't have an option to disable static libs :/
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 945bd5a2804a..d4df681e5dea 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,10 +1,9 @@
 AUX gdbm-1.13-fix-a-typo-in-gdbm.h.patch 657 BLAKE2B af19808507b00d941a51756bbc2a48686aad60c0a19626d4b3f549b948254629857eb7ce9a692d790fdf42877de2d6072455b1825347cf9d557e45239088c989 SHA512 bb31f6043184f02f9b0735d8827d09de77367bac489296805a963c01963a70c60dea8efb4a4a00c254019bf438f0c54159b3097c276185367f0064fe119544a1
 DIST gdbm-1.11.tar.gz 811662 BLAKE2B 5936aaac753da4aa5e9a103cfb8a50d33d8ff124846c9224f09aead496b9e76c269b17aaca0b96d3c51b0444910f29e4f9f246f858e5ab849917662711732f4b SHA512 272fb65ab9ca0a21e9f0dcfb2c638457e87cbb938c65ee850123474d11f2858496f84d3fa9edca27cd91c7220160cfdb59f90bd46ddc45395514addc9fd4151c
-DIST gdbm-1.12.tar.gz 841213 BLAKE2B e91d595df6bef489edf005a3e6ea66f3bb64dbb8afc079d82a16796cae53759bb0ab6123929d2375dcc2ff6b1dec15522b9d6a82c22bffa1f7a21a9c01673644 SHA512 25e03dceed6986f1977d304a5ad059ac6c603a88ad4aa18c831ec42df82d68006f2e04b8a3cc400d0a4970750c78ba24a3f84cdff70de9f278cfd854c059699e
 DIST gdbm-1.13.tar.gz 891987 BLAKE2B f73cb89aeed140a584c5a8bce9c2324cc39a7647ee288364af66fbe1c1cd8662e53f7cb82a208e795a6d27adc048018153671d964ecad518407eb888283e17c5 SHA512 fdb777f5b415b0578ea46b4a6fc70151a04a3568e2f2c8c0219ccad8c0d34abb773d80d5d7a06462ad1a3d6c1f3b5b7ab25f9de4f43ccf05c58db05f9a2906ad
+DIST gdbm-1.14.tar.gz 893270 BLAKE2B 413b0e866579c697baa8b6ee2412690d3a25aecae1a1bed7b213560a452bf6a41343cabcc5e1c4c3269f796148e7c94782b479790227780e0bd1e8e965eecb87 SHA512 8378920c446f4d343f43af9982acc93be28faf0d6ac709abead03fdd8d47e9ef0226e86179d1e9cdc239c096a11f8d9ccd524747f6114ed9985e1120b8b60c2b
 DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
 EBUILD gdbm-1.11.ebuild 1887 BLAKE2B 1f6680d070bc540e8e476e0f8abcd46c09b98f4334465b544b4c9ee1e92da3855e792cbc78ddb7f54d1cc2e1c7bf0d619289252647a895b9bb6f7c7d017aa30d SHA512 fb5768d73a8a25cad8e6defeba0dd4ba788a2f339e697054da879b0aa600cfafa18ec5793a255bc5cc3066019c189bdcb43842710588590c2bab1c28c172d5d5
-EBUILD gdbm-1.12.ebuild 1898 BLAKE2B f7f4d3587b0db3a0aa8606a4c743c2f225d7f08371a343572097b1ad908433707084dff2c831f52842663d9822e38fc212f281ced6c3d1a4f339322e92ce579c SHA512 70b901cc796d76e15f914528b68d80348415918c32d7fa6fab2600680bfc21a09fdad51c083eabf8913de6554fca2824e74025f797c1002e9d10264c80d99348
 EBUILD gdbm-1.13-r1.ebuild 1835 BLAKE2B 29c065fd646456fd5a34c6a97fcb0970037944293abfd0490eb7780788bceafa6d8ac83aef406dfec4f4901e946d240fad96485f79c6ce278bdf45c42d7ceef5 SHA512 a9f3a564ebbc6e5b2b539138bc2f4ab018e3a9f773005d3a98a177daca764e1f442c8c6901b2e72439d3d3e11d96087fd698a4e6095d4dcc5a74978e0c07fdde
-EBUILD gdbm-1.13.ebuild 1908 BLAKE2B 51eaf9aa599691b493428c85d9d798ea2e534a2255990ee6ba9def27820920770f04c7e0a2cec0f85cc1cab4c505bb6ca069ed0cfd71032c109c1e1e2efea918 SHA512 35b0414c2eec85e9b5ff6b7b8e152c1f59e135161e1d1bb39ccee5339b8871ef50b291a0eb5bf3c8d83694d1a84d0759ffd709411586e5209fd4ef23fbe6ae16
+EBUILD gdbm-1.14.ebuild 1791 BLAKE2B 21cb2319c43ba0e0fbfde666aaf3d364a706cc85d86d0d2c5e1a725a9ce190aa91616be649e66faf47c1a54af94dc61f6e488aa9692f11280d2383eb9555e360 SHA512 41f9aaf1a9a77d6e512f01f3dbbce94997586137a11546e9c6d0e846c8091c8af0bb1bee11f56c7cb8351ddd561b23681b2ab4a54babea313025b76eeb74ae18
 MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41
diff --git a/sys-libs/gdbm/gdbm-1.12.ebuild b/sys-libs/gdbm/gdbm-1.12.ebuild
deleted file mode 100644
index 4748ea363615..000000000000
--- a/sys-libs/gdbm/gdbm-1.12.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic libtool multilib multilib-minimal
-
-EX_P="${PN}-1.8.3"
-DESCRIPTION="Standard GNU database libraries"
-HOMEPAGE="https://www.gnu.org/software/gdbm/"
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
-	exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+berkdb exporter nls static-libs"
-
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-EX_S="${WORKDIR}"/${EX_P}
-
-src_prepare() {
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# gdbm doesn't appear to use either of these libraries
-	export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
-
-	if multilib_is_native_abi && use exporter ; then
-		pushd "${EX_S}" >/dev/null
-		append-lfs-flags
-		econf --disable-shared
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--includedir="${EPREFIX}"/usr/include/gdbm \
-		--with-gdbm183-libdir="${EX_S}/.libs" \
-		--with-gdbm183-includedir="${EX_S}" \
-		$(use_enable berkdb libgdbm-compat) \
-		$(multilib_native_use_enable exporter gdbm-export) \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	use exporter && emake -C "${EX_S}" libgdbm.la
-	emake
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-	mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
-}
-
-pkg_preinst() {
-	preserve_old_lib libgdbm{,_compat}.so.{2,3} #32510
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify libgdbm{,_compat}.so.{2,3} #32510
-}
diff --git a/sys-libs/gdbm/gdbm-1.13.ebuild b/sys-libs/gdbm/gdbm-1.14.ebuild
index 1aafca746d33..c617c54ab178 100644
--- a/sys-libs/gdbm/gdbm-1.13.ebuild
+++ b/sys-libs/gdbm/gdbm-1.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit flag-o-matic libtool multilib multilib-minimal
+inherit autotools flag-o-matic multilib multilib-minimal
 
 EX_P="${PN}-1.8.3"
 DESCRIPTION="Standard GNU database libraries"
@@ -24,7 +24,8 @@ RDEPEND="${DEPEND}"
 EX_S="${WORKDIR}/${EX_P}"
 
 src_prepare() {
-	elibtoolize
+	default
+	eautoreconf
 }
 
 multilib_src_configure() {
@@ -59,14 +60,8 @@ multilib_src_compile() {
 multilib_src_install_all() {
 	einstalldocs
 
-	use static-libs || find "${ED}" -name '*.la' -delete
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 	mv "${ED%/}"/usr/include/gdbm/gdbm.h "${ED%/}"/usr/include/ || die
 }
-
-pkg_preinst() {
-	preserve_old_lib libgdbm{,_compat}.so.{2,3} #32510
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify libgdbm{,_compat}.so.{2,3} #32510
-}
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index acf2f81efe95..33a5d7fbfc49 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -8,6 +8,6 @@ AUX libcap-2.25-gperf.patch 620 BLAKE2B c870cd0d093df2e8f7498adc4d9b23f101089d80
 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389
 DIST libcap-2.24.tar.xz 63412 BLAKE2B 9edab6e606f64dcb06eb75160775340ff5ab92a7f5d98957c682d6510aa510a21f6c796af64dfef0090d9c035b94903d86b360635977e55549e51e25b8fa167e SHA512 c062bab936d651a50efa66dcfa51ab3ce4b0881195d23bb32142b5c8044d30e0e2152f3497844ce90c04f909aeffe2d41203efff41972e38758dcca7b653884b
 DIST libcap-2.25.tar.xz 63672 BLAKE2B 205790dea83f15b585e5151814ea520ab1545661d18fa57f36e8c8e597a7c0f0ff1d7b5ccffc36e313eb28606f1e71678233a06896e29cb28e5559b190dd47ed SHA512 c3ab491885292adc171cde542b96f1295e84132febb50112a46575c3bde3a3eb6fcf733f7a756b4b656e013c0abb5ed6571db24799f8c0b23d8f759f992864f9
-EBUILD libcap-2.24-r2.ebuild 1849 BLAKE2B 1aa06743d5883db4958ed3c24acd20b42fa1fe9b2fbf629121b7dc1fe58b5e69130dbbacfcfc39cb40ed4e5059dfeddadfbfc83d8e5e2540df4ab8731e7fe925 SHA512 bcc666cb5493e71c9060144a87289cdbb8cdf7a9ee98de6d44619a54881a0b4585e50c8edd24596a419a9e79c67e8ecd0eb215fcb68bd2b7305e704d346dd1e1
-EBUILD libcap-2.25.ebuild 1993 BLAKE2B 3a9f36dd3b74e95263add1659a4e597451840d16ea5cfc4bc07e8c190dfb77739bd34fc9c5681a4d395baec580acad8295b51f1fe684f73eb9840451faf81466 SHA512 f06c3222c4138950a7acbf1ff51dec492e383a8f6155a6e00477df63fb56f71138e49754bdb4fc4c7644d4acfc379d26504de926b8419cda8b8ac14c1efafb9d
+EBUILD libcap-2.24-r2.ebuild 1865 BLAKE2B aa257346d0da204ae26fd2f702681e9d207dbd36d72648f049c25c6611262c82ecc0f4580406a361bd20cfa391b49bb8f487f1481c0795018b6d30ed08aa6f6a SHA512 2d0fceabd4131ca6cafd7b2f2d8f27be7cd2a4bc4a0dd7614d0f7212cb3959e4e80705c6431d106542901384be51f4ad57f5c3a14ef06c1ded163b16835cbbc1
+EBUILD libcap-2.25.ebuild 2009 BLAKE2B 9b73d115bff54fe3b03ca1fe995a5aa4f5c9d43d2bddc0546fd61a0cc657a251562ba9d96cf7115d04f89d47d516bf7dea6fe32b049f1fba774c3fba3843eb54 SHA512 f59b50c716e78138bfeff288e82b062f442fdb54ba252846f4f9d6933de5ca138e69e230e6af1dc40ef25a0d31b079e1701fb88d7bd6f8cb11969b8177b4e117
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libcap/libcap-2.24-r2.ebuild b/sys-libs/libcap/libcap-2.24-r2.ebuild
index 5575faa355ce..56d79e96f0e5 100644
--- a/sys-libs/libcap/libcap-2.24-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.24-r2.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="4"
@@ -47,8 +47,9 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	tc-export_build_env BUILD_CC
 	tc-export AR CC RANLIB
+	local BUILD_CC
+	tc-export_build_env BUILD_CC
 
 	default
 }
diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild
index feb60b9a4b62..81fb56032a2e 100644
--- a/sys-libs/libcap/libcap-2.25.ebuild
+++ b/sys-libs/libcap/libcap-2.25.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=5
@@ -52,8 +52,9 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	tc-export_build_env BUILD_CC
 	tc-export AR CC RANLIB
+	local BUILD_CC
+	tc-export_build_env BUILD_CC
 
 	default
 }
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index 2e234294182c..5e7b58b43bc0 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,4 +1,5 @@
+AUX libstdc++-v3-3.3.6-glibc226.patch 1349 BLAKE2B e16351bae2539fac5d71b1cec43e0869f079c34e1bc59a170b7ff699e6c9aff95dbde09b07c17f3ec4a66f02548a3c78e4679eab38244aa5a2ddde12856fb1fc SHA512 05e2195c385b8cfbeb7b4978a70c3dbcee02210ff7b1785ad736f6c2cbbb8bf3abefec93417c427c2719b2bf6ebe565f432f45e5e17a4c51672785ed5b650a22
 DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 BLAKE2B 68704c1ddb73d2966746dd1a57b9699c3130d9165dd990b0b70f13b0dc4c7c4503afcbb268fd54242e17bdd571d5d0a20c172ee431c3c772e7c3412d3f0ac884 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
-EBUILD libstdc++-v3-3.3.6-r1.ebuild 4824 BLAKE2B 699ae3ac4a865dc8a52ae904418140958faa9345d6b595d0005a7dc3930b5fc492cb867949c057c659cc63685ec138a9152fa304169aca998dd5b430329b3f1b SHA512 54c0a0965ecedd0ea53921e2449076c00d040ff6e4d50989bf87c310597983be5d558ba533433964bc074080e6235aa84a21bc15554685b8c5581939d00c1c09
+EBUILD libstdc++-v3-3.3.6-r1.ebuild 4921 BLAKE2B 80cf6f16d9a1128d47a5ea7a7959eed300a7e8d64adb23c81a17c033d7738ed8938fc65531929dd34e592481ef9cf6e1bd4e8211f9d521a88405299b5ba65af1 SHA512 61a11c5f4a0159d61f4aa927e0f802be01bc2b2ab401c1d99ca8b47ca7540ac3442d6817a4fa9d2a76e40857fb625448d50e3297130864f673beac7a83a0cda8
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch b/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch
new file mode 100644
index 000000000000..a444da2d2bfc
--- /dev/null
+++ b/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch
@@ -0,0 +1,33 @@
+diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux.h gcc-3.3.6/gcc/config/i386/linux.h
+--- gcc-3.3.6.orig/gcc/config/i386/linux.h	2018-01-01 20:14:36.311860098 +0100
++++ gcc-3.3.6/gcc/config/i386/linux.h	2018-01-01 20:16:05.912287579 +0100
+@@ -261,7 +261,7 @@
+ 	  siginfo_t *pinfo;						\
+ 	  void *puc;							\
+ 	  siginfo_t info;						\
+-	  struct ucontext uc;						\
++	  struct ucontext_t uc;						\
+ 	} *rt_ = (CONTEXT)->cfa;					\
+ 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
+       }									\
+diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux64.h gcc-3.3.6/gcc/config/i386/linux64.h
+--- gcc-3.3.6.orig/gcc/config/i386/linux64.h	2018-01-01 20:14:36.271859907 +0100
++++ gcc-3.3.6/gcc/config/i386/linux64.h	2018-01-01 20:16:05.912287579 +0100
+@@ -112,7 +112,7 @@
+     if (*(unsigned char *)(pc_+0) == 0x48				\
+ 	&& *(unsigned long *)(pc_+1) == 0x050f0000000fc0c7)		\
+       {									\
+-	struct ucontext *uc_ = (CONTEXT)->cfa;				\
++	struct ucontext_t *uc_ = (CONTEXT)->cfa;				\
+ 	sc_ = (struct sigcontext *) &uc_->uc_mcontext;			\
+       }									\
+     else								\
+@@ -182,7 +182,7 @@
+ 	  siginfo_t *pinfo;						\
+ 	  void *puc;							\
+ 	  siginfo_t info;						\
+-	  struct ucontext uc;						\
++	  struct ucontext_t uc;						\
+ 	} *rt_ = (CONTEXT)->cfa;					\
+ 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
+       }									\
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
index 53ec501f081d..c90cf870b492 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.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
 
 inherit eutils flag-o-matic libtool multilib
@@ -130,6 +130,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+
+	# bug 637608
+	has_version '>=sys-libs/glibc-2.26' && epatch "${FILESDIR}/${P}-glibc226.patch"
+
 	elibtoolize --portage --shallow
 	./contrib/gcc_update --touch
 	mkdir -p "${WORKDIR}"/build
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index a973754312e8..66ad25471242 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -14,4 +14,5 @@ DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490
 DIST ncurses-6.0.tar.gz 3131891 BLAKE2B 68670ebdaba28c7a750631da01a0e3681b476cc9e9ae6fd9eae5a254f41fab5f1a5df5fa9897a92d1da751f1cc0b72f2ffee4603865900e67fcbb949c102cf78 SHA512 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
 EBUILD ncurses-5.9-r101.ebuild 5295 BLAKE2B dccde970635c874070f52a3fe1cd49f6f2c21a3360299596d49db2d57ec9be4c9319fe1d38af49949d8528ced9559ffa8d01d339a5f44b3181cf6405f68a0a5b SHA512 e7505e1b91925abed6feb120da09ec578276c467fef6b3e99fa8ebf74e4abecc130507406919ea1c49e7f9e4738e9c0b4dc20f9964b603de50dba2abe637f1ad
 EBUILD ncurses-6.0-r1.ebuild 8645 BLAKE2B c74fd055fbcdd72c4f3a8d719ef568d015f4edb57ce9167497307689d069148ad4a8789014ae81d7b277c324cbe1189dc0f2205c50b915899b542ef63be875ec SHA512 6eba919e6333c4833455784a377257a6d8dd7d134daf9a536113327487c8f2a191da942f9bea76fb963b0c04a64cd6ac7065b2c32e30fd1e61df302d6d424fdc
+EBUILD ncurses-6.0-r2.ebuild 8668 BLAKE2B a6a1229148f506938aacf52ab00b9e81f54e15114c6416b9a1e5ebf55a9eb5987940e4bf1ec1bfbeb054483628f2a159cbe1bc8d26ad27d887230278b7df4779 SHA512 e9f515ff4be96474f1a13da4c6b1eb5ce2afb14dab5b6244fa556f539e465a0813f8d9ec6cbc62d81b6892b851a5cbc3d40725cd647ec99949edd0579882870e
 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/ncurses-6.0-r2.ebuild b/sys-libs/ncurses/ncurses-6.0-r2.ebuild
new file mode 100644
index 000000000000..9051223ca378
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.0-r2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal
+
+MY_PV=${PV:0:3}
+PV_SNAP=${PV:4}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+#	berkdb? ( sys-libs/db )"
+# Block the older ncurses that installed all files w/SLOT=5. #557472
+RDEPEND="${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1
+	!app-emulation/emul-linux-x86-baselibs"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0-gfbsd.patch"
+	"${FILESDIR}/${PN}-5.7-nongnu.patch"
+	"${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
+	"${FILESDIR}/${PN}-6.0-pkg-config.patch"
+	"${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114
+	"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
+	"${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426
+)
+
+src_prepare() {
+	[[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
+	epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+	unset TERMINFO #115036
+	tc-export_build_env BUILD_{CC,CPP}
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		$(usex unicode 'ncursesw' '')
+		$(usex threads 'ncursest' '')
+		$(use unicode && usex threads 'ncursestw' '')
+	)
+
+	# 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
+	# the host version isn't available. #249363 #557598
+	if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-aix*)     dbuildflags=     ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}"
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Disabled until #245417 is sorted out.
+		#$(use_with berkdb hashed-db)
+
+		# ncurses is dumb and doesn't install .pc files unless pkg-config
+		# is also installed.  Force the tests to go our way.  Note that it
+		# doesn't actually use pkg-config ... it just looks for set vars.
+		--enable-pc-files
+		--with-pkg-config="$(tc-getPKG_CONFIG)"
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		--disable-termcap
+		--enable-symlinks
+		--with-rcs-ids
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable !debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(multilib_native_with progs)
+		$(use_with test tests)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	fi
+
+	# Force bash until upstream rebuilds the configure script with a newer
+	# version of autotools. #545532
+	CONFIG_SHELL=${EPREFIX}/bin/bash \
+	ECONF_SOURCE=${S} \
+	econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+		BUILD_DIR="${WORKDIR}" \
+		do_compile cross -C progs tic
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+	done
+
+	# Move main libraries into /.
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a \
+			"${NCURSES_TARGETS[@]}" \
+			$(use tinfo && usex unicode 'tinfow' '') \
+			$(usev tinfo)
+	fi
+	if ! tc-is-static-only ; then
+		# Provide a link for -lcurses.
+		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
+	fi
+	use static-libs || find "${ED}"/usr/ -name '*.a' -delete
+
+	# Build fails to create this ...
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
+}
+
+multilib_src_install_all() {
+#	if ! use berkdb ; then
+		# We need the basic terminfo files in /etc, bug #37026
+		einfo "Installing basic terminfo files in /etc..."
+		local x
+		for x in ansi console dumb linux rxvt rxvt-unicode screen{,-256color} vt{52,100,102,200,220} \
+				 xterm xterm-{,256}color
+		do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename $(dirname "${termfile}"))
+
+			if [[ -n ${termfile} ]] ; then
+				dodir /etc/terminfo/${basedir}
+				mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
+				dosym ../../../../etc/terminfo/${basedir}/${x} \
+					/usr/share/terminfo/${basedir}/${x}
+			fi
+		done
+#	fi
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
+	doenvd "${T}"/50ncurses
+
+	use minimal && rm -r "${ED}"/usr/share/terminfo*
+	# Because ncurses5-config --terminfo returns the directory we keep it
+	keepdir /usr/share/terminfo #245374
+
+	cd "${S}"
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	use doc && dohtml -r doc/html/
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}