gentoo resync : 03.12.2017

29 files changed, 213 insertions, 766 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fb04a795bcf8..1bb21278af8a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index ed0782ea4d00..8731eeb02b41 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -5,4 +5,5 @@ DIST Botan-1.10.17.tgz 2706678 SHA256 6847ffb64b8d2f939dccfecc17bd2c80385d08f762
 DIST Botan-2.3.0.tgz 5947072 BLAKE2B b8eaf4228c01200f839031b423901f93c1b6863d10424ad52afeac85131e95bc1bad024478c8e4c8e4c12210e85aa62d30fb83b3ece8facdb57763f95c45687c SHA512 a8575bdb2eaa01fb45d8565bea0b54ddf47a21d2fb761fc0a286373b09d51e5a00e84d5cefc51040c5720db66f5625c6bc73ab09cffa9cd42472545610f9892a
 EBUILD botan-1.10.17.ebuild 4215 BLAKE2B b4d1e16b4ed8ab4f8dfba08312c26b744896a59b3eaeed8df784ffd1ef8d81233eaf841270fa0e761ae9491797aa2ae965d4a8f0704140c5761263103fe856e1 SHA512 a8134be2cb93db31e468c7b1dc3559cbd6e54c32d36848df4597da7a49ca8d8d027ff9695393d6902e06dbdf101eac1ef55542bef366ce8ed334f2a7fe8e4b0c
 EBUILD botan-2.3.0.ebuild 2783 BLAKE2B c65f5c4b2c84305bb10bf38439e34b25545d6ff7c06be17fcf276c87b4513b353d713075de183c92c701f9b161c949be081e5b874ac31b9b87917b04050d1092 SHA512 49471ee62fdc03e9a058ba90b7e2260b8bee4cad677d804a35ccf4e22d2179220497e0cc47733d80974f7af686ae10a68164babc27586e0ebd155d7b32526a45
+EBUILD botan-9999.ebuild 2251 BLAKE2B d3bfb15560fca7cbaed2614ec87503e9021e4d5f76a63d4c55a868966a71316425146e81c485ac7e7eec6db5b0b03a77fa56f7c98185da3c427fb25314d95911 SHA512 b335208dc9bbaaba49c5e71cc8a5e49b210113a16f5362874ccf9dd035e86c0a10445fbc37ee9dcb6da1c681caaacb770b5149149c71b106091011cf596fdfce
 MISC metadata.xml 675 BLAKE2B 20c2dc44426b9e2c7d57f45b5838b0ca27d80e6cbef49471cfe1cafb3c5db47ec3f243736856550bda25fd21e12fef08a71f6db7d855a025a3f4133fd2b5a1d7 SHA512 6773167b2e46f8d2251d369bd668a2ea309ce3b874166ebd102c7758f1f23a215f47d6581999d49325e9fdda88082ab46db8dc4f98ad6a20722f50a56b474b39
diff --git a/dev-libs/botan/botan-9999.ebuild b/dev-libs/botan/botan-9999.ebuild
new file mode 100644
index 000000000000..64cfdba155d9
--- /dev/null
+++ b/dev-libs/botan/botan-9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit multilib python-r1 toolchain-funcs
+inherit git-r3
+
+DESCRIPTION="A C++ crypto library"
+HOMEPAGE="http://botan.randombit.net/"
+EGIT_REPO_URI="https://github.com/randombit/botan"
+
+KEYWORDS=""
+SLOT="2/3" # soname version
+LICENSE="BSD"
+IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
+
+RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
+	zlib? ( >=sys-libs/zlib-1.2.3 )
+	boost? ( >=dev-libs/boost-1.48 )
+	lzma? ( app-arch/xz-utils )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/python:*
+	doc? ( dev-python/sphinx )"
+
+src_prepare() {
+	default
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling modules: ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)   myos=darwin ;;
+		*)           myos=linux  ;;
+	esac
+
+	local pythonvers=()
+	if use python; then
+		append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+		python_foreach_impl append
+	fi
+
+	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
+		--prefix="${EPREFIX}/usr" \
+		--libdir=$(get_libdir) \
+		--docdir=share/doc \
+		--cc=gcc \
+		--os=${myos} \
+		--cpu=${CHOSTARCH} \
+		--with-endian="$(tc-endian)" \
+		--without-doxygen \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		$(use_with boost) \
+		$(use_with doc sphinx) \
+		$(use_with doc documentation) \
+		$(use_enable static-libs static-library) \
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+		|| die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+	use python && python_foreach_impl python_optimize
+}
diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index 0492a9018823..6f17d10a27b7 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,4 +1,3 @@
-AUX libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch 383 BLAKE2B f8f968bf8a9ab3f8cc28d64a2f97491ecc64464d7de1566c257224780f01b52e10a31992a7cebad96b9872ed383bd9d5920abc24131d91f735cb24c82aff94d8 SHA512 e4eb10ac0be553efb57b1b9d74dd28e05ad370b3e1e38496122c950083181184f4d442790ff3017badcabf2393424b6416ad268d7cc3f9ec60cee6048d091271
 DIST libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz 46438 BLAKE2B 66b1fa44f28b5f4d5fa09afa988ca793ae892a7aeab6290b1650876a992e27a15af5a6a999080aa4c499295e2fa3de768fe5f185b5df2af36b957766508c1804 SHA512 dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9
 EBUILD libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild 2656 BLAKE2B 9aedfc6416190c6b81691f958dca73922f9c4d2bb0467776842b35aa458f57f59ee31e7202e7c3c03a3cc8c1805ecbefc8dcfbf81e6ab153f1d797ba2d0facf5 SHA512 08c9737ca9247770d180c6c6c1bd1f8a11d34dc24c0341333b069c1d4a8a2d865a36429ee310a571051530360eb91ec22e305f7f5c1693a0d979c972e48e3678
 EBUILD libdbusmenu-qt-0.9.3_pre20160218.ebuild 2754 BLAKE2B fdd0cb380c5df4c3bd7d11f24572a48cfa257c4aca89967cc30e83dae2890d903e0a3eafc0339500fbc5c03562258dad64d505208ebf1c50af8e3af3059de32e SHA512 385479a9854ce55cef1b6567a400b9c0838023dffaff8813466ad8e823d183d0f64abc6a739b3688d3b2222e3a1aeaf77bf74acc50cb133eeca27a2c1190d4e6
diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch
deleted file mode 100644
index 7f6d82eb00db..000000000000
--- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- CMakeLists.txt.old	2014-10-10 21:14:47.139654992 +0200
-+++ CMakeLists.txt	2014-10-10 21:16:17.114656451 +0200
-@@ -90,8 +90,12 @@
-     )
- 
- add_subdirectory(src)
-+
-+option(BUILD_TESTS "Build tests for qt4" ON)
- if (NOT USE_QT5) # TODO port tests to Qt5
--add_subdirectory(tests)
-+	if(BUILD_TESTS)
-+		add_subdirectory(tests)
-+	endif(BUILD_TESTS)
- endif()
- add_subdirectory(tools)
- 
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 350f1510451d..aaeaf4bc8386 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -2,6 +2,6 @@ DIST libgee-0.18.1.tar.xz 677908 SHA256 99686bbe5a9c89ba9502c25f61314ee8efa0dd2a
 DIST libgee-0.20.0.tar.xz 678972 SHA256 21308ba3ed77646dda2e724c0e8d5a2f8d101fb05e078975a532d7887223c2bb SHA512 c01611ed34862888fa038111010ec9899465f43423c9c90a18050dc0b0c2a53cf0fe3c7affcbdee91e225622ccbfa08bfd0c08f0eb7935611b3d461b5b919e66 WHIRLPOOL eed68ca240309dc06576dfc03185d74087c6437eb1a2bf6ed291a2448bd3e4b997ccd111796bb05a057748ede3c22880917bba758612690ec6d823001865dfb0
 DIST libgee-0.6.8.tar.xz 443060 SHA256 a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a WHIRLPOOL 4c96a3e1dc1c34ca6b23b5b34fae7420ff9215ad07618a9b818d70b12697cac430cee95ab7bd175b4f96fbae99fcd4e1fca8da7f55064962b2cb61c641d22bb2
 EBUILD libgee-0.18.1.ebuild 680 BLAKE2B 020ff7b524df551e92a5c263f6e07297dcff9e00ae2e262c3a68c0c05d9d7a29d44e8fc2533b9967a51de21867a723e11fddcf69c5741a2590837df81be0eab3 SHA512 2a7637bc3e7ab859851389a220e3fe1f632772999924ab7e5bab9ae5e1793afc5400f9696c5301c134dc17f70f6702f5ffa1d5f9cfab293d1d152acd687e66f2
