gentoo resync : 19.04.2018

16 files changed, 201 insertions, 790 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 7377993aaade..704ce90af8ff 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 7470818dc5dd..e0d058c9b171 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -5,7 +5,7 @@ DIST e2fsprogs-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a
 DIST e2fsprogs-libs-1.44.0.tar.gz 714451 BLAKE2B 30db99eb22814c36ce55ec3bbcdf2c81faaf1708625ca06ab62a96eed89371ca996e31da52ef0045899d0d5289c3a918bd3743c72ebce778960084c19133f18a SHA512 7b4db8c7e07c3915f1e92d832044d1dfb61a38220e19ba8ba62dce7db532ffb04d9dfc89b5ab509e75023d64dfdfa5e9271249a5436ee9758dcfcd14221f6f75
 DIST e2fsprogs-libs-1.44.1.tar.gz 714486 BLAKE2B d2794e5b3a28b2b3ef811396ffb3ac139c294f8a4407cd74ae0f8c6b39d5ebcdc464cfd2e99e1f8fd3e2be7bcb2016c019f586810ccbfef15696fd2a21cb49cd SHA512 2b81454230def3f499a634e38342f323d3708be460ec0d69a7de7d9c9fea657a84759f7dd09b81e7dc6fbe07510c06c5e55317374a25f4ed3b6dfc58881132a3
 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.6.ebuild 1854 BLAKE2B 6751907b5bd67f9b1aae0133eae4c9df1a29fa06ac359c3af904ac490b32837cdae4f2c196ba1a7cc3e689cb0d34b35fff09adb493ea4c091dd3e53de6074c96 SHA512 565b03d3728d9044166e7e61a0ade32cb31b47697e21a0230f2fe5ad6f2ba096b9c0e58db9993ab359ed348623e05b8a29a25010212396f1191eeb7f4ab083e7
 EBUILD e2fsprogs-libs-1.43.9.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 EBUILD e2fsprogs-libs-1.44.0.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 EBUILD e2fsprogs-libs-1.44.1.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
