16 files changed, 80 insertions, 155 deletions
diff --git a/dev-util/icmake/Manifest b/dev-util/icmake/Manifest
index e288a3fcdb54..1e64dccc41e3 100644
--- a/dev-util/icmake/Manifest
+++ b/dev-util/icmake/Manifest
@@ -1,11 +1,6 @@
-AUX icmake-7.20.00-ar.patch 399 SHA256 96d8c283f97f58de6beca7fc0dafc6f4eadfa7b3db15b027a99ef6d502eb4fc2 SHA512 6d868cc92961946d546ad18451c7d4829d03136eac8d06fa8195724692e5e71d89ddca869646dd33a85dd3137f849fd755aefee899e69ed83b973b7869688fa2 WHIRLPOOL f48a6513bca7242897963ddb50cbf1d23bdd8959c499438a6379b241e277cc8227ecdbbe46ff3ee802f98e8437b7bb46a317906eca824d24fb58d6615b4b5ab2
 AUX icmake-9.00.00-ar.patch 600 SHA256 1ec15c3e0111c25fdf3ff56597f65837ce7f36602f9662a3592b62faf71b533d SHA512 ef09e8a356cf8a56285282dd793230eaa0de3d959f1e9e4bb0905d402906f159625645d6e9cf080f1b94b89da7024e1a118ebea8f686713d2872ee20d2102325 WHIRLPOOL dff8ea015a00feeabbf196ebe692068c8b02c7b806819ddfb1504af4ea97b1ae3e565780053157e003734c8c481c6a41d1ef8911f26713eab468f68aa3e3ff77
 AUX icmake-9.02.02-verbose-build.patch 141 SHA256 58677b6c5cb384c922d73c6dedd370c99de90e2485c2ffc058ff87c4311378d5 SHA512 7199f34f8b48962e44306e9102d674b8970e03f99f2e2db29b9d813f2c4631f9768582be3423f528f2585106806afff0c2c7430c9125911a1eaca5e77902d546 WHIRLPOOL b093477c6180fa18524f7039efc3456faa34cd5bbbd881674fd2cc1521ec61ec3baebd57d28a23ff7fea1f2ee97f00e862337f55ef7b4fc125d33da62176d960
-DIST icmake-9.00.00.tar.gz 366238 SHA256 2ba6ddf3c7ced5fd5e29ceffebfb283513610ac864c950bb4d3acb8f3300ad15 SHA512 aad57cc5d1a609c1fe5706b4c263e3bf2d34208e8507b3d102ca666e446af829d9fea8ae1c12abc10f96bd4c567e718c05d9e3f09676444787c3ac9a31ccfbfa WHIRLPOOL fcc11b600d4f85e407337e426e91d62e04d17eee4a4902f4de4460a441bb48a174e32c40f3dcb395124b458481c4352be4bff1ff439612deef03f1d9fc333827
 DIST icmake-9.02.02.tar.gz 371881 SHA256 18f673c66c39a392218725ab063ed1cec9f0b28ce00f3896123ecccdf855834a SHA512 7d62569d21224f4584fe6901690a53fa82882e5690ef296cd0fcd770bc19503ea5a5469a7b6eebc8b6719606630e24477801c3c5752c70efdb74a6f6d30bddb9 WHIRLPOOL 20dcad5287958f640f53fff2a0c220cb0c209fb93cc4e45826d7ac4465a8aba339866bef632ce4f869ba25107f1e0e58e6d6d17093389d53ffac6fa7d32f278b