-EBUILD libgee-0.20.0.ebuild 684 BLAKE2B 96be6a032ef65241882529c1396e139b4ad3921d7b1bf214eaa9d0ab4e9c216de159b026c8e81c2f336d6c4fd31221593c8ce5b05eaf78e20fe97df364d93c69 SHA512 a9f7b0c51bfdae59f72653c1c28d0012836c50db315bf683f730ba1d824900e1c9b6a939aa52e3214d8be3ece5b10af633fb949513f991c60cf07715cc9546f9
+EBUILD libgee-0.20.0.ebuild 683 BLAKE2B 389b2ecc76c7d0fbf88b9fe59e732823ce1999b11a6d58fdc4e2fb0cc0456e14b5b3c00a43375706b5ec618402fdf8017c49f7631977b672d698eee4df1be662 SHA512 5daaa6a02ffd980a5920fb51fd454c35a1812322b33f854acbe53d5e63972f0361bf198f8cd6ae5bde879418447af25109df57e5d09d7a2a670bb228325cbedc
 EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.0.ebuild b/dev-libs/libgee/libgee-0.20.0.ebuild
index 6b031fed14ca..d05495cbbdf5 100644
--- a/dev-libs/libgee/libgee-0.20.0.ebuild
+++ b/dev-libs/libgee/libgee-0.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sh sparc ~x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 4ec0277dc7dd..aee76e15f8fb 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,7 +1,9 @@
 DIST libgit2-glib-0.24.4.tar.xz 458360 SHA256 3a211f756f250042f352b3070e7314a048c88e785dba9d118b851253a7c60220 SHA512 55874f77ded1474eab6f84d3426c8cddd56a42b04b8b3e50e4294f396b8c10025a38bc925c0b74ba3e52022c696f07e7f69b75c443bbd0af0f9e0769b7c4555f WHIRLPOOL 22a17e940a670ccb31cf0fc229b8f042794e10e7c5996d4059779d3a7b2ab5865b9cf1bc1a32a9297e88e5b069b281e7f20b2db636f91d5f8af9df8f14d23346
 DIST libgit2-glib-0.25.0.tar.xz 420500 SHA256 4a256b9acfb93ea70d37213a4083e2310e59b05f2c7595242fe3c239327bc565 SHA512 f265d5da4bba28de2aa7254d36fa596b9e348c6543cd559cbb9c1f9610d4b63af00c82fb4138f345e15109503e0d61101d3344c68539348cb268403387a4418e WHIRLPOOL beb276d2637edca19a96f7eca94bc8b318b31e6c014044e7526c9c397ec376dea38891eb0985351899ad26de1436f4713e3ac0d708966e4e41d41d516208072f
 DIST libgit2-glib-0.26.0.tar.xz 420404 SHA256 06b16cfcc3a53d9804858618d690e5509e9af2e2245b75f0479cadbbe39745c3 SHA512 322f99b6273f0e56fcccdccd3b1193e1b62ca9dd495144e7c5fc59520dd693b1ceea4bab7335de1201ab09ecd7e146daa86afd9256d16649c144adb0b6de97c6 WHIRLPOOL 2bee4c44eae4ac01abd65d1b9a48069a60b749e86101d1df483a5b13a0aa3380756bb083b33801b4787ed384bc7fa7ed5de53271a7dcc95b09fa7f296b5060c1
+DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
 EBUILD libgit2-glib-0.24.4.ebuild 1302 BLAKE2B 76dd86570dfbf545750175058f4bf04732791e3260e3cce80ee90519b93a1e18c4d48b9e0024bc6db08cbe0033e339fc548637626ba57306bc76f6150a6bf951 SHA512 168f01747fb30312bfd7f68b7dfc0d7a9ad35a6ce53a01d8a076af910a956c0add62bbaaace1bb48b6e816cdaae0ef82fdc1fc30ce21579eb638e2dc7536624f
 EBUILD libgit2-glib-0.25.0.ebuild 1265 BLAKE2B 3e1c7c29740795a9c495ddc27a12cd1226facb351975884507a1a39c364c7ef22d3a4e59439b95112ba11bcc4803bae0724aec80ef7b5c72dfa077b279c7935c SHA512 793aa9f92833a29e865826ef0267d40c0478e017102bcbff1233e49eddd6c7037874a916cf33722ac9ffce1573cabdf9e4abb3977d073fb48596ecc6f8d7e0f0
 EBUILD libgit2-glib-0.26.0-r1.ebuild 1285 BLAKE2B ea14277646056ef9e7bcb3070be2d02092df48b8ff8cb5480ba3491f12d720d48c62b515a1f1d3a93b998286bb259faa4fc44230bd0d13af70edd0eff0d1bbb3 SHA512 1b28fa0cb24aadfb5da8ee6ceb2d27621fc52706d1f096d4d8e6963061a755a822fdf79930cb835b12001bf697c06600bb6bcb3b8247550295732df7a9640174
+EBUILD libgit2-glib-0.26.2.ebuild 1285 BLAKE2B ea14277646056ef9e7bcb3070be2d02092df48b8ff8cb5480ba3491f12d720d48c62b515a1f1d3a93b998286bb259faa4fc44230bd0d13af70edd0eff0d1bbb3 SHA512 1b28fa0cb24aadfb5da8ee6ceb2d27621fc52706d1f096d4d8e6963061a755a822fdf79930cb835b12001bf697c06600bb6bcb3b8247550295732df7a9640174
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
new file mode 100644
index 000000000000..2a3ed8af6ae2
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python-r1 vala
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="python +ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Specify libgit2 dependency with subslot because libgit2 upstream has a habit
+# of changing their API in each release in ways that break libgit2-glib
+RDEPEND="
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libgit2-0.26.0:0/26[ssh?]
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable ssh) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python ; then
+		install_gi_override() {
+			python_moduleinto "$(python_get_sitedir)/gi/overrides"
+			python_domodule "${S}"/${PN}/Ggit.py
+		}
+		python_foreach_impl install_gi_override
+	fi
+}
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 5170dcae9782..519f520639a2 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,5 +1,5 @@
 DIST libpwquality-1.3.0.tar.bz2 423910 SHA256 74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a SHA512 c3817c7a5ca962b161911b97b413a0db7c34a99ba2cd191435024abdbe060e248c0f88436f24d3992dcb1b00d34b88afb731ef1fd23efc3ad1abe56d4d7d53ea WHIRLPOOL b6451083551a13be259d1a81eb089889d9ee430c30afb2555aa2e5e7c4240febc71b152ce3c210b592a56db8988fc88a827d8e9f368c5aa478d5babf4e316b8c
 DIST libpwquality-1.4.0.tar.bz2 450384 SHA256 1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b SHA512 b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9 WHIRLPOOL 07a91601648f2e2404b3cc4f0d81e02e78ee12a012c2efa2843762c87f1d296fb4fe8368a6ff21adca30744eb26ec985a38f2dffa9a4f0fe3d34011e1e3c0d54
 EBUILD libpwquality-1.3.0.ebuild 1971 BLAKE2B 2b503383430357539afaa869cba8d5e7cb6c7d972bbb785803be44135182f6d0774de831217cd46926f3931ee5696ab0ae147272708ccbc76f427d8715f3683b SHA512 c06e54adcfa58128cb98014a3df614955ed00c2939c21a11d56d3dc8e7644e64c10c88876d58397a4c3918690f372f1583120bc75063de733189bdebfba2c137