index 48b5af46daf8..d97994571452 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.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
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${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"
+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
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 1cc2dbff6c88..321a415a3644 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -12,10 +12,7 @@ AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb
 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6
 AUX ncurses-6.1-st07_terminfo_typo.patch 563 BLAKE2B e28c682c752e8e075691045217d14f88e5a1c5805c014e9b6ccc1d19179cc60dd04dea418a6d9d6302140a89c1977e47b6d9385c7192fdac6a26c9d2e2a33f69 SHA512 a81faa2c9450179324ba56c8cbf3bc5104fbfb2bb9108dfcd93a63fb3ce88c25cb5ab130a2e015816a1a2efa42c2fb3fb3b4b381517d45804efad997a36c8508
 DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
-DIST ncurses-6.0.tar.gz 3131891 BLAKE2B 68670ebdaba28c7a750631da01a0e3681b476cc9e9ae6fd9eae5a254f41fab5f1a5df5fa9897a92d1da751f1cc0b72f2ffee4603865900e67fcbb949c102cf78 SHA512 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
 EBUILD ncurses-5.9-r101.ebuild 5283 BLAKE2B 2860fee40555ddc883b4ffffc8ea1055c4c5151b451b8a25226fbed116d37e3862a6c9c885666365882bea428fff71417811b5ba04aa72ae0df6ed6bb3afbeaa SHA512 dce58899c1ca8b1ba1206fcbc015821e5de433b8ca4f750889d9281e35c15e70bd2628f4ef3a9990d7f1c8d6a757368833d9c88587eff6e480465697ac29d6f3
-EBUILD ncurses-6.0-r1.ebuild 8633 BLAKE2B b177892af3da61b6f3d2e276a3545de911ae0dbe123797807b63d45fb912b4b0333b487fe52827abe1154332902f9f111b65890fbb4063c691c6aba356a30062 SHA512 00585f364321576bca9f55f49ffa4f7983c8293fc3db1103f7f045d5de6618e88a68255e6c3f383098143b568e49cacedc9a27a4bf7504df69a1afb49b0bf5a8
-EBUILD ncurses-6.0-r2.ebuild 8995 BLAKE2B 1800de0a3a38539c5bc535b9845c16a16c1b5d62f891068cb364c12226672ebc9a8555d56fd56cd08f94be24ff753471eebd47415a1df926bc9e52f7c2fc3444 SHA512 1003c59f675226c70bc1fe580c1299f50a2bd26f4eb9f6dbd81f83ec3bdf7217a5f8cda15edfba48d062c6eef4001ff3a71d6b5e379fcf279170a71940a9ef4f
-EBUILD ncurses-6.1-r2.ebuild 8782 BLAKE2B d57b6bc39f6d7828c764adf47fdd36e8121b5a43a521212ed648595b55764f2716b92b71e606da0f5f7622eac7553849982ac79b5e8bcc8a8ec2f33f0ecd7431 SHA512 f8a30f5671d1b893530dba3506d18baa024acbd4496b79b783d6b4ff561531bce822cd49f6711915253e4fefff8fa31eb6cbdb09e45c483aadc40ce67a2dbc58
+EBUILD ncurses-6.1-r2.ebuild 8779 BLAKE2B d24df10dd2516c16a2b25544d72f30ec71223d285ffea2099af7aa3a6cd810a73f9a8615e20841c3aeecfeaabf08f21591b5c18f4e25ae7327afa6e7412d53af SHA512 df0e81e879172c63eb6f444ad9ca11fe229a49dff1f498abf1337a9c30f007f5df8fdb7745cf895e21d16834904cc78739499ef6b94a898ceb33294c7b27fef6
 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
deleted file mode 100644
index 562662fc29ba..000000000000
--- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2018 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 ~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..."
-		for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \
-				 xterm xterm-color xterm-xfree86
-		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
-}
diff --git a/sys-libs/ncurses/ncurses-6.0-r2.ebuild b/sys-libs/ncurses/ncurses-6.0-r2.ebuild
deleted file mode 100644
index 6587f1b72a6f..000000000000
--- a/sys-libs/ncurses/ncurses-6.0-r2.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2018 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 ~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.
-		# This is fixed in newer versions:
-		# https://lists.gnu.org/archive/html/bug-ncurses/2015-08/msg00026.html
-		--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)
-		# Required for building  on mingw-w64, and possibly other windows
-		# platforms, bug #639670
-		$(use_enable kernel_Winnt term-driver)
-		--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
-	# don't delete '*.dll.a', needed for linking #631468
-	if ! use static-libs; then
-		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
-	fi
-
-	# 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
-}
diff --git a/sys-libs/ncurses/ncurses-6.1-r2.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild
index fcf33051057f..a13f47d42f2c 100644
--- a/sys-libs/ncurses/ncurses-6.1-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild
@@ -15,7 +15,7 @@ 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-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}] )"
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index 310db5a1a6ef..3bce2d2463b6 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -2,6 +2,8 @@ AUX openipmi-2.0.16-pthreads.patch 546 BLAKE2B 53d2f7473b0a5705eed3ff4acd3b635be
 AUX openipmi-2.0.21-tinfo.patch 818 BLAKE2B 5d647663899cc6b55c2c412d8bd8164ceddfdeeee42863b40781ee7317f3f23b1b6e0d466001ead51beba286ddfe195683fc36bdadb3f279da0a881f058aa028 SHA512 2b3f7f10f6f7f1a71973f0f8f125171c33ad9149bdcd808b9b76571ac2d5a403db0b23bde0fbcb7763fba6101b5015775a3563ed77197f4a50d7ca98812f6d6d
 DIST OpenIPMI-2.0.22.tar.gz 3081893 BLAKE2B 6ec5ec7f61f3033a9d953df4b091522fa5bd891a93dfe648f807548e3dc0f5ffc0d15af9b687379e6749d7b97ee2fd6c7f9e713aaa7423b82bf099fb2d0fb6b8 SHA512 78017fc0b52ce6a83db45f595f50170410120c9f7394429869c177ee40ea5b924bcc0e36bb60f9368a75a2f78ff71c70ae3631ba55a207cfb6eb4f62aa44ff89
 DIST OpenIPMI-2.0.24.tar.gz 3211633 BLAKE2B 56658e0c06ae2d192415fb5d71fe13afc5819a7b2412af8f51d829a11f3ad10faf592b5da4cb51e43667303385ca2c1f8413045bc444f045d6f3e0f6dc553682 SHA512 de1e0a46d7e25af06e07a0f5b8e23deac14d2bca854fbe09b221e776b46b5cf13b5af6b7ee1e8d0984eb792aa4bd095d66d98775674809feafe0a357ca95d677
