gentoo resync : 18.11.2017

10 files changed, 4 insertions, 369 deletions

diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index eee7b7081e49..7a85841b42c5 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -2,20 +2,13 @@ DIST binutils-2.25.1-patches-1.1.tar.xz 18724 SHA256 3d4c0ab2d45d3a952f60246fa5a
 DIST binutils-2.25.1.tar.bz2 24163561 SHA256 b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22 SHA512 0b36dda0e6d32cd25613c0e64b56b28312515c54d6a159efd3db9a86717f114ab0a0a1f69d08975084d55713ebaeab64e4085c9b3d1c3fa86712869f80eb954d WHIRLPOOL daa804331ee880296c2fe29fd9b8a52cc695629d4bbe0b9889d96ffc54d330f00fac3f3cb12b3aaf6b7505521ef499c53760912cd7c9bb54f2d5e288224bd1eb
 DIST binutils-2.27-patches-1.0.tar.xz 8852 SHA256 07be45786e1e56498aad2c52a43d4104ccd0ded3c6a84a930486bc418d7fa36d SHA512 489b5fff87886682d8e98eafa2f082e6dcf811d2a693b6c41d76bd1ac50815a6e7d26fb7c9e3811c2d8e0e1dc307557e6ffe46d1d0f7caeb581060cf14bda899 WHIRLPOOL cf73342292a6dd8450a420f62a6a28e1ae38eed2c0b62643619ac002f3e9233ba5a0df19deb862167e88bd2c4a7ef4e002fe4d76f971eba876014d145dc30171
 DIST binutils-2.27.tar.bz2 26099568 SHA256 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 SHA512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb WHIRLPOOL d3204b4900529f697285fb1fe622ecc949c43f064e6b83a1cecb1ea8810a214842c729266c9a44537dc0a86d6d2b3ac100f54c721cc284e54f9d6feb90930d15
-DIST binutils-2.28-patches-1.2.tar.xz 17572 SHA256 d3fd98b218b0469f216a65676fdc899b9d777ea2d2f4b83af3d7fa6bbd36ca41 SHA512 00453fc1e3290868c23e2ca32214b5229fca23d4a551e4e136a62946b584992e9ef3f3e07819e35fb4eb83f083145330078db2631d5a089da7b5129d234aa856 WHIRLPOOL e52ca6eb5cc03fb0c3ebe27366019d38628a88d949dff873dc646ea1354ec432080818ddb212a6e94148bee3b230288eb245a5472c9c6e6ae9a5bdd162578cc4
 DIST binutils-2.28.1-patches-1.0.tar.xz 19772 SHA256 50cfce6ef7f546dcdb983a8b632507b5cdd51095e4acf1f15bfcd68027d438a4 SHA512 c2c7d22e1013e79040c4dcb4d70649e78a070976ba3a4bc2ceb4805827b9d93eea1805c85db4fcb6b31be5218c3d7b42a4990437a7c01dc01fd7e9dedb606828 WHIRLPOOL 2369fce643cc9b83724b486521621d744de0eaf3d95fdd34c7f1c785bc400f3ed31ae6105001870f33539664d84dd9caae854725e20007f136929d2ece755247
 DIST binutils-2.28.1.tar.bz2 28120394 SHA256 6924999be62d4464458eb53c11f27277cfb63755df8c1cd47b8d15d02c1942ea SHA512 5ec5212497b0fa8324f6a0884c284cb71c01942bbd39356d1ae745a5c9d97274c10f9d9c723f4bef6f0217662dfcd0c36e4e955a7599b11217658dc7b97553eb WHIRLPOOL 5c616f719827e5da7db23e89c761323cd4828b4779e79c3983d3ea429bce57ed40219982c478237b4dd728b77bae0a6447d912d96490ed1f5fc279ba5fd73bc6