-EBUILD libpwquality-1.4.0.ebuild 1994 BLAKE2B 71844fec10e98139def04bdebe2214d37e485537271dea8661ef35bf6a9b9b380b94514c7d143120812f9182c9afa9128842531df38c3b76f57d48457617713c SHA512 8536718a9dcaab697f8735544a7a973cb7eaede59f19fdab8a579a40a226819367641cbd6ca863184ca3c3bf4c87341840bb0a78464ecbf5bcadf9116eaf87a6
+EBUILD libpwquality-1.4.0.ebuild 1993 BLAKE2B 76109a3f2328956a83b8ee3df06a8ed235c91765d3abee9c0e72311f9e001e335cf273570ded25c4604f4c0d44084007761911679292a771457634ce038ebd0e SHA512 57d272894caddd798db496a2ac0da87fcc97fbef49cd7b581bcdeb88811afc0548f1a1beac0a3a4221851088e32b31331dd64b8fc49647ea9dc6ec9db0899b17
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
index ce70d3d242e7..7e165b94f439 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index dd3790203584..617cacb37431 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -5,6 +5,7 @@ DIST libuv-1.14.1.tar.gz 1157777 BLAKE2B 5abaaafe0568aadb7bc091970cb552c093fe4e6
 DIST libuv-1.15.0.tar.gz 1158746 BLAKE2B 7ae636fd04419a423ffc6cd1b5f888b136de71643c9b24bb11625678ebbfdf013b50a49da6675db455de59ffdc99f51d77cf62e8d970cecd833360bd67d72ac7 SHA512 46b9feb3959e73521f9e499881799c961db3ff1dcdd780537e774dfaf6145430cb98e9558cf3110624fa35a7117350868afdcccb30abf275f7648f11b3de4afa
 DIST libuv-1.16.1.tar.gz 1165502 BLAKE2B 07f77f0f9f53caf44962c7ca5e107e6c71c7f656ea22c423e2af1ca56b9b6de56f0afd597a490e22f78a2459f8f2eb0b3418411040ef2bbceae7e55cca4710c0 SHA512 e75c735467c5fc1681bee2b4f4ffae63116644309016d0f507b37643697ae8c85b3be7309288b1aca8fa11c6cb1dc1873962d1dc18fa3ed8cb66c8d2514c95e6
 DIST libuv-1.17.0.tar.gz 1167930 BLAKE2B 2e38e400d312005f94ad671203b82794f96e5802117fe6577d04951687310a95098ad8d352add67fd356479fa6c63b7b7027f109a77987e7626d3f77a34b19e7 SHA512 274615dd67808a7b7481184aa9c1650f7646ffe714c5304ea123e287eb09cad2a4c677ac06ae68b7d0e70071545954aa6a80414cd7e37c242a2533563094870c
+DIST libuv-1.18.0.tar.gz 1167950 BLAKE2B 2c40adbc2c98ffdd3a8a9c30f90eb90e6b0ad16b23935e43d1e19c53238f1a57e422f6f9a3e00374283c4187faa65e13c3e1546ead3ff1fd8e30d98340947078 SHA512 d1ef70b0f060f40cf57b282279d1d63d6dd019b4b811211b2252db32633a80af46290d201b4a4338f84b3efdfe9754a11b29bfa4a7636b06540b1a65e1fd4fbc
 EBUILD libuv-1.10.2.ebuild 1140 BLAKE2B a8dd07a2cb5bb9959099d681d9d711bb78afed0decff1f997735749c185540592212137735165989050ea59d6bc1795cf2e1fa82898bdd81fb7d55011ca63d4f SHA512 65f5e4e77ef871f8e40657981432a3bd51d54671b056cac25a2a268509f6f005df3ea73894ea29da3a4f1e1076c9e9c7f177e0e2a968df1d6df498ca14381be7
 EBUILD libuv-1.11.0.ebuild 1150 BLAKE2B f6ea93b416fffd684d8c97e83471cb27944bc8ce4553ce037fcfedf0f7b7b17d1555c06a7b2b3017578913fdf8c9323b68f80398494726e48bc5180e901c7773 SHA512 581d9276fb9abdbda11e86e55c6ca96acd4dfd3b68fbb6b081bc54e656e97325632f48c2d2a65bf0aa0b6544c9e818b74264b9c9f0509343ef517947787aaacb
 EBUILD libuv-1.14.0.ebuild 1150 BLAKE2B f6ea93b416fffd684d8c97e83471cb27944bc8ce4553ce037fcfedf0f7b7b17d1555c06a7b2b3017578913fdf8c9323b68f80398494726e48bc5180e901c7773 SHA512 581d9276fb9abdbda11e86e55c6ca96acd4dfd3b68fbb6b081bc54e656e97325632f48c2d2a65bf0aa0b6544c9e818b74264b9c9f0509343ef517947787aaacb
@@ -12,4 +13,5 @@ EBUILD libuv-1.14.1.ebuild 1150 BLAKE2B f6ea93b416fffd684d8c97e83471cb27944bc8ce
 EBUILD libuv-1.15.0.ebuild 1191 BLAKE2B 726164a38df94e838107eb4a9e2c4a60d03f109ce3942433664f26c18750222f28473f2ccee9f84a755d4c940e69e469ed16b7ad4e7c2955d7c309d3a3fe9247 SHA512 18db60bbb65c15076c22f34cb7976737d0aa2a563902a32e16287e0ab8187c993d237aa483027c2eb0a0eee94d48fc192205247458c334ead548258bdcbf7f94
 EBUILD libuv-1.16.1.ebuild 1191 BLAKE2B 726164a38df94e838107eb4a9e2c4a60d03f109ce3942433664f26c18750222f28473f2ccee9f84a755d4c940e69e469ed16b7ad4e7c2955d7c309d3a3fe9247 SHA512 18db60bbb65c15076c22f34cb7976737d0aa2a563902a32e16287e0ab8187c993d237aa483027c2eb0a0eee94d48fc192205247458c334ead548258bdcbf7f94
 EBUILD libuv-1.17.0.ebuild 1191 BLAKE2B 726164a38df94e838107eb4a9e2c4a60d03f109ce3942433664f26c18750222f28473f2ccee9f84a755d4c940e69e469ed16b7ad4e7c2955d7c309d3a3fe9247 SHA512 18db60bbb65c15076c22f34cb7976737d0aa2a563902a32e16287e0ab8187c993d237aa483027c2eb0a0eee94d48fc192205247458c334ead548258bdcbf7f94