+DIST OpenIPMI-2.0.25.tar.gz 3212723 BLAKE2B eb0872fe4b06b84cdb6a4e301d4c80940351d8bf14d50e5cd67525a09ba98674cd890852d4692d6b77c4e935646f3bbd5e84202b8b619e65daef99034d7fb016 SHA512 5d89deb5d0d0ff44d6f62a9759577dba92aa58c208477e317aecbd01e71ccf7ba0dab138a1d8feff22d523c85d6ceaee9e478e26834ffcd91949b81d2d9c1f86
 EBUILD openipmi-2.0.22.ebuild 2739 BLAKE2B e6e55f84f94eff0f39eb041fe7b1d82f81bcaab2f0eb55c0010bde1e2ace70f4d493663a44ff9b859851556c7e78f7f4835ce8f4df96db2d8cb1a04a0f4ccdda SHA512 43e979f877e17c82ca317ea41d73e84cc9af65496b198b5b0c4f81251f0b47713022de672b105ba447f6e880d42546fa2140ca9dc4fe60f90cdf5c709eb3f5dc
 EBUILD openipmi-2.0.24.ebuild 2664 BLAKE2B ff7eba5bbcfddae292fef31f6af242eec6121673170501fd812f85230aba1a3cb19baab753fcb7ad98cfa0d816b6834f4fe55541b857ed1a92aa09185efa70ca SHA512 6f519bab6f691853867e93969f5b8c90c93f8b17c6fa7f38d9f283b247f5ceb994a322a1a0fed7cd0d77f6ab8c907513bea67942566e04550395af588c2bac91
+EBUILD openipmi-2.0.25.ebuild 2482 BLAKE2B 07716bb39ccca6ebd4128d4a7f6aa2ac1e0ac2cf30ae19c80240ca15cfee903db1566a9ae560aa02f9dd11189501e91bd417c64528418cf6ed4cd5ebb8e43bd7 SHA512 1f726abce948f14e4b0ad036b5dbb9a7540edd9a692c1de6071fb23a135b0a5e0bb30970c0c0b37f323dd3ec1d34d138280c60e8e822669d4b78e6f4df6a2822
 MISC metadata.xml 347 BLAKE2B 4857bbfde0e588b4ad2ac893f826affe46d77ead16c7565fa775580c23fdd35df745a9050b599d0ff333290a155b48cf6d571065abd8b2fe5cc4b2e136f3efc1 SHA512 f67b97714b2b543109c2bc90d8f474df13e8915b7a14fdc3a16b62f1dfbc59ac27c8e64d19429b87a63ee2c1e4812cee26d8fb797591028484b2072b1951231f