-DIST icmake_7.22.01.orig.tar.gz 331750 SHA256 b522e7937e9d4f0bec738dfce371673e3c4a8bc9f4d209a51631e5ed59ba66c7 SHA512 a17dac0da186202ec5f5962a42963709ebc60f006cea003532b8709242d9e369e71fdc86fffc75ad82620a2c420a8f80c138d31e6570d0055cdfa0b69b63ca3a WHIRLPOOL c20084b28b212739a70f60b5a790461ae3e4b50c9cf9cd37ae50025f835fe4575c927dc5f2335d608436e2f51fb21fdc3eb57ce3ee2881915edec82d2964497e
-EBUILD icmake-7.22.01.ebuild 769 SHA256 3123e14d904d51ef579ca3b6568c362c974b2b0e1375f6d72dd379c5783482e3 SHA512 0dd486d8870955e76f3e978e21d7d6efbc0cca110b6b124b62c39f66197a7a3deffb65f2a4aff2ba895acb89fc77cf0b903e4a3e040519e931c54f9752d4a5e6 WHIRLPOOL f73581a2a2fa1f822705141392e31a29e62fb4b35d49ea85bdace29aa662d95c3ca67fdcc223c9f08f4d305408d282ae0fe1dfb76d95bf4b612cf61fbb9b64b4
-EBUILD icmake-9.00.00.ebuild 866 SHA256 a09a1f3d6976cb1db6a88cb2f1f101ccd90bb6e7949a026a6843283ae5f256e8 SHA512 06ce79eee5dd82c638cf37a2d10470455bed6236825c8cfd4fb30ee509607b9bfe6297d98e91c2b6f98be386f4dd897d4cb14a1a2abe30e3fb4759499f0bd2b9 WHIRLPOOL 7bc9cb9c4ed2306fa3cf231d9fa0cd24aa5459971e7d480cd6f3f5542a6b49527dd6b124836cc3d006d8fadcbd834a56523d5cd7155deeec493f2a24699eaafc
 EBUILD icmake-9.02.02.ebuild 983 SHA256 f78df9978797ec644a08a15aa90ddeb7906920e03de2f8eacf1c4f301f9b8f08 SHA512 0a2be376db0816a4d62626e96dc28129306d8dcd41ecdb08a86aef650031e69ed3881b594cb024ef6c9ebddb3d373c770577322bd0adcc5ad06310cab474916a WHIRLPOOL f589f16f8ba11e2da19812643d8515f68bcc9151854fa6a939a84870f8ed3c27aefb560a60a5fb61395893de2d9e057e964a02257bfa806c21991e1fd5536169
 MISC ChangeLog 3000 SHA256 efbc47022b8cc8b9bca898cd5256c10b684cf047fa010da93693c8d4bcd1fd8a SHA512 bf0e823d29a84c6355101719b1e1f1d045a07a45a1268c03a8f256b65386790c97a7f13647ffe5902cef9c56e2c976352ac06a096146ee30411740b652b45ac7 WHIRLPOOL 704beb7e87b6b8d66ffdb3e098f6ca8ad46608dc0b8073d072d933efe938ce81481ab693b2a1422b92c1c32ac895b043b33b6e7f2d2248a9b47d51fd0a2919b1
 MISC ChangeLog-2015 976 SHA256 913f5a5e59b92e19d6af631121dc72fe96bb9cdf1f903a2726b29980e1e88e51 SHA512 bb7fa51c6963264061b9b463cdecb7f9334d26a59fdc82af7b3d6c0fae9576f6ce312ee68c506e64b9c33ab127bfeee6e0f52435270676fd8dbe1ec9992f8d7f WHIRLPOOL 8225a64e85e72a268be172e2d26fbe24d93de0faf28917b5b513854b2b8b320129a91e087322ffeff1e28f89eaa41d9c82252fc051dafd58b8c52189bf6705af