+EBUILD libuv-1.18.0.ebuild 1172 BLAKE2B e56d2dc284bb3941a78f528551b0285c25e2334a0d267f5cdacd8afebb8a67b1a6239b07e1f5c5b2d01dcbd80f9554ece094cb6860b23e137af78f59e25f61a2 SHA512 7c74b1645d499581c928b2c36d13c53449accb6a068b44a76bf7868c2a88176671a319f60e28242e0a7b5128a4e7536e0cdeabb2fb5474cbc27bf8e3c4abc01d
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.18.0.ebuild b/dev-libs/libuv/libuv-1.18.0.ebuild
new file mode 100644
index 000000000000..2db9dd2b54c8
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.18.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index e6badca81cc8..a146ce3427f4 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -26,5 +26,5 @@ EBUILD libxml2-2.9.4-r1.ebuild 6888 BLAKE2B cad917e8d19e16fcb5736b39be4760f976b9
 EBUILD libxml2-2.9.4-r2.ebuild 7391 BLAKE2B 533aeec5ba4f92a26216eaa94086259fd9e18793e9d70c0d06183b99d7b7dbb402d1af251f83a89d450912eb18f31a1402bc0c8956e66a0bfafc7e56a9ed623e SHA512 4632742786d19c6e81f1e26160ada7862e9ab7b0ac57dcd4fb02d45d403533a2555736c3b7adeb104689e27bf3d7d524916417be633bbf7f96ceb5e69b050a7d
 EBUILD libxml2-2.9.4-r3.ebuild 7671 BLAKE2B 6e8054440bf2dd8387f689513e834c42bf643e60c3f270f5aa9d128fb7e3d30ee04f90e20b6f2ff37b525c23ec6b62d5531dcc6ffadae59bf73a81e0721ebc49 SHA512 ce3cd2d3db2a4f489f9024cbe8c7d343fd94b1b8736debbe98084ebe76d828cb1e236169b9ab114e7278c886d58814835f4639b865bf198af528cc681236fa54
 EBUILD libxml2-2.9.5.ebuild 6387 BLAKE2B dae78ba11a69c6a4decafa992e910f4cfd643e578522089895697506d4b5f34492458cff62e0c6143a88541b737f05161622702e33dc4179adf2dbbc0e93ea5f SHA512 9740e84ec0ab1fbe1cd3fba542a2f0b8b5dc7341cc6ccaa4f7552f522412921477f1cbc47c3f614a0fd6728d18a0642e50fa31fe46e481bc6e17b5a2e197a9fd
-EBUILD libxml2-2.9.6.ebuild 6382 BLAKE2B 3af62f66658df0568f06e9692edabdb881af06a3735aa72abff05e20075193adba6d383a94f02cbd1191973f45e3656ed8d5aa653d49bc86edd08ff3fa94370a SHA512 070b80310dd9a99f863058ac58a01672e90d008325f165564277eef513bbb7a3a6301f337ee9a4af03afee327e938d7cb741b24389e32be0844525bb77570ef0
+EBUILD libxml2-2.9.6.ebuild 6381 BLAKE2B 2b46ed7eab561e73b6271520d433fd4dc098cc3e3c785ce2a7dadb081be6b2f73d2bd84d747712fc6e09490becc6449ca76ac75c54482cc3c8a4f44791da465a SHA512 65e5f5f133925da93d7d536088d893dda145e1eb123f0a5c416a612b41aa0e2c499e2fe35a20d1d30d9231b7999cf3ef81c87371e894864917c3a065fd0dd594
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.6.ebuild b/dev-libs/libxml2/libxml2-2.9.6.ebuild
index 779a5ef5f5fc..5fdd0fabd09c 100644
--- a/dev-libs/libxml2/libxml2-2.9.6.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index d60eecd9d14b..09257bcfa85e 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -6,9 +6,9 @@ AUX libxslt-1.1.30-glibc226.patch 908 BLAKE2B c6df4080c1f99d72a903632bd6fe99af92
 AUX libxslt-1.1.30-simplify-python.patch 7487 BLAKE2B d4a355c285a3c62b1c96846c62bb161a52c1ce41168ef0c07641fc948480f2457345e24641f18fef84f5f34bc930943ad312c9d6c2b9da4141175c7afe320a32 SHA512 4b0b622aff880de8ca2fbdd9e61cbea117f1f497767caabcc4ab4e6532145683b08d127f497bdd41035dc7b3fa6d3ab5b53c2d8674e87f5193c652858ee31586
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 BLAKE2B 91a1bf2487158d5e364247d29da4485e7b62f1838cbe1f8eabc7617b67929640280f6f2b649ea090fcc818fd5e5e99809b960e1cd69a5df42ca73abe86839b98 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a
 DIST libxslt-1.1.29.tar.gz 3428524 BLAKE2B e37cc4a79223c2c2b78dc2bbc0bdb502e7c9ac0e5e1f6dc1ad15a14fda3c26d5c92e7354141763eeb97f489b64af99a2c7da320405b6011195a95c11705e7f2a SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31
-DIST libxslt-1.1.30.tar.gz 3444029 SHA256 ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 WHIRLPOOL 7a346a1cdd340f6ee39b4d8d426dd894164ce4b8c55ee74b832cdcc9e7bb7bd2e13fdabb57a50a206c40be8bf238a57132bd1cf6fe48e77c710d8ec75f1aaffc
+DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986
 EBUILD libxslt-1.1.29-r1.ebuild 3496 BLAKE2B 5f47fd3c06e97a1f17c97e1bc3b41b1b02e75a8015b2c48823999649289da82950cd6f02207e351c2ec498c389e0b702b0295fdf3267455c3b668c0950a344f9 SHA512 8881813ff55064e4d37308de04fa30750a54bcc3c0c932954d0930542435241b84f6300655eaf715c2e784086ef6cc400bfa5cf0f5ba256edc38c13d06fea372
 EBUILD libxslt-1.1.30-r1.ebuild 3570 BLAKE2B 9f2220573c09f14745dc4e3d4324a2f8e65f7f8b112a0b5c2bd42239514b120ce78b19ee0c68fdbf449e260ca17b17f6f528c9b9cc15dc8ff217a77cae0dd58a SHA512 7899c43b5a0c4933cf44dd583e3c67f34a369a3e7909458545e3c63bc67c36a46389877583e35720ad384014668e5d336ca36eaa105523e1e8643328d8f19bad