diff --git a/sys-libs/openipmi/openipmi-2.0.25.ebuild b/sys-libs/openipmi/openipmi-2.0.25.ebuild
new file mode 100644
index 000000000000..e000e191fbcc
--- /dev/null
+++ b/sys-libs/openipmi/openipmi-2.0.25.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils autotools python-single-r1
+
+DESCRIPTION="Library interface to IPMI"
+HOMEPAGE="https://sourceforge.net/projects/openipmi/"
+MY_PN="OpenIPMI"
+MY_P="${MY_PN}-${PV/_/-}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
+IUSE="crypt snmp perl python tcl"
+S="${WORKDIR}/${MY_P}"
+RESTRICT='test'
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/gdbm:=
+	sys-libs/ncurses:0=
+	crypt? ( dev-libs/openssl:0= )
+	snmp? ( net-analyzer/net-snmp )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.21
+	virtual/pkgconfig"
+# Gui is broken!
+#		python? ( tcl? ( tk? ( dev-lang/tk dev-tcltk/tix ) ) )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	# https://bugs.gentoo.org/501510
+	"${FILESDIR}/${PN}-2.0.21-tinfo.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Bug #290763: The buildsys tries to compile+optimize the py file during
+	# install, when the .so might not be been added yet. We just skip the files
+	# and use python_optimize ourselves later instead.
+	sed -r -i \
+		-e '/INSTALL.*\.py[oc] /d' \
+		-e '/install-exec-local/s,OpenIPMI.pyc OpenIPMI.pyo,,g' \
+		swig/python/Makefile.{am,in}
+
+	# Bug #298250: parallel install fix.
+	sed -r -i \
+		-e '/^install-data-local:/s,$, install-exec-am,g' \
+		cmdlang/Makefile.{am,in}
+
+	# We touch the .in and .am above because if we use the below, the Perl stuff
+	# is very fragile, and often fails to link.
+	#cd "${S}"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# these binaries are for root!
+		--bindir=/usr/sbin
+		--with-glib
+		--with-glibver=2.0
+		--with-swig
+		--without-tkinter
+		$(use_with snmp ucdsnmp yes)
+		$(use_with crypt openssl yes)
+		$(use_with perl perl yes)
+		$(use_with tcl tcl yes)
+		$(use_with python python yes)
+	)
+
+	# GUI is broken
+	#use tk && use python && use !tcl && \
+	#	ewarn "Not building Tk GUI because it needs both Python AND Tcl"
+	#if use python && use tcl; then
+	#	myconf+=( $(use_with tk tkinter) )
+	#else
+	#	myconf+=( --without-tkinter )
+	#fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.vm
+	newdoc cmdlang/README README.cmdlang
+
+	use python && python_optimize
+}
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index e02a0161cdeb..71e88cef89f5 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,10 +1,4 @@
-AUX slang-2.2.3-slsh-libs.patch 678 BLAKE2B 8fbf00d746f69905cbbb14378987fe045df5aa909f186a48060c9ffb8467c9e8ae34e40d7081a568759b42d4d39d57ccf6bc16b2cd314db0fa2cc943efd31e05 SHA512 62ce13a54178432463873e1f31e50bd47559ef0fff6c0a58497cfb908b055ea2f80d1af5d2c5bdafdf6e85e7c75d48bd0d39905977d1591e7559a285685a9b72
-AUX slang-2.2.4-memset.patch 1054 BLAKE2B a4d013b70719de8ab92fbd04afbde87b6be519cc1dd810c19618db916750cce03263a2919baf33d5c0714579b495241b4031038d41a1abb67c532444cd37d116 SHA512 ddbbd089c3d1128353951438fc527b6cc7e2268d5dc7384123fcf36dc198872a0cf229c850b3e6c1538807adaf3b426d3748f3ed2fd4b021080d5ebda30d56ee
 AUX slang-2.3.1-slsh-libs.patch 761 BLAKE2B a0bc1a573fa1031e44c998bb75c80113ccd86be47f7d0b80da0ba53c7fa066d780ebb86b9cc5ff503e0d4c99b49fe75cb4c916088cc7b18a5a6c1670cbca4ba3 SHA512 77516f0b0373a08fbf61765e4eb83cbfa91b29a58a41e0006d1041672c6107dc5a2410056d65dd64fe68de40e01c211feb9f748a8238473cd5c98dfe2125f7b2
-DIST slang-2.3.0.tar.bz2 1532986 BLAKE2B 92fe1338c2f07e78fbffd0435252a75d8158ae0ce6da9cf95cc553bcd8bdd393b7f1c975d516ab732805a006a03db963651736027e052c156910393443053934 SHA512 0b04d916409c59f66301877c078bcca63c8b71e5dfa6c1d804353e41949bca16e664a79381c4156068b1f878c333e618f1de165e4059b09831fa83a794613050
-DIST slang-2.3.1a.tar.bz2 1577749 BLAKE2B e3149502a7d6e6d13800f3d3df6e56f176da089b9e9a24d23ddd4958cbc43c729e42326b9e487f6356989434ad3029c1c7ae27b49b60b8e9598053cb24f043c8 SHA512 e7236a189081ebcbaf4e7f0506671226a4d46aede8826e1a558f1a2f57bcbe3ad58eadeabe2df99cd3d8bacb4c93749996bcbce4f51d338fc9396e0f945933e7
 DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5