diff --git a/dev-util/icmake/files/icmake-7.20.00-ar.patch b/dev-util/icmake/files/icmake-7.20.00-ar.patch
deleted file mode 100644
index e3049f18f745..000000000000
--- a/dev-util/icmake/files/icmake-7.20.00-ar.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- icmake-7.20.00/icm_bootstrap
-+++ icmake-7.20.00/icm_bootstrap
-@@ -31,12 +31,13 @@
- 
- if [ "${CFLAGS}" == "" ] ; then CFLAGS="-Wall -O2 -g"; fi
- if [ "${CC}" == "" ] ; then CC="gcc"; fi
-+if [ "${AR}" == "" ] ; then AR="ar"; fi
-   
- echo Creating tmp/libicrss.a
- 
- try cd rss
- try ${CC} -c ${CFLAGS} ${GLB} *.c
--try ar rs ../tmp/libicrss.a *.o
-+try ${AR} rs ../tmp/libicrss.a *.o
- rm *.o
- cd ..
- 
diff --git a/dev-util/icmake/icmake-7.22.01.ebuild b/dev-util/icmake/icmake-7.22.01.ebuild
deleted file mode 100644
index ccb9d9c74efd..000000000000
--- a/dev-util/icmake/icmake-7.22.01.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="Hybrid between a make utility and a shell scripting language"
-HOMEPAGE="https://fbb-git.github.io/icmake/ https://github.com/fbb-git/icmake"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
-		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
-		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
-		-i INSTALL.im || die
-
-	epatch "${FILESDIR}"/${PN}-7.20.00-ar.patch
-	tc-export AR CC
-}
-
-src_compile() {
-	./icm_bootstrap "${EROOT}" || die
-}
-
-src_install() {
-	./icm_install all "${ED}" || die
-}
diff --git a/dev-util/icmake/icmake-9.00.00.ebuild b/dev-util/icmake/icmake-9.00.00.ebuild
deleted file mode 100644
index 2fd35d977fce..000000000000
--- a/dev-util/icmake/icmake-9.00.00.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hybrid between a make utility and a shell scripting language"
-HOMEPAGE="https://fbb-git.github.io/icmake/ https://github.com/fbb-git/icmake"
-SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${P}-ar.patch )
-
-	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
-		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
-		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
-		-i INSTALL.im || die
-
-	tc-export AR CC
-
-	default
-}
-
-src_configure() {
-	./icm_prepare "${EROOT}" || die
-}
-
-src_compile() {
-	./icm_bootstrap "${EROOT}" || die
-}
-
-src_install() {
-	./icm_install all "${ED}" || die
-}
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 651f2bbe0ce1..17eb9f1cfce9 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,7 +1,3 @@
-AUX 0.4-parallel-make.patch 312 SHA256 f32ce2f3a7dab21301a7726b5ccc65669bced58f5577863c231c32e20ef36f08 SHA512 d1642d5e474f145c7d57f138850a209ae43911733fba5a36fbb070e60a75b2286a6b255f059bb7fc0aca55d6d65b362e443b3dc93aa775d89a7e79da651d40ce WHIRLPOOL e3f5192825464ea53b60b89dcb78b6b4a8ed6883e163ec972dca395bcd7821fc834a6b65609ddc9f30b02a2a0d0f9ea3beab3b889c8844b22eecbead572eea44
-AUX ltrace-0.5.3-cross.patch 485 SHA256 fb0f36643464d19090bfbe644f30a0bf98cf302229df9a6fb1d24a2b3ce6a134 SHA512 476105d06c759e4d191d0b49751bfdcea5f492c035ac243366eb324ea3b54fa29b5c304865e3603636e64375ff527c4917aaaa290e2d056ea237b7f7ec89c340 WHIRLPOOL fc719f17265ad7121af2f7c7094962a5a2c631b8eba46360ed91e6a399fb0e3c2631c93a25527fb3e355751f6d247ee7260b19b8c15494ef76c65577f79a7663
-AUX ltrace-0.5.3-ppc.patch 594 SHA256 ca817bbf29bf219f3908d583bf64fd7f43a24dd2069aaeddd461b7b519806d3b SHA512 b993d1300d20d6ef593084cb78d624ff6eff2a15d612dd5b64c59c0ea5ffab0493a38c63da318d2ea0026b4f309bae66e038b3300f923d9a425bf206579065c6 WHIRLPOOL 1374eca1a4eec7be1441cc34959e6d9175baf08fb2220f654d5ba921ce53362f67e0a331a9f821d232140356f85e599ee33df9b0ad7a7d21fb88576052dd92f5
-AUX ltrace-0.5.3.1-gcc43-testsuite.patch 406 SHA256 7b12907b1cf0b4b820ad1698d065e25d325ac7b7c3452c15dc2574170ed348e4 SHA512 4d3bb92daea7f1f11a5658d4a05358595799a5f117de175255c0b9e87bfe862808ee43efbb75eb8787f2782287bfa667b88231d24fc2dc69c186a23b5da62af5 WHIRLPOOL 406f5de0c2d432309cde164e4c98532526b746342d9c891c3d0c43bae371b10c13ec424a2344a75a0914afe5543f61ce1735af03f165b8acea74c6609135eb7f
 AUX ltrace-0.7.3-alpha-protos.patch 849 SHA256 50f74d069399e16645c8b992a46d87954c777719f2e7216f8b57fee7e5c188c8 SHA512 014660bf48b7e5bf43b17fd3f82fb8a01f3855c16dc2fed76f6a9e4f348ec28beca0e7429ee10dc3aba3bd0bba143d21ee5b67ccc7057cb006ef694a6d38aa72 WHIRLPOOL 17126b60938c8aa3937b989ea23e28cafc98a73daf55d52a7fd3b931a5e85904f669094cdb9b365c88e200fc6269cf1bac2e67d7f40eb6966f337b6a9b96c00c
 AUX ltrace-0.7.3-ia64.patch 1538 SHA256 fcb69e1f607a7deb6897c75b2ab2aeaf827884ba716d946a8c3a5c620f779bd9 SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad WHIRLPOOL bfef6099889267a3cb59381b70d3b5b83ef7d5e697d8a363c7949129beefce4d2ddcfee3e0f84129df222ab1efc8e18ccad13c4eee4b974061b0b64fcd4a8ca8
 AUX ltrace-0.7.3-test-protos.patch 2551 SHA256 3cbc553e51c12dfd14829b3d612a8423f8dee2e01ff278e373fa58b0f82704aa SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34 WHIRLPOOL e85be67cc48e3dab8900e81197d6adb6c15cf3460971cda1659668b2dcaa080d8a0f5f24972fc66b86a64a814657f9d4eab5a58b48b31695992e3cd61b9b3686