-EBUILD libxslt-1.1.30-r2.ebuild 3669 BLAKE2B bb0a908c91ce507ebcacabbaabd54195e66adecbdfee621c117a0dd78e5fe4885446d0cd93bfe0e643d0420bcda2d027d597db96342bc2228ea6086fb8766a10 SHA512 3768ceb20ee597336bf05545892fbad37429a9ef495218a49ad32b9e93568e26e6cb320deac64671c7ef5abadc2909d3be2fdf053dada09fadcb5f5997aa4023
+EBUILD libxslt-1.1.30-r2.ebuild 3668 BLAKE2B 8b24e2c25daed747460035efd977a83e2ee174fa705c05c594737ebd8e77f91d86b25c4a9e96ad5b3b11e24459431268809264a511cdffdaf922c723de8c2900 SHA512 fc23defa494cdffccf38277300b4f9b535714bae1a3173b53a80511a2f47585c660fbb86c438cc617f76d719b8e39d99d8108129fdece5078f8a347cead7ca3d
 EBUILD libxslt-1.1.30.ebuild 3461 BLAKE2B 400aa6a6878a8d51799bbe536964bea029067a1e307eb2ad3796c33890d8abd17d79c87881fa17c3c24a4436a4e9040aaccebfcee68567f933ee706549ebee3e SHA512 b44d3c1f72cfded5bbdbd2ac0de4bec9b5d51945e9697f5fe7d71c01a507e005b77828312634e4095e9433e733a5ede58f4b822e0b2ef34027a3cd6e66542fc0
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
index 7e9ea36a3cd8..f520d1264f5e 100644
--- a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 05d7c20b47a1..eef71014b9a4 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,20 +1,10 @@
-AUX ntl-5.5.2-sage-tools.patch 1411 BLAKE2B 677c48d28ab2973b1e01d71c32490baec02e522413ca8d48c4c4733370e371051b530ca74adaf254c676f68c70ccc03fe7c6404471fe27454d786d209536808c SHA512 cf1d19629061e4495f24b0726d7480aa7bb23e9c00d80e66f034f82831d19adfee9dce94412494a12c033144d016074126ec8b23064766b0c6dd478a6a74e00d
-AUX ntl-5.5.2-shared-r1.patch 4070 BLAKE2B ae5768d844e64ad2ce4a76846c00edb0a530b471d27772918b89d1ef7640627ab0e515c0de7d65d6456f4983e60bf7b31045bdb332956cf77b8edf2c0d156913 SHA512 7e692fc4ee66d0b6a3e542627e438018f067c3a512d19e241085da630fe7203d258d01e647b5a00d8e3f85abe95e5169a903a51795151b6fce41630a8856d23e
-AUX ntl-5.5.2-shared.patch 4343 BLAKE2B 5fa64ea5499fa3cd5ba52b7be2f7100fd103a0f43839936134bbbebbbc3829fa26a0d37be4b0bf4794a4e610a447d7ce19902c19f18b2ec5f8a3826bcdaab1f5 SHA512 e3f6c49a62c753e97f1606f90be13edfe997dcb1aec9df11ceb9efbfc14b7ec43d916f3f90ae687634b8672d16c9dad225ba7911ec8de761637d249d57611541
-AUX ntl-5.5.2-singular.patch 324 BLAKE2B 923f6946b2bfdf9f23b913b239a8fdaa8c8b9812b9c15de060df2e8c1851a4ff52c88ae3722cd274bb6e37864f8bdcc4dc26ab5d514ebf40b541c777be1fe4f4 SHA512 8b62628b352ca8b15e894461c70a14b4d8ac87781d7bffaa2953d2ae3acca4a9a223d51da40ac76e553d0ea9a2ee1ea1a7c8c221a5e009771774e0ce7a50da95
-AUX ntl-6.0.0-sage-tools.patch 1557 BLAKE2B 8232dcc3fc30ce747b1222159e27a3f787c54164369ec8ad7402e50ece6bf7ffc907f75168bbb0dcd6095a1eb7e7fa12493617e02effc86d84e0fbe3eb6b41f5 SHA512 5b028ef0b00d7ef0f82a260232bc130b300e175d31681b8f994e9037bc82d2d49491d8b495725388137cf3a2f73d17cdd6266592b3894189e11484159c70ce73
-AUX ntl-6.0.0-singular.patch 330 BLAKE2B 844c7766171dea95aa1c86f686c2f5b0f0b5b09a4262f80eb4e8c2cd0c70c5e2cfbdea3570353798f21d187fc728019dff84eeb44289d95059d93b76c8ef79e8 SHA512 ea8fa036a3032231435de13578f01ce038d89ca35d1ff6250a72b6129cdcae1da329b3d273c98e34ed40dc09ac2cc172a5f1614184d44325a35ddc10b59e5fe5
 AUX ntl-9.2.0-sanitize-makefile.patch 4324 BLAKE2B 43a2a1276d2743bfd8394c89419012a2d8278d12394ed12f9b2ab60bb1ec9deb621b9c8c5e0835d5c6740c46344a03fb1f50331b7f8509caf73a16c1d92b8e44 SHA512 d1b0d21fd136bf6548901486f6893d34c538b110bf50a9a8b4ca810f77a32bbd64d67962310bf7666afd935d380969fb832848d5779e1d1101a06691abedec80
 AUX ntl-9.2.0-singular.patch 391 BLAKE2B 2d4dbfcb45c7cc82d8358d7d7d7c0f50a4eb6b1c3ef11a3baa47223a8dd1c0d1fe2f38b656829fedcf172617dd0504317f901b2f3552128b86765327a56163e5 SHA512 ebb25e7755232ff72d75538213cbfa3a600e9b78af3943e73da4de1aab28d3c8dda43f84eec716bc52768d510f6a68c3f5c969c5dea2c6050b25023ba440fe04
 AUX ntl-9.6.4-sanitize-makefile.patch 4049 BLAKE2B a5ed15742628e3880ae4804672d198b83372272f89c8ddd8528f78e4030a4926d3fabe920a073ef22409d16273c9c9a1a87d4a3a554d84d34c7b10eaff3eac98 SHA512 1af6473c85d75299db28542e244bcc1bc37011bc4a1b85cacd9c21a44c77a578d6d32b1295c10e00a25a50de88be479282060a3ab93ecb9738cb9e6888a9165f
 DIST ntl-10.5.0.tar.gz 1278729 SHA256 b90b36c9dd8954c9bc54410b1d57c00be956ae1db5a062945822bbd7a86ab4d2 SHA512 b299dfc29005079470972c2a9ca02acd0ebdbc31ff8923df02f3627dbc66daa0f527226972cef032e1e488c4272554634a96456e94653fdf8b01356160319aa0 WHIRLPOOL 270f76a0088c79b506a1e0bfa12cbe06419bb5c0421e7cdb9fcc3ec2bd6b22b4f4c2468bbe73001090db623e8a662d185e181f4390475513b32a388ecca7c3cc
-DIST ntl-5.5.2.tar.gz 707247 SHA256 ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56 SHA512 44892e00051ca743b1184c9ae30e62c8e2605edaa394358979ff990a535993a6f282d882871ca9ebb3c632971f806c41d9b8024c8fb2cc6fa0d22bc26c66db06 WHIRLPOOL 4587463c4b52be721a7feb164fab73341af97c6f451c0bb2fbf675503c8a5262a5d7615d628e97f082dde23ce49db0f0b314c625dae0526bb1abdfc88732896f
-DIST ntl-6.1.0.tar.gz 715439 SHA256 e16c30ceef1d47e94b8a37a8c4a1fb58729b8f8449c648e2a96280a3eecf9b6f SHA512 8c013bd4a250c8e29d57864585492be1f392c84356959d8100d5c45b420e411e5cd677524e2d50bbe265dda4c364185395780ba5d8490f6ac46da73c6a9728de WHIRLPOOL cf2a48cfe33cb58d8bda35d4a18d57a20ae23f2ba53f0f757d1bacc58ffa0bfdfd38363db38996e2e4069f5e3f2ad6a3ae9a859437a93404308512652190c765
 DIST ntl-9.3.0.tar.gz 888710 SHA256 8f31508a9176b3fc843f08468b1632017f2450677bfd5147ead5136e0f24b68f SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d WHIRLPOOL a1f7cf573d49a277f0b2f1d50d18e66ef83a54430c517fd5d3c75e800216b706e8b5ff10e6ed2dc02b6eb4f9290671b249c67f1937cced96ac987055aaa3ab99
 DIST ntl-9.6.4.tar.gz 915256 SHA256 c4a1f015a879b4a20f6b76a98eb6033a7936b0ff3b3f3ca6159d7e7b2afd89eb SHA512 ec8a4deb6996b31140edff978e07844ea8e30327491a6777d3982bffec01599b0cb5cc5dca297c8610ecb7ac9a4eae3407a59736fed840a2415a52a159370868 WHIRLPOOL 31ab69dc19b206868d1a9ac4f3d1cb52180980e751fe1431b738921b3816998797cf33a0ea9db8e1017e4face98efa897a4e42aa5be58365d1bc12e320a34354
 EBUILD ntl-10.5.0.ebuild 1445 BLAKE2B 522b14c8b09cdd96ad0a9a9ae7440df24d19484c25b434cdbdd70d65e95459dbb9182c2258afcccbcc454625e1700276bdb389367951cc58b196b7b633de5906 SHA512 03d0f3b39d728b86c372d95d55d36dc3bf7c2c7f4a21f856d9dfb1f5162fd42f232465b737c47b9cf3c7f3d4903f5c893a226063449e07b977d55b1202c0b3ba