-DIST binutils-2.28.tar.bz2 26556365 SHA256 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 SHA512 ede2e4e59a800260eea8c14eafbaee94e30abadafd5c419a3370f9f62213cf027d6400a1d4970b6958bd4d220e675dcd483a708107016e7abd5c99d7392ba8fd WHIRLPOOL 7fb876668c4fd8b10641fb8d831e7d23723ccb9b1051650c76a3a99696d37d120ef969e3c1cc144b0ffd765ef8e8698fe553c39cc65d0b9499a87d4886d6419d
-DIST binutils-2.29-patches-1.0.tar.xz 7548 SHA256 8ce4d1ea1224a305c4e36529e02dba87306075638ba0415b69ceeccedc77cd6e SHA512 5375bfb1b796b7692cf2adfc41bd2ae2e6dc19ff497db5f6beb35a456981b3adb8552ef14f32382faf655aa40da86c2d44177a658ec71e1c0e228dc27a4f2e18 WHIRLPOOL 73d2b78ea18e3427442bcb24440f671c1d35c0b559bf2141f30052b2bb8d6a8a6e29994cac741e4e50071c716d761f32b36358487a176d67e8cd226dfaaeafc2
 DIST binutils-2.29.1-patches-2.tar.xz 18528 SHA256 e50774626a1860a91aef58815cee187dd3206a2612f6e6315dee0d8c39128316 SHA512 b60a3af9cd6a681f32a59fc4a30602ee1290f75cc93c8ad38ab0de17a7f30538a751b801dbaf079e3d514b9671e34e91742c4c9c953a8c9794505b571b7e80f0 WHIRLPOOL be24896a10f90701ad3056477f8fc0df25b16a05cae5eda466a05a93b96e47c5809641b8f3af3720d8e8dea521c4b27c66c5d716d8f9c8a54dfb7c3dc87839e3
 DIST binutils-2.29.1.tar.bz2 29123355 SHA256 1509dff41369fb70aed23682351b663b56db894034773e6dbf7d5d6071fc55cc SHA512 4063d34555526922376ccceb3f14b43e287442e82a8038cf50f4f51ad97d438c672c0e310ca4b856c9aff5aa9911073e256e8298a7a3f1844eeb60b90d955592 WHIRLPOOL 55bf62434bb00b9a355f8d7138c97b6d984eed3a83d7eb37137cf3ab8efcc8e536415d68eba375ae0ab30743f5b3014a664f7d3c773ed55da40c8814691e04d8
-DIST binutils-2.29.tar.bz2 29073316 SHA256 29a29549869039aad75fdf507ac30366da5ad0b974fbff4a8e7148dbf4f40ebf SHA512 8148587d7e4f14ebcbcb3f984b116deaae5d4008228628acde14bc242a64a4b53faf1f6077a2c4ca4750e2f254b698ba506bd657f79e1202e87e7029b0069337 WHIRLPOOL 62b3e9ff6f85f8f4a13b71361f5abc4081a70de560931dcaaece1daef04c6bc7d3e0085cbacff0abbb750c4779863d45bc0d8d17273965472992c6b61b5cab20
 EBUILD binutils-libs-2.25.1-r2.ebuild 2737 SHA256 dc287dfc75930e05a4b093910afe8691c1b62416a214fa462f1d52393191daa2 SHA512 e74c54f9a73d1f0193879fd181ec42951e24c89a0458461293982c19999e86d0c99ce6417bb53261763ea5012526e566b1adb5fef4f68a5d540489b9c0f78018 WHIRLPOOL e73510acb481ce1331b840375714ef3d6af7dfc9a8128322d6eef7f5758c53df8687a284cdd5f38df25045c6aa6d93667aeca98bcd1333a7cc428084bf9d8075
 EBUILD binutils-libs-2.27.ebuild 2859 SHA256 174df4582ed73d0c4338234654cb420d3498d88c65089a808b9551171c14b2d8 SHA512 f0307817eed7b1fa5559543027d5e8ad3609021a92e06ee810e8008da9bfdba9559fd29d44cd961a40df735b4b78c38ba1156415b5f63d2ab43283b515a09bd0 WHIRLPOOL 64ca7992e22e2d7ef152c6d11f5e0181c6be3ef7dd101d53575d308a88ded765ccb72df6a5c244855c4b60e967fae2e6702107d04437ac5b7edd02ff72c35bfc