diff --git a/dev-util/ltrace/files/0.4-parallel-make.patch b/dev-util/ltrace/files/0.4-parallel-make.patch
deleted file mode 100644
index 3fd3624477ab..000000000000
--- a/dev-util/ltrace/files/0.4-parallel-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ltrace-0.3.36.orig/Makefile.in	2004-11-10 01:12:03.000000000 +0200
-+++ ltrace-0.3.36/Makefile.in	2006-09-02 11:10:57.000000000 +0300
-@@ -35,6 +35,8 @@
- ltrace:		sysdeps/sysdep.o $(OBJ)
- 		$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
-+$(OBJ):		sysdeps/sysdep.o
-+
- sysdeps/sysdep.o: dummy
- 		$(MAKE) -C sysdeps/$(OS)
- 
diff --git a/dev-util/ltrace/files/ltrace-0.5.3-cross.patch b/dev-util/ltrace/files/ltrace-0.5.3-cross.patch
deleted file mode 100644
index 610bbccf1fd8..000000000000
--- a/dev-util/ltrace/files/ltrace-0.5.3-cross.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -8,6 +8,8 @@
- AC_CANONICAL_HOST
- HOST_OS="$host_os"
- AC_SUBST(HOST_OS)
-+HOST_CPU="$host_cpu"
-+AC_SUBST(HOST_CPU)
- 
- dnl Checks for programs.
- AC_PROG_CC
-@@ -84,7 +86,7 @@
- dnl of libelf and ltrace matches.
- AC_SYS_LARGEFILE
- fi
--AC_OUTPUT(Makefile testsuite/Makefile \
-+AC_OUTPUT(Makefile sysdeps/linux-gnu/Makefile testsuite/Makefile \
- 	  testsuite/ltrace.main/Makefile testsuite/ltrace.minor/Makefile \
- 	  testsuite/ltrace.torture/Makefile )
- 
diff --git a/dev-util/ltrace/files/ltrace-0.5.3-ppc.patch b/dev-util/ltrace/files/ltrace-0.5.3-ppc.patch
deleted file mode 100644
index e344c3e28f5b..000000000000
--- a/dev-util/ltrace/files/ltrace-0.5.3-ppc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur ltrace-0.5.old/sysdeps/linux-gnu/Makefile.in ltrace-0.5/sysdeps/linux-gnu/Makefile.in
---- ltrace-0.5.old/sysdeps/linux-gnu/Makefile.in	2007-12-26 18:55:42.000000000 +0000
-+++ ltrace-0.5/sysdeps/linux-gnu/Makefile.in	2007-12-26 18:55:55.000000000 +0000
-@@ -1,5 +1,6 @@
- ARCH		:=	$(shell echo @HOST_CPU@ | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
--			-e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)
-+			-e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/ \
-+			-e s/powerpc64/ppc/ -e s/powerpc/ppc/)
- 
- CPPFLAGS	+=	-I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
diff --git a/dev-util/ltrace/files/ltrace-0.5.3.1-gcc43-testsuite.patch b/dev-util/ltrace/files/ltrace-0.5.3.1-gcc43-testsuite.patch
deleted file mode 100644
index e115c97322fd..000000000000
--- a/dev-util/ltrace/files/ltrace-0.5.3.1-gcc43-testsuite.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naurp ltrace-0.5-orig/testsuite/ltrace.minor/demangle-lib.cpp ltrace-0.5/testsuite/ltrace.minor/demangle-lib.cpp
---- ltrace-0.5-orig/testsuite/ltrace.minor/demangle-lib.cpp	2006-03-13 17:12:01.000000000 -0600
-+++ ltrace-0.5/testsuite/ltrace.minor/demangle-lib.cpp	2009-07-27 13:47:43.876929485 -0600
-@@ -1,4 +1,5 @@
- #include<stddef.h>
-+#include<stdlib.h>
- #include<iostream>
- 
- #include"demangle.h"
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index ab4b88016fd2..ee465c4c5ff7 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -4,6 +4,7 @@ DIST pkgconf-1.0.1.tar.gz 362653 SHA256 45ce2f6ab032451345185b800badd77c05404087
 DIST pkgconf-1.0.2.tar.xz 247972 SHA256 a7c67f8603c0d0400be17b2efac0fdc9ff46625f7e50aefe4ad31eff248115dd SHA512 679c9033489076ba5691c3a830b8e300c6cb2dc9e7eeffa1a478c681c7f1cc49896b0b5d0d069b14804a5c9bc31115ba672b1f724cd6282ce26d54945a5a8a42 WHIRLPOOL e7bcb19eba08ff271a470a1c8bba13810951c20e79b7dea5352ea20b8b519d4462892c623e8383b540f5af3b6daf302386b8b1831bfed3d7d143f33cb9e0830a
 DIST pkgconf-1.1.0.tar.xz 264428 SHA256 5f1ef65d73a880fa5e7012102a17f7b32010e5e46139aed85851a541ba828a63 SHA512 2d54b14b9fb830a3d30e8812f6079a95cf1e1e77fd42d1eac7a6041347094ff88b79146be93c56625c44e2dcf38af725cbbdfdda09b457b921a9a17b97a23d15 WHIRLPOOL deffe0277f48f39b3824a25f255da6cdf51bdcf973d9b19f8eb166ba388c6440451d07bf37862f044a4e8be572d4ea5406ff243759fa5f22c0e6ecce8064ba31
 DIST pkgconf-1.2.2.tar.xz 267268 SHA256 b445d16df8b6e88489039eb2d7d91d5668025cb058a1852f3e0fdee19c8cb104 SHA512 0d9f74a69bd36f55b1485341127bff08487d5216ae495cea0474e6d23bb323d5c8c7d36b25c2e58282b1bcb0d74da6bb93ee0757e98405aba42b13f2e76eeac2 WHIRLPOOL ef2fe3045b058d627a920e3f2648bbfe2de763bb3f52f61b835684b533cbd768fd0ef892d7c99b89ac73b42d02ba4409d098b285d2943cad6017617112087257