-EBUILD ntl-5.5.2.ebuild 2034 BLAKE2B 2e65099c4c75e59d1b38eee8309097400bf0a20d13a160d9886433dd020a6f57b3030be11d1973ab8d1b61024c43dbe15a1a8fea10493fafdedb0247664c29fa SHA512 b530990749bb914612630fb60ac706a21f0ec5f2e814d8c0937cc77950134d4551319a8907ab988ba5037a3f97547a79c2d27e0b2449520a9fb9a165f5849c2f
-EBUILD ntl-6.1.0.ebuild 2083 BLAKE2B 93673fe2c9b00bfb404f8a6d88893695151cbd73cac8e3d6c923b76744e19681be66e0ddd598f34de3e406bad397c500d4a13dc65c8f0c8b0c35fb6dba4d6577 SHA512 6e13c0155c26e40e44860c36355f4e8698a914dd193cecdb070e95551e7dfdf017ad80d657428ca09f4376274f34ffc2257ac9fc9a4a140a8839719ec5335070
 EBUILD ntl-9.3.0.ebuild 1778 BLAKE2B a11c61d452ae6643df2c3081baa389d92be3256eea634a4e0fdc50a4d1f3cef3843dfa12e780851e90b66756fce174edcf08a92ecf5bce6c98c0738106ee5e59 SHA512 4f7d415cdf3e94655983fe1795af856ef01a0f953a7b9b8eae9d10be0b691d0b49036cebf45afcad8e4ae097681912af6728e7e455ba0d306fd0a5c323515022
 EBUILD ntl-9.6.4.ebuild 1706 BLAKE2B 104e8b1887568681ee7cc67b17b18078fdcc5d05b266e5de2213a135df730f42ba9085ddd2ae5e2d6b8c3daf3bf8841fb698a0d13a48ae7c7c666333a220a93a SHA512 1aa1887d2665aaf3294b87404febbf941118be291a5111a92bbfce88ca163683661b396db358d2cacfed7ec63a72090ff96cc59b5723edd8bc56b1441fc0c857
 MISC metadata.xml 662 BLAKE2B c9ec72da996f6467ec456420af20dbd37e66e8884108d387a715da0578f939321c075ef95237e9d5c7a9ce1d5bbc555d2f48acba6bc2ff8e3ff8efea9cd1479b SHA512 d7501231f63b33bdf70ffbd0e218e91b394b2cac9c71fb361dd011839ce45c2b03705ad10274b4a78f935adc7383502191aee5616fa9f3e13720949767599893