-EBUILD binutils-libs-2.28-r1.ebuild 2887 SHA256 a70a6774e4d75cf84a20e4b36065b3bb1976c4db0c5ef99367755f633d5ec9c8 SHA512 edf4d674c1edc733d4af0efd9c16d5ef5f72f0247a2cadbeb2d475a180fb244c2ed1c1e841be3835bf57e50c51cc353dbd1e0213aaeac4055f9d732ed8b98693 WHIRLPOOL f9ec43dfa3060a717a1c9aa9d140a1ca469f9672b082c190cf55abd93e353084004ccde82943c7139897c9d35f02ed77d8a617e4e122ed1a75dc49041d8679ca
 EBUILD binutils-libs-2.28.1.ebuild 2884 SHA256 48e3af891fcca61715264c2054c1e145ef910b4e5d0d9fba97d830d4a0579340 SHA512 d9679950c09f4381d441772b5c1906aa517399fac42eadf5a778c2fb40e72fd7846b04059c5f3331fbb4eb5dba2e50adc7281bfb55febbdd150b6dfceb1a45b8 WHIRLPOOL 0f1795e3164eebcf886dc84ffa918a527c028d4bb702ae79602280c140bb5ea0bb56fb8a3b738ba395a5cfbe624f932dab0f2a87292cb050f2a30bfe230c1d10
 EBUILD binutils-libs-2.29.1-r1.ebuild 2930 SHA256 b931423d40f675730fbbbafec811841f896b8a4b8420b3c460a07c513d1cc6c7 SHA512 5da19d149e8857feb2bd1fcfef5b173f7ccf599c8e6d63851ec335e110b608e04297f9e25b1d13d67400a2fc2e2f41d9a4c976b708dbe48f58fcfa05c35de3b1 WHIRLPOOL a3e3ecfc18403d2c5157122b2817a256a841cbc9597b67e299bad8d230f130d4a888aa8af3ef7cb48637b887f375920a08148e2665f93b976411e1d0c75394e1
-EBUILD binutils-libs-2.29.1.ebuild 2930 SHA256 526abf1acd886909045b36f959bff6e941826afe393ea6f694f4625c4c97026e SHA512 7f7c2b5dfe115683960cabc72fb7dfbbee2cc8f28dbfead51fba0d9b7be782f324fbb91b76d0c275ab4b980e97bc85cd43e54e1adb879992672947de442be791 WHIRLPOOL 3beb65293962e917d452a96c1f702fe01e4795001fcdde670e40a5a6be2a92dc4fa86060b57714092d9b829734c99c2d5187e6ad2667103ab1f729cc057717ea
-EBUILD binutils-libs-2.29.ebuild 2881 SHA256 c08237874dbbd5aaf04796e7c03ed789cf098def66b80828c0a86bff7ec4b3a8 SHA512 dcef5b8109859dc42221853c9cd48e007bfab8280aae862439b78fc72dff12df7349329ff4bb4ba94795bdc312891603fc65aaf18e38e0c82b9807c8bb275f49 WHIRLPOOL 19ac8e955c0802b17c255b77ada9fc70305d59972b3c08a99dda84cae2d7b0898c3a3846405bb1791278381fc72de55ccec45222733b64366f96004c3a42a2ce
 MISC ChangeLog 3434 SHA256 f4018d2351e0d680631a883a78ca749fc99a4efc915b4d32a302a7a495a4d43e SHA512 e1e028672b70cfc2c02ad2328c67f4d0cbeefcb4fa08417ce449b64e821d401c5b39d884c098febd83370590b9907eaf8a072750d27fd6fbc8b260549e3a260c WHIRLPOOL a8814d517a9762e9d303dc9c278271db9572ef3d5cecc24b26048580a42ff9d078d030f8b749aaf5ef1d47656cf1200f72406514623a2df37c35b082c9c2c7a7
 MISC metadata.xml 524 SHA256 03d92323b98033273689c9031e2a364b893f3796b4089ae6fe4ec9a96d958d7c SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c WHIRLPOOL af84fdd4aca89713c10a087507e30631ddeea5b6002005db7c198588890df38573229618499eb0e7f4bb87782aaa38589c556d5fa4348a1e636561a1595309b0