+DIST pkgconf-1.3.10.tar.xz 272704 SHA256 62577d265fa9415a57a77a59dede5526b7ece3ef59a750434b281b262f0c1da9 SHA512 22ccc6b41b4571992f00e0b2e6f9922fd7f1bf9ef1b790ff978d8bff8ca0697321f7a7ecf1a193ccb4efda2c5d6430c1ad24487a50d3ab27f9f16e6be9fb9e83 WHIRLPOOL 535043f40ce096f26d0be474952fdcb843992360c7d0739c4ea618afcff5cd575f1cbe7dbe48cb6d2a44af530540f52c0b4ba55b45cbff6578ec233336bf0c45
 DIST pkgconf-1.3.5.tar.xz 271216 SHA256 886c397b22907209a7483229a8bf473afe151de50527c4b4d04b94fdba0f0c8e SHA512 a937607a5a868f136b1f8018f152512a3c6997e1e73baf7bd9af54c3e5542ecdac2f24df0078df2e0c8544060ba26a25ade88b7949c97ca4fe783d656a1804de WHIRLPOOL 9287c800063cac6ff8124a131e9f99c89112f56f9e14f72f525d97f3041a7444b4b71a64779925f5352a80f7205ae66e30e30ce98a5926dcd9c6ce1c1bb9519f
 DIST pkgconf-1.3.7.tar.xz 271840 SHA256 1be7e40900c7467893c65f810211b1e68da3f8d5e70fddb883fc24839cad0339 SHA512 6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960 WHIRLPOOL eaf41a5ff5c7521ae365197a89745d74dca39a4e91e27631fa54d5b641e941943dd8edc4e1d258db4fd0aa562e9db1253782ad423a2e7edbb5e09394c1abc108
 EBUILD pkgconf-0.9.11.ebuild 1331 SHA256 d791f2a8193fed44757d04f5c518ab1ef52ab443a44b8a918a1ef7824991a146 SHA512 34bf15ccf2c00aa9cb305e0219ec2931f7a9828d1446c9f05d84cd598456a4de50d0bbe29cef41d83b85c9727d1c141774dc86acc3be680f120532530d1472e2 WHIRLPOOL 1d2105f014554517c90753223b264b6d547dbb8bebae91a440a31eaca0839adbac9fc2342fe509a33a24ad41a2509ea64cd9fafcdc95fb8086ddff5211ee54dc
@@ -12,9 +13,10 @@ EBUILD pkgconf-1.0.1.ebuild 1299 SHA256 92836164edc3e323ef011eaa25d964a62e121e30
 EBUILD pkgconf-1.0.2.ebuild 1286 SHA256 d7507610aa827bf4fab4414ad5aecd1d3257746cd32cd414a278ab494598ce4e SHA512 05d078a1a04949adb75a05c675fb6c51f0dde569a49019d2572c375e2ed2d7453937ffee2bb342053ab5ce25e85daf6f0afdd316b24645d392d9a534532b6716 WHIRLPOOL 4e3c37806d3c4c763ec1b5ead206bac453aa9c85cccded3b0bf047cfbccac53c8706429865506dca392e9f3ccc1a3dc7a27aef18ee7f569a87eddd10aa3f0d5d
 EBUILD pkgconf-1.1.0.ebuild 1295 SHA256 e8af1b74a21421c2efc27a53634862b44e32277219e66b4f62172a0a639d1e7b SHA512 d41d54e6334840e3c9ecafbabb70832b0be6c1f03dd27a41c6de949e59c1c1a071504bb55258c257efa7e4026b8e0f08d9f2777bc226af86416733d0991cd173 WHIRLPOOL f0b8617f5fefc39b7c0f660b3e8217a9d59f534a2f538d764a0644c73be90ceecfcf28552e8cab6c79588a41cfd8c99c28a42ae09659cef74d2ffcf11ba9f9ed
 EBUILD pkgconf-1.2.2.ebuild 1295 SHA256 e8af1b74a21421c2efc27a53634862b44e32277219e66b4f62172a0a639d1e7b SHA512 d41d54e6334840e3c9ecafbabb70832b0be6c1f03dd27a41c6de949e59c1c1a071504bb55258c257efa7e4026b8e0f08d9f2777bc226af86416733d0991cd173 WHIRLPOOL f0b8617f5fefc39b7c0f660b3e8217a9d59f534a2f538d764a0644c73be90ceecfcf28552e8cab6c79588a41cfd8c99c28a42ae09659cef74d2ffcf11ba9f9ed