-EBUILD slang-2.3.0.ebuild 2266 BLAKE2B a94234aff5114d0615cb99c594542bef50ee738bd59a6b6ccb864ebcc243774296f04351b45e80d045c90b68c638fdc3b85860b5670ccb01a0477ca8a14c0e14 SHA512 3a9544b8fdcb2d2faa4a3becd0dc60402886f677180d87d5148ed857a25cfad6ed62eb49a334b287ba36fc10ae5362d01dbcda482526e9c4f92ce430eed85661
-EBUILD slang-2.3.1a.ebuild 2264 BLAKE2B 54a95855948ad64c5dc9f630641ad669f879c3acf0a7e2ff15121aaaf4564878619e45ad2205a6b2d52a7a1b90262b6e13d074bfddc65e7a55c0d37a31c62c77 SHA512 409f754626c1384bca2fafd3ee96c51985968be22a2bb0076650adb1c069dc0e9a13cb6a2420f871ddacf4ac40ac81b852a107dbc524aa017c0f932b87a983fd
 EBUILD slang-2.3.2.ebuild 2286 BLAKE2B 2253df190ddb4f5d8c3eb502d9b78c3632fe18379f5efa0e41c62b899f5a777b70d3f30f58e63dc9389ea21524c71e8a9cf1448b1e71d85162f74879707b7507 SHA512 d2349f40fe6498e0bc9a8f0d3ad592abf2b0edc9b16b9649be51b140c4a6208d130c9a4fc2fdeafb183ca05e6680b53c522f19da2cead85d31e8f09e30094a27
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch b/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch
deleted file mode 100644
index 2c999fb184d3..000000000000
--- a/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- slsh/Makefile.in
-+++ slsh/Makefile.in
-@@ -80,7 +80,7 @@
- $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
- 	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS)
- $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
--	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(INST_LIBS)
-+	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS)
- $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile
- 	cd $(OBJDIR) && $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) $(SRCDIR)/slsh.c
- $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile
diff --git a/sys-libs/slang/files/slang-2.2.4-memset.patch b/sys-libs/slang/files/slang-2.2.4-memset.patch
deleted file mode 100644
index 0be90fdc3091..000000000000
--- a/sys-libs/slang/files/slang-2.2.4-memset.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e06be392e42c23dd9bd7205445f3c5232ddb9ed7 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 19 Nov 2013 15:17:52 +0300
-Subject: [PATCH] modules/png-module.c: add declaration of 'memset'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
- * QA Notice: Package triggers severe warnings which indicate that it
- *            may exhibit random runtime failures.
- * /tmp/portage/sys-libs/slang-2.2.4/work/slang-2.2.4/modules/png-module.c:122:2: warning: incompatible implicit declaration of built-in function ‘memset’ [enabled by default]
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- modules/png-module.c  |   1 +
- 3 files changed, 403 insertions(+), 259 deletions(-)
-
-diff --git a/modules/png-module.c b/modules/png-module.c
-index 92ede3d..fed9392 100644
---- a/modules/png-module.c
-+++ b/modules/png-module.c
-@@ -23,6 +23,7 @@ USA.
- #include "config.h"
- 
- #include <stdio.h>
-+#include <string.h> /* memset() */
- #include <errno.h>
- #include <slang.h>
- 
--- 
-1.8.4
-
diff --git a/sys-libs/slang/slang-2.3.0.ebuild b/sys-libs/slang/slang-2.3.0.ebuild
deleted file mode 100644
index 38007ab7d1a9..000000000000
--- a/sys-libs/slang/slang-2.3.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="Multi-platform library designed to allow a developer to create robust software"
-HOMEPAGE="http://www.jedsoft.org/slang/"
-SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
-	http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="cjk pcre png readline static-libs zlib"
-
-# ncurses for ncurses5-config to get terminfo directory
-RDEPEND="sys-libs/ncurses:0=
-	pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	cjk? ( >=dev-libs/oniguruma-5.9.5:=[${MULTILIB_USEDEP}] )
-	readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r1
-	)"
-DEPEND="${RDEPEND}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.3-slsh-libs.patch
-	epatch "${FILESDIR}"/${PN}-2.2.4-memset.patch
-
-	# avoid linking to -ltermcap race with some systems
-	sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
-	# we use the GNU linker also on Solaris
-	sed -i -e 's/-G -fPIC/-shared -fPIC/g' \
-		-e 's/-Wl,-h,/-Wl,-soname,/g' configure || die
-
-	# slang does not support configuration from another dir
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=slang
-	use readline && myconf=gnu
-
-	econf \
-		--with-readline=${myconf} \
-		$(use_with pcre) \
-		$(use_with cjk onig) \
-		$(use_with png) \
-		$(use_with zlib z)
-}
-
-multilib_src_compile() {
-	emake elf $(use static-libs && echo static)
-
-	pushd slsh >/dev/null
-	emake slsh
-	popd
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install $(use static-libs && echo install-static)
-}
-
-multilib_src_install_all() {
-	rm -rf "${ED}"/usr/share/doc/{slang,slsh}
-	dodoc NEWS README *.txt doc/{,internal,text}/*.txt
-	dohtml doc/slangdoc.html slsh/doc/html/*.html
-}
diff --git a/sys-libs/slang/slang-2.3.1a.ebuild b/sys-libs/slang/slang-2.3.1a.ebuild
deleted file mode 100644
index f0bda4177ce1..000000000000
--- a/sys-libs/slang/slang-2.3.1a.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib-minimal
-
-DESCRIPTION="Multi-platform library designed to allow a developer to create robust software"
-HOMEPAGE="http://www.jedsoft.org/slang/"
-SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
-	http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="cjk pcre png readline static-libs zlib"
-
-# ncurses for ncurses5-config to get terminfo directory
-RDEPEND="sys-libs/ncurses:0=
-	pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	cjk? ( >=dev-libs/oniguruma-5.9.5:=[${MULTILIB_USEDEP}] )
-	readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r1
-	)"
-DEPEND="${RDEPEND}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.1-slsh-libs.patch
-)
-
-src_prepare() {
-	default
-
-	# avoid linking to -ltermcap race with some systems
-	sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
-	# we use the GNU linker also on Solaris
-	sed -i -e 's/-G -fPIC/-shared -fPIC/g' \
-		-e 's/-Wl,-h,/-Wl,-soname,/g' configure || die
-
-	# slang does not support configuration from another dir
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=slang
-	use readline && myconf=gnu
-
-	econf \
-		--with-readline=${myconf} \
-		$(use_with pcre) \
-		$(use_with cjk onig) \
-		$(use_with png) \
-		$(use_with zlib z)
-}
-
-multilib_src_compile() {
-	emake elf $(use static-libs && echo static)
-
-	pushd slsh >/dev/null
-	emake slsh
-	popd
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install $(use static-libs && echo install-static)
-}
-
-multilib_src_install_all() {
-	rm -r "${ED}"/usr/share/doc/{slang,slsh} || die
-	dodoc NEWS README *.txt doc/{,internal,text}/*.txt
-	docinto html
-	dodoc doc/slangdoc.html slsh/doc/html/*.html
-}
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index bbc369d6f4d2..d2f220b76663 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,9 +1,11 @@
 DIST talloc-2.1.10.tar.gz 441645 BLAKE2B fdc1f6b4ab6c95b461652ac5138e8f4e0db7161792b4cd7af8d80178b99404f844dd8352fb8820dcaedd0d96251025a8ebefc6bd1cff451e6bdf559617c964e3 SHA512 215e70056f37ade8f67c20ab2b79dcb40f071989ec908de81144f8a0160637bbdec9a94123dea73475ba42425415df4c1eb8c1986485a00e2e03323719a03ce3
 DIST talloc-2.1.11.tar.gz 443320 BLAKE2B 6234808d3a37dd1b9cd29121c20e003637da460d652769f9e85356b66aee285f3706377de4f507adfaaf91243a452a27bdab2377749d43937e140c3f8c69c417 SHA512 e0c7e44f21b0b6510e04e09ce325d50323a0c6466acb6f301676e82f8812c61ed7f6faadac62380aa6338d54679fdf7afba7fb9ac774d0def96efbcf49d00523
+DIST talloc-2.1.13.tar.gz 444608 BLAKE2B ac905d984e9ec438e8d7af473b37d7ccf8e4cf98d96b5a3b621f6c8203e7f5cd4d656602ac1fdfd22e0cab5853a8b54398c0c2ab4202517c4de73c5c90106d63 SHA512 003588fbcde340096b069ed4de0dc6c3e6a489b72abec83e9d3dedf40571a1bf07232d410cc86d8ca505ee49f7483a0043360e913de69106493346fae16a0e2b
 DIST talloc-2.1.5.tar.gz 436193 BLAKE2B 88a9ca32b6c6ae869e1761cb027847797e4ef3bb58dc618bae4b00f95637a0a8511f8704fa03ca1ca935127413a10d5297ba3843f0ea6992a97ce586f66cb705 SHA512 b938d67fcf4c6618f1149b4ec665957a604e3b07ee26e96ed36d94312db8f56b50498f69f9a07782f7f10a25047604e32b0d1786e1051d5f36b696c2755f8741
 DIST talloc-2.1.9.tar.gz 440335 BLAKE2B dde37d99b3cfb63209cdb832444f0416b7c05151cec537e220e13b1148d59b89fb712b4211e078b23f1c6608c8be6df6055d5f394b091ccdea3966c04cbb73be SHA512 a8f051bb15aba769ca286acad0946605d0053b0d149b4da2e6ecc333345f3e603d13a7f062452ae0f165615a4170ebdd7f41fc1b46c7a360000d5308bc304cbb
 EBUILD talloc-2.1.10.ebuild 2443 BLAKE2B 39e7c6e9cf12095d28a79bd8bf1feb3496a654a717de88f0b452c779384cc11295ee7e4804fe998876200aae3c85eff1e8f799581ee0551ab5be28a4565ddcd7 SHA512 9b2505168c051eb44e4c9e628800859f729ea9bac24b0e4a6daa80cd5d5036e8ac0733c5ec47b070f59b9791d1e822e53ae6df8d3a91c99176b1cb01e670e1ff
 EBUILD talloc-2.1.11.ebuild 2443 BLAKE2B 723f4a38dc2f2b83abfeb2ec98751bf2fffb5e82083c69296a9c2a6d794172dcfb0b59e7de974746f8e0542e63db1bf3deb8d882743113222869326b9a64b026 SHA512 2a1d66cba8c387c9c5dda890b646fcc1bdf50eb84d199990ccc5a28efc0d3cbd63540809579a3036f1af43441b0655bd7ff94ae5b3e71008c7b3cee9536a093b
+EBUILD talloc-2.1.13.ebuild 2391 BLAKE2B 0f57ea30c0afcc441bf4803f146793455ec5250f09f6746317d98c7e57b64e61fc7d55fff2f8103659d30d3e1d31ec04c869d9c50165452bf0bbf3f2420a3278 SHA512 49b6f5f91791263fc99550367b1f31e817f46741e164d9862a732022d071f6581daf2e79e3b91c1391bcca73d938d302c13762659ad4b8dfc495d1d37e3d0f7a
 EBUILD talloc-2.1.5.ebuild 2239 BLAKE2B e396e068f44c250ac72178473fd281541a903979c489d10ea66e997f5bee0bbdedc4d5b6e7c4bccdb799e7714190da85923702f27868a0f77dfff771b02c27f8 SHA512 ed9f0f10bd331f589b560c0563f1ca2b5e16fdf12121fca83a34cd2965b48f9d0f0374b12db9b655b5742839260d2fa794b70e6792402b4e0aac0e3ee0d72ed2
 EBUILD talloc-2.1.9.ebuild 2423 BLAKE2B edb6f719ae8b613e129a0167e3dd6f6704bafb1ae4be6ae5811d289b4284903c619f1b0dc0e284ef2e1f0f12a0a979f0182550db9b80a922ba91aa6ca9c51499 SHA512 dcbd5d567eba7abc8b3d1191f5fff75455a5a9bdd58fb8035542dddf47e5cbe296e8fe8ffff95dd76163678efe8b7e81f4774dbe39a048d909e190474ff329a4
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.1.13.ebuild b/sys-libs/talloc/talloc-2.1.13.ebuild
new file mode 100644
index 000000000000..65fd07167cb9
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.1.13.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit waf-utils python-single-r1 multilib multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="https://talloc.samba.org/"
+SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-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 ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	!!<sys-libs/talloc-2.0.5"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-libs/libxslt
+	${PYTHON_DEPS}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# python goes only for native
+	/usr/include/pytalloc.h
+)
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# what would you expect of waf? i won't even waste time trying.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=(
+		$(usex compat --enable-talloc-compat1 '')
+		$(multilib_native_usex python '' --disable-python)
+	)
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+			install_name_tool \
+				-change "${S}/bin/default/libtalloc.dylib" \
+					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+			install_name_tool \
+				-change "${S}/bin/default/libtalloc.dylib" \
+					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${D}"$(python_get_sitedir)/talloc.bundle || die
+		fi
+	fi
+}