diff --git a/sys-libs/binutils-libs/binutils-libs-2.28-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.28-r1.ebuild
deleted file mode 100644
index 71fb7dcb22a0..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.28-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCHVER="1.2"
-
-inherit eutils toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-patches-${PATCHVER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-# The shared lib SONAMEs use the ${PV} in them.
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="64-bit-bfd multitarget nls static-libs"
-
-COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/texinfo-4.7
-	nls? ( sys-devel/gettext )"
-# Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${COMMON_DEPEND}
-	>=sys-devel/binutils-config-5
-	nls? ( !<sys-devel/gdb-7.10-r1[nls] )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/bfd.h
-)
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-}
-
-pkgversion() {
-	printf "Gentoo ${PVR}"
-	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="https://bugs.gentoo.org/"
-		--with-pkgversion="$(pkgversion)"
-		$(use_enable static-libs static)
-		# The binutils eclass enables this flag for all bi-arch builds,
-		# but other tools often don't care about that support.  Put it
-		# beyond a flag if people really want it, but otherwise leave
-		# it disabled as it can slow things down on 32bit arches. #438522
-		$(use_enable 64-bit-bfd)
-		# This only disables building in the zlib subdir.
-		# For binutils itself, it'll use the system version. #591516
-		--without-zlib
-		--with-system-zlib
-		# We only care about the libs, so disable programs. #528088
-		--disable-{binutils,etc,ld,gas,gold,gprof}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-	)
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.29.1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.29.1.ebuild
deleted file mode 100644
index eb6065807e00..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.29.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCHVER="1.0"
-PATCH_BINUTILS_VER="2.29"
-
-inherit eutils toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCHVER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-# The shared lib SONAMEs use the ${PV} in them.
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~x64-solaris ~x86-solaris"
-IUSE="64-bit-bfd multitarget nls static-libs"
-
-COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/texinfo-4.7
-	nls? ( sys-devel/gettext )"
-# Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${COMMON_DEPEND}
-	>=sys-devel/binutils-config-5
-	nls? ( !<sys-devel/gdb-7.10-r1[nls] )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/bfd.h
-)
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-}
-
-pkgversion() {
-	printf "Gentoo ${PVR}"
-	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="https://bugs.gentoo.org/"
-		--with-pkgversion="$(pkgversion)"
-		$(use_enable static-libs static)
-		# The binutils eclass enables this flag for all bi-arch builds,
-		# but other tools often don't care about that support.  Put it
-		# beyond a flag if people really want it, but otherwise leave
-		# it disabled as it can slow things down on 32bit arches. #438522
-		$(use_enable 64-bit-bfd)
-		# This only disables building in the zlib subdir.
-		# For binutils itself, it'll use the system version. #591516
-		--without-zlib
-		--with-system-zlib
-		# We only care about the libs, so disable programs. #528088
-		--disable-{binutils,etc,ld,gas,gold,gprof}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-	)
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.29.ebuild b/sys-libs/binutils-libs/binutils-libs-2.29.ebuild
deleted file mode 100644
index 05b015965804..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.29.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCHVER="1.0"
-
-inherit eutils toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-patches-${PATCHVER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-# The shared lib SONAMEs use the ${PV} in them.
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~x64-solaris ~x86-solaris"
-IUSE="64-bit-bfd multitarget nls static-libs"
-
-COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/texinfo-4.7
-	nls? ( sys-devel/gettext )"
-# Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${COMMON_DEPEND}
-	>=sys-devel/binutils-config-5
-	nls? ( !<sys-devel/gdb-7.10-r1[nls] )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/bfd.h
-)
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-}
-
-pkgversion() {
-	printf "Gentoo ${PVR}"
-	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="https://bugs.gentoo.org/"
-		--with-pkgversion="$(pkgversion)"
-		$(use_enable static-libs static)
-		# The binutils eclass enables this flag for all bi-arch builds,
-		# but other tools often don't care about that support.  Put it
-		# beyond a flag if people really want it, but otherwise leave
-		# it disabled as it can slow things down on 32bit arches. #438522
-		$(use_enable 64-bit-bfd)
-		# This only disables building in the zlib subdir.
-		# For binutils itself, it'll use the system version. #591516
-		--without-zlib
-		--with-system-zlib
-		# We only care about the libs, so disable programs. #528088
-		--disable-{binutils,etc,ld,gas,gold,gprof}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-	)
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index d4c99bc699f6..ef5c3c73b8ce 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,8 +1,4 @@
-DIST kpmcore-3.1.2.tar.xz 403324 SHA256 52d4fa37b7939f1b584bdd1be4ed8bfa036f240ae05d6ec281cba717bb8ec6c1 SHA512 a11679f3de30f7c06ae567e6ce77d7737b0a98f2ea7e0955d08bcbd32b978915cdee992e003730cd56bcd504d311d4159e7e834e1db14a065c21f59a8609d003 WHIRLPOOL 58a13b396af1fda02430e730aac6b299a00aeb3165b0fdd6c319505f5d83a64324cad1bded3ced28df78a262c53d69f7fbaf028cfe038ef5b1940e90921f89ed
-DIST kpmcore-3.2.0.tar.xz 408256 SHA256 2b38c2bbc3d9a47cd4bfa2e8d2ad1bd7d791383dfe479506456b52a99ff899cb SHA512 664cb8617c302ee60e40d2cf57b712aa0503f080d1da0a5bc481c3628c2639037c091898e8ccc1528c4298c6ec643af44c0f484bd7ee60d8ad605a64ca1b4fed WHIRLPOOL 0cbc259c740ff377839ef75f1b884419018b9c03777a34a15ebb7b352695681bce649a835b64271c97335bdd34c2c6d371a6c3aa1b431bf219e646cfeba812e1
 DIST kpmcore-3.2.1.tar.xz 408356 SHA256 d671f4f86ec8e81c17de179f712a79c9b4925de8ad5373022da59e79f4cbb480 SHA512 f7a198a1632f96f092b937275ffc779ac1997c9ea6973906a2e08d6f7852aaaffc5abc480bec88d41a793ed8f5b364f7150f40aab1187fbbf33915a01cdc61e5 WHIRLPOOL ba7961af9ce33dc06879c2a993508e22aeef3fd2d62174cad7c87b3295efd5a04260d2ac9dc682694477c9a5181a173b05c2ecd8c669938e3c1bab6f1e0edf41