+EBUILD pkgconf-1.3.10.ebuild 1291 SHA256 02ea5213da567c4277015e56740004921d3d4af85fe460bedb8c0546c9af8fb0 SHA512 5eaeecc9bdc66cadec2b799a787357f3df9aaae45d7a71cf4c869f33fdd59b80b3ee06d0729a18e94b5e7cad2d7a8bec86f38ed3713cdcc762dd215cbdb9f071 WHIRLPOOL f9eb449ff058f9276e217f2cddc144490b2e96e1737051c3f1f2b94d1de75bd560b44ae78b6439f0a01ed7c05c5704fe50f28400bdcdc83c9814d114be426b58
 EBUILD pkgconf-1.3.5.ebuild 1272 SHA256 80733afd086cf2bcad49b21d7701491c02be6852125d7c5ff9b8567a473841b6 SHA512 77bc9917d6729cd9743885d4a1ce852e1cc96b4e340550530cf4fd0f41948706767b7ae966ad4acecddeef2379a46088c8118db91dc8defcbae05020619de90e WHIRLPOOL 3fa279d7fbe73feed6560a5fc4bde93b4e9aea661d721494726f8a106b418a73f2a8ef86d33abd0e379075f30989dae28aaa646533b38d55b238aea8d184fde1
 EBUILD pkgconf-1.3.7.ebuild 1284 SHA256 e18012877ba23a5f77797e16cdbaf7df2d2753d8fed553d95ed746ad0a1472e8 SHA512 513380b84195051b3ec144768170cc8fae329c7f585d136e9d89e9893597cb12c1f8a27fac4c6fd55ca0a5b96269e4f1d7f68b215b8d992da93f249f9dbe9d3e WHIRLPOOL 4a14fc65039dc5fd5da03e058536291e7626bae4236c8fd10721c8d604ef7bc50429a885bbeff7670bbded5861ef12c8a69e246510afa825dd8461b2a08aedac
-EBUILD pkgconf-9999.ebuild 1272 SHA256 80733afd086cf2bcad49b21d7701491c02be6852125d7c5ff9b8567a473841b6 SHA512 77bc9917d6729cd9743885d4a1ce852e1cc96b4e340550530cf4fd0f41948706767b7ae966ad4acecddeef2379a46088c8118db91dc8defcbae05020619de90e WHIRLPOOL 3fa279d7fbe73feed6560a5fc4bde93b4e9aea661d721494726f8a106b418a73f2a8ef86d33abd0e379075f30989dae28aaa646533b38d55b238aea8d184fde1
+EBUILD pkgconf-9999.ebuild 1291 SHA256 02ea5213da567c4277015e56740004921d3d4af85fe460bedb8c0546c9af8fb0 SHA512 5eaeecc9bdc66cadec2b799a787357f3df9aaae45d7a71cf4c869f33fdd59b80b3ee06d0729a18e94b5e7cad2d7a8bec86f38ed3713cdcc762dd215cbdb9f071 WHIRLPOOL f9eb449ff058f9276e217f2cddc144490b2e96e1737051c3f1f2b94d1de75bd560b44ae78b6439f0a01ed7c05c5704fe50f28400bdcdc83c9814d114be426b58
 MISC ChangeLog 7530 SHA256 2cb6920981942e5a75642525b6e4454c014d0d0d05c479fdf407b064dd6f89a7 SHA512 c6ccd4e6f8d231a5803375911567b69126d40dd1328b93cd0f1b39f8d3258c66aeb37a27ff86fad910589b2900bfe0bca6799d0fb3451168e11adf3caa6abfd7 WHIRLPOOL 5cab7b57c38537cd92fff5163bec3a5970d3b2cf19306a6f3ca547dda6e22a11fb86463dca0f77bf7d13e5d425fb4b32441ef9d496308135cc9a80b6b59db999
 MISC ChangeLog-2015 11246 SHA256 f1671c26b687b39a50c7f1ba82101c29be5ec42d74976218bb84aed74243d3d0 SHA512 6ae9486e7429401f19d21c12056929374a49840e305114394fecfdd55e49ad8ed3f4ede7dea5b5da67438c77a8c031b539b356a9b950b4182b2149f9d233a048 WHIRLPOOL b9547d35ac17482faa1fd283fe45e1a2ee805506fd89a03f99735b0a627b1ba2083116c70d460708fbf3313039c562a5f5d6ee669d4cfd6a218a1a897869072a
 MISC metadata.xml 556 SHA256 434646bb8f2543ef1a741b7770dc89875cb7bb9da0ed4cd09836dbb8f264b899 SHA512 dd0241269c2d3533b9643cea1c7a17f3abce89c5db819e5fa2428d620c6d652474b0547000574ac77ab76dd7058a0b84d55542f138df3a75a24a6e378b7488ec WHIRLPOOL e30559c2666290e5041d4a07476be0d003818ae2dba130166a33223fea6e07ff73f235b9aa25f941e4a401a9db89d091936f3d0b4d588c52e2b53d4bd035742e