diff --git a/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch b/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch
deleted file mode 100644
index fafa97356cd8..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- include/NTL/tools.h.orig	2008-05-06 22:14:06.000000000 +1200
-+++ include/NTL/tools.h	2008-05-06 22:14:23.000000000 +1200
-@@ -249,6 +249,12 @@
- char IntValToChar(long a);
- 
- 
-+/*
-+  This function is not present in vanilla NTL
-+  See tools.c for documentation.
-+ */
-+void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context);
-+
- 
- void Error(const char *s);
- 
---- src/tools.c.orig	2008-05-06 22:15:32.000000000 +1200
-+++ src/tools.c	2008-05-06 22:15:45.000000000 +1200
-@@ -8,8 +8,35 @@
- NTL_START_IMPL
- 
- 
-+/*
-+   The following code differs from vanilla NTL
-+
-+   We add a SetErrorCallbackFunction(). This sets a global callback function _function_,
-+   which gets called with parameter _context_ and an error message string whenever Error()
-+   gets called.
-+
-+   Note that if the custom error handler *returns*, then NTL will dump the error message
-+   back to stderr and abort() as it habitually does.
-+
-+   -- David Harvey (2008-04-12)
-+*/
-+
-+void (*ErrorCallbackFunction)(const char*, void*) = NULL;
-+void *ErrorCallbackContext = NULL;
-+
-+
-+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
-+{
-+   ErrorCallbackFunction = function;
-+   ErrorCallbackContext = context;
-+}
-+
-+
- void Error(const char *s)
- {
-+   if (ErrorCallbackFunction != NULL)
-+      ErrorCallbackFunction(s, ErrorCallbackContext);
-+
-    cerr << s << "\n";
-    abort();
- }
diff --git a/dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch b/dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch
deleted file mode 100644
index 1420f55f3285..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch
+++ /dev/null
@@ -1,151 +0,0 @@
---- src/DoConfig.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/DoConfig	2009-08-10 19:24:43.000000000 +0100
-@@ -25,14 +25,16 @@
- 'LDFLAGS_CXX' => '$(LDFLAGS)',
- 'LDLIBS'      => '-lm',
- 'LDLIBS_CXX'  => '$(LDLIBS)',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
---- src/mfile.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/mfile	2009-08-10 20:31:36.000000000 +0100
-@@ -141,6 +146,16 @@
- WIZARD=@{WIZARD}
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
- 
- #################################################################
- #
-@@ -173,6 +188,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -320,7 +356,7 @@
- LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
- LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
- 
--
-+.SUFFIXES: .lo
- 
- # 'make all' does a complete make, including all setup.
- # It also creates the file 'all', which means you should
-@@ -328,11 +364,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	$(MAKE) setup1
-+	$(MAKE) setup2
-+	$(MAKE) setup3
-+	$(MAKE) setup4
-+	$(MAKE) ntl.a
- 	touch all
- 
- 
-@@ -378,18 +414,31 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo
-+
-+
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo: 	 ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
-+
- 
- GetTime.o: GetTime.c 
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
--
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
- 
- .c.o: 
- 	$(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE_CXX) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
-+
- .c: 
- @{LSTAT}	$(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT
- @{LSHAR}	$(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR
-@@ -403,7 +452,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	$(MAKE) QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -460,19 +509,18 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c 
- 	rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
-+	rm -f libntl*.so*
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o  *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -549,3 +597,10 @@
- 
- 
- 
-+sharedso: DIRNAME $(SHOBJ)
-+	 $(LINK_CXX) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	 ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	 $(LINK_CXX) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	 ln -s lib`cat DIRNAME`.dylib libntl.dylib
diff --git a/dev-libs/ntl/files/ntl-5.5.2-shared.patch b/dev-libs/ntl/files/ntl-5.5.2-shared.patch
deleted file mode 100644
index 1ddd74507cf5..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-shared.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- src/DoConfig.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/DoConfig	2009-08-10 19:24:43.000000000 +0100
-@@ -25,14 +25,16 @@
- 'LDFLAGS_CXX' => '$(LDFLAGS)',
- 'LDLIBS'      => '-lm',
- 'LDLIBS_CXX'  => '$(LDLIBS)',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
-@@ -87,11 +89,6 @@
- 
- foreach $arg (@ARGV) {
- 
--   if ($arg =~ '-h|help|-help|--help') {
--      system("more ../doc/config.txt");
--      exit;
--   }
--
-    if (($name, $val) = ($arg =~ /(.*?)=(.*)/)) {
-       
-       if (exists($MakeFlag{$name}) && ($val =~ 'on|off')) {
-
-
-
---- src/mfile.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/mfile	2009-08-10 20:31:36.000000000 +0100
-@@ -141,6 +146,16 @@
- WIZARD=@{WIZARD}
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
- 
- #################################################################
- #
-@@ -173,6 +188,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -320,7 +356,7 @@
- LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
- LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
- 
--
-+.SUFFIXES: .lo
- 
- # 'make all' does a complete make, including all setup.
- # It also creates the file 'all', which means you should
-@@ -328,11 +364,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	$(MAKE) setup1
-+	$(MAKE) setup2
-+	$(MAKE) setup3
-+	$(MAKE) setup4
-+	$(MAKE) ntl.a
- 	touch all
- 
- 
-@@ -378,18 +414,31 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo
-+
-+
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo: 	 ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
-+
- 
- GetTime.o: GetTime.c 
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
--
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
- 
- .c.o: 
- 	$(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE_CXX) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
-+
- .c: 
- @{LSTAT}	$(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT
- @{LSHAR}	$(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR
-@@ -403,7 +452,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	$(MAKE) QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -460,19 +509,18 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c 
- 	rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
-+	rm -f libntl*.so*
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o  *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -549,3 +597,10 @@
- 
- 
- 
-+sharedso: DIRNAME $(SHOBJ)
-+	 $(LINK_CXX) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	 ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	 $(LINK_CXX) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	 ln -s lib`cat DIRNAME`.dylib libntl.dylib
diff --git a/dev-libs/ntl/files/ntl-5.5.2-singular.patch b/dev-libs/ntl/files/ntl-5.5.2-singular.patch
deleted file mode 100644
index 9f0d13140cee..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-singular.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/NTL/new.h.orig	2008-05-06 21:56:16.000000000 +1200
-+++ include/NTL/new.h	2008-05-06 21:56:33.000000000 +1200
-@@ -12,7 +12,8 @@
- 
- #include <new>
- 
--#define NTL_NEW_OP new (std::nothrow)
-+// uncommenting std::nothrow makes this ntl work properly with Singular
-+#define NTL_NEW_OP new //(std::nothrow) 
- 
- 
- #else
diff --git a/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch b/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch
deleted file mode 100644
index e79731fc2fce..000000000000
--- a/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- src.orig/src/tools.c	2012-08-06 11:54:53.652334400 +0200
-+++ src/src/tools.c	2012-08-06 11:59:18.183993600 +0200
-@@ -18,8 +18,35 @@
- void (*ErrorCallback)() = 0;
- 
- 
-+/*
-+   The following code differs from vanilla NTL.
-+
-+   We add a SetErrorCallbackFunction(). This sets a global callback function _function_,
-+   which gets called with parameter _context_ and an error message string whenever Error()
-+   gets called.
-+
-+   Note that if the custom error handler *returns*, then NTL will dump the error message
-+   back to stderr and abort() as it habitually does.
-+
-+   -- David Harvey (2008-04-12)
-+*/
-+
-+void (*ErrorCallbackFunction)(const char*, void*) = NULL;
-+void *ErrorCallbackContext = NULL;
-+
-+
-+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
-+{
-+   ErrorCallbackFunction = function;
-+   ErrorCallbackContext = context;
-+}
-+
-+
- void Error(const char *s)
- {
-+   if (ErrorCallbackFunction != NULL)
-+      ErrorCallbackFunction(s, ErrorCallbackContext);
-+
-    cerr << s << "\n";
-    _ntl_abort();
- }
---- src.orig/include/NTL/tools.h	2012-08-06 11:54:52.830333000 +0200
-+++ src/include/NTL/tools.h	2012-08-06 11:59:18.143993600 +0200
-@@ -10,6 +10,7 @@
- 
- #include <cstdlib>
- #include <cmath>
-+#include <cstdio>
- #include <iostream>
- 
- #else
-@@ -252,6 +253,12 @@
- char IntValToChar(long a);
- 
- 
-+/*
-+  This function is not present in vanilla NTL.
-+  See tools.c for documentation.
-+ */
-+void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context);
-+
- 
- void Error(const char *s);
- 
diff --git a/dev-libs/ntl/files/ntl-6.0.0-singular.patch b/dev-libs/ntl/files/ntl-6.0.0-singular.patch
deleted file mode 100644
index c172386f3102..000000000000
--- a/dev-libs/ntl/files/ntl-6.0.0-singular.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src.orig/include/NTL/new.h	2012-08-06 17:12:25.658913083 +0200
-+++ src/include/NTL/new.h	2012-08-06 17:11:15.002915713 +0200
-@@ -12,7 +12,8 @@
- 
- #include <new>
- 
--#define NTL_NEW_OP new (std::nothrow)
-+// commenting std::nothrow makes this ntl work properly with Singular
-+#define NTL_NEW_OP new //(std::nothrow) 
- 
- 
- #else
diff --git a/dev-libs/ntl/ntl-5.5.2.ebuild b/dev-libs/ntl/ntl-5.5.2.ebuild
deleted file mode 100644
index c51e4b8d11db..000000000000
--- a/dev-libs/ntl/ntl-5.5.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.3
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	epatch "$FILESDIR/${P}-singular.patch"
-	# implement a call back framework (submitted upstream)
-	epatch "$FILESDIR/${P}-sage-tools.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${P}-shared.patch"
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-		NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2 || die "emake setup failed"
-	emake setup3 || die "emake setup failed"
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
-	fi
-}
diff --git a/dev-libs/ntl/ntl-6.1.0.ebuild b/dev-libs/ntl/ntl-6.1.0.ebuild
deleted file mode 100644
index d09a697040fa..000000000000
--- a/dev-libs/ntl/ntl-6.1.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.3
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	epatch "$FILESDIR/${PN}-6.0.0-singular.patch"
-	# implement a call back framework (submitted upstream)
-	epatch "$FILESDIR/${PN}-6.0.0-sage-tools.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${PN}-5.5.2-shared-r1.patch"
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-		NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2 || die "emake setup failed"
-	emake setup3 || die "emake setup failed"
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
-	fi
-}
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index d5973cc2c4ff..040a511749c1 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1,8 +1,5 @@
-AUX ppl-fix-gmp-5.1.0.patch 1402 BLAKE2B 94e3176ab12a1e31baba7a02104b0668dc09a8963c3c5b1fe365d73273f065e5cc161f374ab0147e447b4fbad9ee13b403e4290779a07e387f671b0685dc090f SHA512 4d0d3f42516951076747f7ca167aabb4b2c4e62114c97b81c0e70a2cc4464a86b7b78c9ace21008fb35d5911b8fcdc66968a2be26b72446639ba77e3f3c6b52f
-DIST ppl-0.12.1.tar.bz2 14938132 SHA256 4022e54772f81c8ef66d3dd4c3d8dca48f72f9af614d8a36d05fbf5917f2b198 SHA512 e8a4c92271f608e79c5828c71ff2d36c681dd4bd48b5d31353b2a27bcf827a5cb8f0dcdfee3e13cf9f202f35a7693ddf9880dc4d5b8445ec558cef1319f43925 WHIRLPOOL 6616253d5c02c84294ec63e0601fa7bc65772fc72e6cea68f1300fa2b46f551311589813268d8e869cb59295d8fdc5be17a5b3d0cbb7b62fe0bc06a8bf9e1f39
 DIST ppl-1.1.tar.xz 14734820 SHA256 c48ccd74664ec2cd3cdb5e37f287974ccb062f0384dc658d4053c424b19ad178 SHA512 ae0503fb3eac494fa3edf5d5c9ec61e2419e6e2fa57d30323f7d0360ff080b033686410c7462f5b2ff5514803451cb91e9c0fc14cf953485c5f5fd664448cc27 WHIRLPOOL d1b85fe9b44195f7fdc0573b32291a70183ce9de5e29fbb502a5d181a6e0ae11998dd5cfb52ec7ce3e1aed36433a823484488bfaf93362ac3b45a7556a2e9b6a
 DIST ppl-1.2.tar.xz 14136236 SHA256 691f0d5a4fb0e206f4e132fc9132c71d6e33cdda168470d40ac3cf62340e9a60 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350 WHIRLPOOL cf2d5895d7d740c650707840caadd45d785411875b1c55db141928a288a1475f50d4f1e6ac829062ab021a920e9581be7822679e9cf2ea11dc64ac70cfa2e5dd
-EBUILD ppl-0.12.1-r1.ebuild 2265 BLAKE2B 88995c5f5f20607f5f67a91390e84bcb841ed61b06f7e91c403c7086782a2c0009fc82bb3549356757fc6b6a91cd616bf4a6d554046fdc4a89943d3c56ba835c SHA512 bf6d21742f2e910424e8dfcefd37c97eed7b1de00b484abb08093c6988578646845cd3357a72adf190700bde0ad39bfcedb16369fe675f12506960c799a79d63
 EBUILD ppl-1.1.ebuild 1622 BLAKE2B b18db5c98d4693fea819c5de1e8bb206284e55075043891a76eb71eaa7934d52aa31904b72fd281a462ff2cd10bf3943716c200994ec93b07b40494dc9cc7c0e SHA512 f3f2197f3b3354f04af2a4daaaf05198d6418bd9defb947efa9d789001d5c157007c56ffdf59c484fe4eadccc5d79ddd20046e3d58f24a8a51e26a97d99447b3
 EBUILD ppl-1.2.ebuild 1627 BLAKE2B 236e8dce4dac0b6a0441cc88e88e7c91e7d77d1a195c016ef6874d159d71ab9b950803a3f5c6f4e38b729d589cbb9109fb8a9460a76701cf85581cc9134bfea3 SHA512 256bd444e49233b42b40c9e72f1df67462a2ceaa809002d3d720979ceb693459ef101ebdd0aa24ce84d06fd9f8990f65f8ba35175ed6b5109e1cb0b3468368f8
 MISC metadata.xml 354 BLAKE2B 77e58ca8f59039d9814e8388a7fa941fe88130fadd21720447f050f09cbccdf289153f15874c6f48cd7d8720841d181e4904e515df87c3a16fc8673283b41b4c SHA512 5f42b5399f8961160bd6ed9db93c11e2f7c7f1e750c227068fb828ac7519c927b55786d7cf60481d21813d48af51e7cae7e1c8baca12f8fbe6a1f4e701377a50
diff --git a/dev-libs/ppl/files/ppl-fix-gmp-5.1.0.patch b/dev-libs/ppl/files/ppl-fix-gmp-5.1.0.patch
deleted file mode 100644
index ff2423e93c79..000000000000
--- a/dev-libs/ppl/files/ppl-fix-gmp-5.1.0.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/p_std_bits.cc.org	2012-12-30 00:37:03.033948083 +0100
-+++ src/mp_std_bits.cc	2012-12-30 00:44:12.893019313 +0100
-@@ -25,6 +25,9 @@
- #include "ppl-config.h"
- #include "mp_std_bits.defs.hh"
- 
-+#if __GNU_MP_VERSION < 5 \
-+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- const bool std::numeric_limits<mpz_class>::is_specialized;
- const int std::numeric_limits<mpz_class>::digits;
- const int std::numeric_limits<mpz_class>::digits10;
-@@ -70,3 +73,6 @@
- const bool std::numeric_limits<mpq_class>::traps;
- const bool std::numeric_limits<mpq_class>::tininess_before;
- const std::float_round_style std::numeric_limits<mpq_class>::round_style;
-+
-+#endif // __GNU_MP_VERSION < 5
-+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
---- src/mp_std_bits.defs.hh.org	2012-12-30 00:37:03.037948187 +0100
-+++ src/mp_std_bits.defs.hh	2012-12-30 00:42:32.002424189 +0100
-@@ -38,6 +38,9 @@
- #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
- void swap(mpq_class& x, mpq_class& y);
- 
-+#if __GNU_MP_VERSION < 5 \
-+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- namespace std {
- 
- #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
-@@ -164,6 +167,9 @@
- 
- } // namespace std
- 
-+#endif // __GNU_MP_VERSION < 5
-+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- #include "mp_std_bits.inlines.hh"
- 
- #endif // !defined(PPL_mp_std_bits_defs_hh)
diff --git a/dev-libs/ppl/ppl-0.12.1-r1.ebuild b/dev-libs/ppl/ppl-0.12.1-r1.ebuild
deleted file mode 100644
index 630398ef0c22..000000000000
--- a/dev-libs/ppl/ppl-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="The Parma Polyhedra Library for numerical analysis of complex systems"
-HOMEPAGE="http://bugseng.com/products/ppl"
-SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
-IUSE="doc lpsol pch static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.1.3[cxx]
-	lpsol? ( <=sci-mathematics/glpk-4.48 )
-	!<dev-libs/cloog-ppl-0.15.10"
-DEPEND="${RDEPEND}
-	sys-devel/m4"
-
-pkg_setup() {
-	if use test; then
-		ewarn "The PPL testsuite will be run."
-		ewarn "Note that this can take several hours to complete on a fast machine."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/ppl-fix-gmp-5.1.0.patch" || die "Failed to patch"
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-debugging \
-		--disable-optimization \
-		$(use_enable doc documentation) \
-		$(use_enable lpsol ppl_lpsol) \
-		$(use_enable pch) \
-		$(use_enable static-libs static) \
-		--enable-interfaces="c cxx" \
-		$(use test && echo --enable-check=quick)
-}
-
-src_test() {
-	# default src_test runs with -j1, overriding it here saves about
-	# 30 minutes and is recommended by upstream
-	if emake -j1 check -n &> /dev/null; then
-		emake check || die "tests failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	use static-libs || rm -f "${D}"/usr/lib*/libppl*.la
-
-	local docsdir="${ED}/usr/share/doc/${PF}"
-	rm "${docsdir}"/gpl* "${docsdir}"/fdl* || die
-
-	if ! use doc; then
-		rm -r "${docsdir}"/*-html/ || die
-	fi
-
-	dodoc NEWS README* STANDARDS TODO
-}
-
-pkg_postinst() {
-	echo
-	ewarn "After an upgrade of PPL it is important that you rebuild"
-	ewarn "dev-libs/cloog-ppl."
-	ewarn
-	ewarn "If you use gcc-config to switch to an older compiler version than"
-	ewarn "the one PPL was built with, PPL must be rebuilt with that version."
-	ewarn
-	ewarn "In both cases failure to do this will get you this error when"
-	ewarn "graphite flags are used:"
-	ewarn
-	ewarn "    sorry, unimplemented: Graphite loop optimizations cannot be used"
-	ewarn
-	echo
-}