-EBUILD kpmcore-3.1.2.ebuild 797 SHA256 53736f0668eed81acaf9d582ff8d2144c1cb0d70896df7f781e8d3ad7548f83e SHA512 b00f8a82b8463bdf1d713d828db472e57510a114d5580fcafccb5b45b500ef860c9184309fa7f21f1c30b78ccaf4bb7b1ad837caa555989a5e4151041d1ca1f0 WHIRLPOOL c78cad0d70bedbd330218818cc08ab7968124c572beab982aaa9a9a628b750c6ecfe35ddd4607a1099a0a51be5cebd5c4b814e7e9c0209ed6301f125fa14a67b
-EBUILD kpmcore-3.2.0.ebuild 744 SHA256 46e0d9884017be4706ee338a8355e9bd9b6ea5017dfa699a5ae5f6799a6845c1 SHA512 abaa1227e1e543fe4ebbd06512f7befffc1a1ce6238ab4c052c74358f94c90d375f8ba50eb20f0b49698908e805a92d25fb6f6d8f57aa7a3c27cad924008c488 WHIRLPOOL e61ff47fde0794172e8c9e152f880febe1063022ab437c558c7ceca12f1293030a1802bd30d2241e73a4a8bf3e9806f30da561b3e238ecbb03e6210b58930f5d
-EBUILD kpmcore-3.2.1.ebuild 743 SHA256 90dbfa3de7b77f2a1ee81016c3bf9c699fd9870becd12e9f5231115ed3fd74d2 SHA512 6ae11a94f437e856a19adb956b77e8853fc7950071aacdacca6259753afa481961be1ee31b558ca6a88b5f4f768f57b9bd00f41dc4e37674c7638e008875dc96 WHIRLPOOL 6b2b7b99abc15ee49ca47640c2893787478313470e7f9e36c7690a8160aea9366f259859b27aa732084c5dca30e4ed6303339f6d208488b8ca69587a960ee5ce
+EBUILD kpmcore-3.2.1.ebuild 742 SHA256 54e5e7646a70da92f4956222b639f13336c2887ab2fdac277460956ffbee38ea SHA512 aaf210e0721d63ce00870ade6a84f573bbf23317694dd4b2c1969a39ed6716acdb89d9952baca2f32de5883ffc99e5e0392b651ec00ecbf65e548b86b85f94ec WHIRLPOOL 9a3ed5a722fdc4781724c10ce73543b81623af276f36d9ff8948d25be30ff4a82ccf9e47e3f6160de47b17f9c25959e4b9c00a48152d0593d2783c9c5f535c85
 MISC ChangeLog 2757 SHA256 b963b5eb59fb7fe8a2a732d605c559adf42d69c13c13a45cbdec10d8d5d6d85c SHA512 4516c98074fe4719b61106f803a3ff8d620a553ea0e6fa1221f37606d42f33c0646f7db10dd056f84c11f1ad416fc75d83a33c5a3c015262d4864065df501ef8 WHIRLPOOL d4e38a375bc397e53c4149901ce8731a3da1046b41eea56beb6e87f1e80865b6e6b825031f94a1991d5a38e57cc1f2b4838a8f531cd8fb41ea7bc9b1266a93f3
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/sys-libs/kpmcore/kpmcore-3.1.2.ebuild b/sys-libs/kpmcore/kpmcore-3.1.2.ebuild
deleted file mode 100644
index ee6ec9628692..000000000000
--- a/sys-libs/kpmcore/kpmcore-3.1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Library for managing partitions"
-HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
-LICENSE="GPL-3"
-SLOT="5/5"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libatasmart
-	sys-apps/util-linux
-	>=sys-block/parted-3
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/sys-libs/kpmcore/kpmcore-3.2.0.ebuild b/sys-libs/kpmcore/kpmcore-3.2.0.ebuild
deleted file mode 100644
index 9ee1d6becc5b..000000000000
--- a/sys-libs/kpmcore/kpmcore-3.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Library for managing partitions"
-HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
-LICENSE="GPL-3"
-SLOT="5/6"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libatasmart
-	>=sys-apps/util-linux-2.30
-	>=sys-block/parted-3
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/sys-libs/kpmcore/kpmcore-3.2.1.ebuild b/sys-libs/kpmcore/kpmcore-3.2.1.ebuild
index 8dd9ceb8adb1..9afb1bae933d 100644
--- a/sys-libs/kpmcore/kpmcore-3.2.1.ebuild
+++ b/sys-libs/kpmcore/kpmcore-3.2.1.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Library for managing partitions"
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 73bd6a36f0d4..624bbd6375e1 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -13,7 +13,7 @@ EBUILD libomp-3.7.1.ebuild 1368 SHA256 fc595016c19b8ac57c43fe6d7a42c101c418ff21b
 EBUILD libomp-3.8.1.ebuild 1368 SHA256 72f9dcaaed1359a623d483773c1548598e550141bf3e4aac6b015f64f6ec3281 SHA512 7ba7b4fccdbc2e9a69f73f5fafd985f862b4b28eb3f775d2650e78a2596826b1d8d947aa6e19f708572409139ea094da0d1c24ee35fb3d8812f8363bd948b3c7 WHIRLPOOL fe4043b740e6fd756650c3d722757a58bf50638699fe53d2b86ac66898bfcada958911a1b7ecba526e7e1bbd17eeec65e5b8f826516ecb71c2576aa38ac9d44a
 EBUILD libomp-3.9.0.ebuild 1264 SHA256 fc643ce90c5d7a2e102316716d0877a78ce975480458898c3bd8c3d6fc7ece2e SHA512 e0772254fd1ccf735a4325a41bcd30eaaeec30063a541b9f77a5295e1674e0b4a38af86738bfc9a71f4196b81945cd7c08655fc468105aa11d24c38d303aac0a WHIRLPOOL 72987a3143339c37b89d45a6bde2c2d2495bf2747b871eab304eea9f6796cc3dace4c70eb26aabe9fa4d8901ebe94e25b8bedeb934d96811b629965e7b516632
 EBUILD libomp-3.9.1.ebuild 1326 SHA256 6b973aaa8ae527a06aeac418bea5fc6b744bb448613cc8f9356a68c606dfff18 SHA512 99afa3364dfe73c52792e1f0c4cc19c9beb1fdb28d7fd009a778c351f86fd1759a1c4bfcd46194890b51f227844c063fed53085d78c0b91351858ed517e42794 WHIRLPOOL 151b52008b00b06e8e28dbcf4a32f790b3f184e32118de701aa6846fd0293b72dd04164e00cb8b63430f7ec3a84477b4c40a110beb5c86d8453d4364e0da75b7