diff --git a/dev-util/pkgconf/pkgconf-1.3.10.ebuild b/dev-util/pkgconf/pkgconf-1.3.10.ebuild
new file mode 100644
index 000000000000..325a849cbc9b
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-1.3.10.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit ltprune multilib-minimal
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config test"
+
+# tests require 'kyua'
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+RDEPEND="
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf
+}
+
+multilib_src_install() {
+	default
+
+	if use pkg-config; then
+		dosym pkgconf /usr/bin/pkg-config
+	else
+		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	einstalldocs
+}
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 30537959f4d5..325a849cbc9b 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit ltprune multilib-minimal
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 8c90f7b5e311..185d01aa90a4 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -6,7 +6,7 @@ DIST ragel-6.8.tar.gz 1211146 SHA256 dd7f7d22f3a58147379bda61334d341c2caa0caf9f7
 DIST ragel-6.9.tar.gz 1226871 SHA256 6e07be0fab5ca1d9c2d9e177718a018fc666141f594a5d6e7025658620cf660a SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd WHIRLPOOL c802e3020842b28ecfe604ca13c8f205ed98fb4c180c65a88be9001e7b73dc4facc6a716f55623da4f9c7cdc43c79d958c4c26fa89622bdabf9b3989e0c9682e
 DIST ragel-7.0.0.10.tar.gz 779503 SHA256 40562bcac66a22dbea8357a35745bbcb1ab596c262d8691145ee11aafa6f8dec SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba WHIRLPOOL d99108785163de286d426d805409a23c6ac7d82ea2887e6900ab184758bad3945ccdc1a692c3577ccb084c492c2fe7e8052e45ecc622fe754f08dc8da9f85fc2
 DIST ragel-7.0.0.9.tar.gz 850078 SHA256 b9e6cac5d388398ac05d8ef15a07628f5e6de292e39f5ad92b8176379e8352f0 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde WHIRLPOOL 0ae6c3d589caf967c30d9ccc30a6801cdf55032aa7f2939dc101e6ca3ef5b3e15df4a311164128bca63f9d2e3500d601739b9296a276de3b3b58755e5db0d646
-EBUILD ragel-6.10.ebuild 961 SHA256 41a23dd81825ef78265e00506641857277484f3078a3b47eaba638f93aae6545 SHA512 565f9f5c0da6b27d8147b786b45f27dba1ace9b524dafa8014dcacc5cb26100a191214f3588949156e96e514a12bbfd5a170e295c7bc52f133d28c934194a239 WHIRLPOOL 34f7adfaeeb65338871a07159d25edf35a956a901c898ea6c34fcef6d41b3524b7d6a9ef85b734334ac8f9b3d6261955eed2d6fb7bc4599d36aa0efacaafda4f
+EBUILD ragel-6.10.ebuild 960 SHA256 394133716ed34fb0a0325eb5f7efb6de42a6787f6f383fd9fee3c4f36690ea99 SHA512 d27cbfd5e4480381ced374ce402d1e45e43e13370ed34edc6e6cf922fa066e2874f61bdbea69b489b8b290d22f71539a729c1828c20c421bd414332324e30737 WHIRLPOOL b115e1ffbc2290c984a4f4c7640dea0e4eee2af8e020394564c8e690ba1adaad2bb7a797bfb75c0c53352ae80942221105a58621079630addcb4143d9c57a00a
 EBUILD ragel-6.7-r1.ebuild 1152 SHA256 e99b2083ae13a8d1a7d784b5a9cb4a6e02fa4d91a35dd5184c31d190813acc9e SHA512 46bee68ca0e22ef5f64a827af52f3dc14374920a31e2817a4430726bb2278447b0515acf1e0b77d58e3a6330e580f71c735e2170e4503734dd31186c10907822 WHIRLPOOL 92150dac5227a015f614531a3670e713167233b27067644ad98788d5d8e0fd49ae44a5ed05edfeda66f5ea0ff76f1befd3ab47903e4ca351839d3b894cd5ff31
 EBUILD ragel-6.8.ebuild 1094 SHA256 507b280002f2df0a5a5cde11713ebce68d9d2f07a9936c39efe5e9ed475e6db3 SHA512 f290a2edb43b60b52a563927343cb5f3672dcac30a598b6e95afe66858cfb33f0af5bc1d960e9b8efc05e9eea9a369045fe8dc7dc77abd596813d80f324d03ce WHIRLPOOL 77384425e2ecfbfc453a876e43387533ff7c97773bf42f6348f83f3745d7751a177f38c172ef574ec81195f4d0b1bdf7b876f7341dfc1ba4d2684df900cdfaca
 EBUILD ragel-6.9.ebuild 966 SHA256 d96f2cfa1bf988e10b3ff77cb4dfaba1dfc93d59d9351e33d8d859c7d0bd5f95 SHA512 14f09d54403f9eb38ad6a6b2640940475514a819f134102920c57700327886094aa94c723e829076540e9cef02b763c6e2204bc665f9ab80aa60f5d47ccff41a WHIRLPOOL 6ff83b36c3401f88b9d6be1a27f78bae62bf35cbe8306edde993297cd5d550bfebd90688a330087998cc8fa6ee7af059b01748a4a85cae3f626aa450b7e0d90b
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 349702c305f9..5d81ae75d5d3 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
 
 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 6890fd22fd7e..f8191a1913a3 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,7 +1,7 @@
 DIST source-highlight-3.1.7.tar.gz 1600692 SHA256 e1b2e007cdd94595393d42510e2a84763c36aad3409f0c3087f05fcb50a389e8 SHA512 4a1e733bd06468e6ebd023dfe4a62d7134c35aac311509a61e8d80de35ff3cea25fb79adb56bfe413ee214bbf4d578b4d4ebdcf1236481d9b83152aff6d7afb8 WHIRLPOOL 3d99a135abef73e865d2729bcbdf47fc7c143aeef91015b73a87d4a129323ca95aac153c3fa7d5207afb2a03ecba2f05db3e3ed8627b1e0477dcd9dfa830bbb7
 DIST source-highlight-3.1.8.tar.gz 1648351 SHA256 01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c WHIRLPOOL a05c3028816d0e0f0236ed18b806ce7f9f8f82be61b142774fe2156543c577bfcd5fb49bb259f03b4e97d5c01b5292e3b82720e29ccafa3a6bd7661f353ade5d
 EBUILD source-highlight-3.1.7-r2.ebuild 1156 SHA256 9f000c1eaa884515fbd7ef9cac72de9eb5ecd38eaec5984d97c763d50e43d49f SHA512 362e3904871945ffee6096e708ee85ae0e7edb749e1755abd260e8e2ca63587d312c4ed271ae61549b55391bcee543a110eb140eb2614ec754c8d9b053b06075 WHIRLPOOL bc3e156e85e3d6c3b0c0461da5419877a6a962a05da6749143250a2036b02fae1e46a9280efbc7e5107a99a5de55a38382cb401dc3a22364a34bbaebd036ac47
-EBUILD source-highlight-3.1.8.ebuild 1273 SHA256 985d8a64659817220b3dce7bf4c2f8ed2599c9b0c1845a1c45ffc76646593538 SHA512 c943d7b8286ef63fc41e65e6a97a971d077d14560b5a9df5b0e18f585ad4f45000de9f4d767afab485e0d1114b0dc43a30edb173adc9175c75955d1a88e5819a WHIRLPOOL 257c355fe16e006e8fea191d249ce6109b9cacfb94a722f7ef922bfc3afe3b0feaeb005013e95270675aaf40c2168235c0b892191387d582f5454ccc51b35b17
+EBUILD source-highlight-3.1.8.ebuild 1272 SHA256 d649108334adc9f217929f387169c0d1396cf06966b636ff4e273af8c54953cd SHA512 69fa0fced04d0288e56bbbb1f7cba67437e57548ac103a0656a7c1e19cc0c4db6a0cc42df522db3ee0dc7933b1463711ac6b475a4a9bca9a7b5a40c11ad90edd WHIRLPOOL a4f375f603e459634bf5b9bbc463639c0f58e137cb9e304ad48d39558d37237835078f189d1d214e24bc8ead9c8f6fb79bfacd81a5330648f38ee580730fbd9d
 MISC ChangeLog 2658 SHA256 3ce8341779514bdbd2b350655d0806e56a921b10790c3c1096da9dedcbd05f21 SHA512 fe132fdbb7b7f1dcd3cf6077a0ac1cd03736acd0d5c1beb52861d1aa12de34fbc60fb2e8c3c55d72887b3d86c42170576a8bf0bf0cbaf6e9ca9570f3d99bb559 WHIRLPOOL 110a8acc4f7f162d557464d9288411178b5a67b4960ea41906121aa72bd105447ad40795929adea99ceac6695c497a1a5f7f49d5d61327aabb6c2a1555f45ee7
 MISC ChangeLog-2015 11116 SHA256 a0c4f9c8ad1fd05e3457f5625bd43b3adf5ddd2b35ef60d79c0ae5c9fc334bc1 SHA512 3ee6493d2a3d58a8e59bcc0760c1b8489e66cee03471d03b626bf322a4f9e184f6a725cac64a43c7e49dfb3ad3acfe9fe8f8bb6c207465e9290411e9923cba8b WHIRLPOOL 69b51e97b6eb22a9453649ba283dadbfb0ab585bda0b91076dc7b51a5ca54cde3a05e1a687f38951edd1193a8c726b43134323f6f29a0511611d56cf4f1f6361
 MISC metadata.xml 250 SHA256 e950c68e7a4e72f8096556d6bb21fea300438999061af252e040672516b06351 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343 WHIRLPOOL 7804a583de98e5ebb9478b76dd2a78071f8fe6973d88692ae4ec9107dd1dd7c54fd11baf66339a9ad4267da708ffaae3d8b1d0bf332db2d5db9feac46b6856f1
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index d22b7cfa6f9f..65abc1ce0bd3 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"