-EBUILD libomp-4.0.1.ebuild 1961 SHA256 f75f49ca7226a70f06f506938e99e534795958a5efeee6cfce84d9f2a29e8366 SHA512 7ab537285eb1493a2e5ea56e8df8281ecc3f413579ecd342bf47257b80bdee0e861760af86b42d2a55215b70ce3bd4518120a10948e07b300f3cedc775448351 WHIRLPOOL ea92a34085e7cb0573236b8ec8f6853cb5836cfa066d058bed831cf8b8b42ba2dc945801a90f95c8798e3603c36163a18843e3a4838eae393cf637929939909f
+EBUILD libomp-4.0.1.ebuild 1973 SHA256 087e0144158dd7b37908555e75e940ac33b7ede0f5da01730c719029b657b6bc SHA512 d4911be5e55c38b3657337932c60ebec40aed5760ddc35ac7e73407bb3f46a34a41ac49ca529aa27a200efa9a1b5f59829632649a93b068ab824baaf9252831f WHIRLPOOL 0d8f09abc5446c92043ab197476e17777bca30185507d9246a3f24779063fc136334d73ce257e098e189c69a32175d1b6dc809dee92d9f932f2f97f8327f43d1
 EBUILD libomp-5.0.0.ebuild 1807 SHA256 a8a408cc063fd2dd05a17c0320dccd69c7f2ced4167e7dd3f8aae8518d9ba742 SHA512 f559d0a90ed50d88ceca3fff2cb0ded4dd15fdd2845d8259453429c4ccfa7232c32d39d295d39cfa5d417c0f87eb72bc260f31ab41c635be460fa7b0661e05d8 WHIRLPOOL 3f81e05b23cbbc854771aab328e0675ab8fbdc265f593b7ae07882234365a426aaa3651f74d5409051999b43cdca46ab2f7c81a99ddb308ff05df7c108495cd3
 EBUILD libomp-5.0.9999.ebuild 1820 SHA256 9778adb00f967dde24bdf5b76b547a3101c261c088bff9eaa0b3c4c06607ca55 SHA512 44029d28b3c3855bd449791973a7c4b386b035269deacc78bda7edf5fd94094247fe64604e98ab2a970684782259df88573589441b6e410a1b7e88f96f260433 WHIRLPOOL 2c8f5658caea1f531a113c1ab6f69857659173b41a38112e504ea0c30e3bc85d8d3d44b729724417fed568d3ab760374aa37c29a4f7821fc76b6005f6fd2c5cd
 EBUILD libomp-9999.ebuild 1897 SHA256 1d9fde583f9b9edb28a872fbd0673c3cdfa1d8672fd91a41029af7e102758195 SHA512 611c09516eaecbbf50a99ac6cc03ed93ee610ab2c3bd0bcb666fd9da0adc7ebdb8a98911d912be70ac0ccebe0dd1472808438d019869892c011e6f7df0062419 WHIRLPOOL 5fcb88b88ee697369e2833b21bf55d01d96b7aba38ca6d57233f2b004771c5d33791e6eaeb1df2dc35abeb78207823f151b070b29be9fe8897658682ac9e6f23
diff --git a/sys-libs/libomp/libomp-4.0.1.ebuild b/sys-libs/libomp/libomp-4.0.1.ebuild
index 6b5290fbe402..14a03e01f7b2 100644
--- a/sys-libs/libomp/libomp-4.0.1.ebuild
+++ b/sys-libs/libomp/libomp-4.0.1.ebuild
@@ -53,7 +53,7 @@ src_prepare() {
 	# fix atomic tests with gcc
 	eapply "${FILESDIR}"/4.0.1/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch
 
-	eapply_user
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {