gentoo resync : 03.03.2019

22 files changed, 106 insertions, 574 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 53e59074ea7d..130379f15ca7 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index a200ef2ae7a9..40c08965e1a3 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -5,8 +5,10 @@ AUX 1.8.1-fix-buffer-overflow.patch 442 BLAKE2B bfc345bc3d2df77a48e9b35b6462221f
 AUX 1.8.1-fix-c++14.patch 1220 BLAKE2B 10df79cc01b26b5df35ede979743cc2d18598fb47d2d83a30b5b0d11264495965d3af7f84ba6e28e4219cae0742b5293ec2f8c60870cf9a7585e7b999fab2e11 SHA512 222c21e7b0b4e035ec3a36edb5b9e68d345550781f21a8c075835bf6f27ee46f62469a17f4cec3c1c1bb69741661dbcc7071c51c964006201ed8c3ff48a60c80
 AUX 1.8.1-gnutls-3.4.patch 1229 BLAKE2B a4936cce4fff5a7935c2bd077add555fa8d9b229afaaec545e78c1f6a7d34f35f7168c2381183ceaf4fd56bd1318a9505305ae59e77c87d9813f485e1aa6936d SHA512 92db4deba0ae612fda5873224641d35d5637a48d553d0afee7749c5477ca19a62640656d4781d101db5b545ddd962ce7c11a6edf33d128b031cafebf3cf6db77
 AUX 1.8.1-libgcrypt.patch 1054 BLAKE2B fc96efbbc132972035ca9622cd21427e8d662a3ee3aa3972690305ca14da04d7665b17d33f4b9d16e5128575ee4d378e031b57cc579d777845fc65c3cbab4abe SHA512 76f444739b370681d1b619b78cc77867da197f149c19d036d9d8b430a7a59d697c7ab30529582c308f77bc584a003dc0701d8c06003329589ade652babe5edd2
+AUX 1.8.1-libressl.patch 427 BLAKE2B 2943df26ccd7401b845200ab263a531dbeacab4bfd6a280b0597191b391d45e218946fc5cf1e5230bd066b30270b6fd5f9d2e78e26472598ddedb4eb81827417 SHA512 9ef9a53cc4eb60e72a0049e7b3012df487ca3383c2a1908998df04dd37743125057614a235f9995c3840ade4bd96c19f13e1fa2c726b44c9a0f4fdbcb707a874
 AUX 1.8.1-parallel-build.patch 261 BLAKE2B 71e639f976d1c1893f7e3285cecda841f4c90b1c2a153edda527c47804df8821a14a3c340544a9e0860fb4047af2772f036c0e10380b4025b4538e40082046b2 SHA512 e06ca32ffd811897859ef7bf06f3b7998eaa56c7fcbb01f971ec32b6e75c4242e3a2ed5a1bdaa28c02bae08bfbb386d65ebed3e50e2de759d056f085f1f49c1f
 DIST commoncpp2-1.8.1.tar.gz 908678 BLAKE2B 93868286230b4b0507127627f0a1c24b4f340e4af50d7592774b57bfc7a8f1e31bacc0cee5d17b4237aac85be0265cf3aabd65708e988159daaac85b4145c398 SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe
 EBUILD commoncpp2-1.8.1-r2.ebuild 1570 BLAKE2B 63315cb648b80bba3516b3bb0d2338284afb7581f395d868d75e3fb554eb41e1c39839baaf63e42b9c4d58e18caf5d760f857ad2323a675b10d9ae63f517ddac SHA512 3dfdeed9b2b04151fe4ae5fab0454c8c161a047f99f8945325a4a88291463cfb85cc23adb6305efe76dc6b99b60893f78a0ecb721dd381ffe04be1e4b3376412
 EBUILD commoncpp2-1.8.1-r3.ebuild 1515 BLAKE2B c32f470f07dc666105e851d1cdf6cd4c39c04ae055c91d0894cd01936a1c5d311a4bab100725029cd0c272aeb3172e1a62e78e9e6c2bf6630383b1e1efb148a8 SHA512 ce6af72543aca69603849311c2a15ae8f4df829c5e027660468b8a8e38f8c343581475890105849e78df329dc66911effaded94f6984779f706d6e2824b3108b
+EBUILD commoncpp2-1.8.1-r4.ebuild 1632 BLAKE2B 91e87b4560ce28f5316f9b973faf8037bad2f4b34c1c5f2bb5c09fbb3829909e49d30acc53e5f7cef2fd6ec6e8a586abf47fef018494c80ce5d04de10317bd83 SHA512 7a583ef27e7cb9dd5049d001042308de601023cfece3f9fa91d5f98d449aabbfee9d9d6acacbf83632c83b4aa58b26a50b54fb77a661772c0fe05b664808a55b
 MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
new file mode 100644
index 000000000000..797bc478eb2f
--- /dev/null
+++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="C++ library offering portable support for system-related services"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+HOMEPAGE="https://www.gnu.org/software/commoncpp/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug doc examples gnutls ipv6 libressl ssl static-libs"
+
+RDEPEND="
+	sys-libs/zlib
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt:0=
+			net-libs/gnutls:=
+		)
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.3.6 )"
+
+HTML_DOCS=()
+
+PATCHES=(
+	"${FILESDIR}/1.8.1-configure_detect_netfilter.patch"
+	"${FILESDIR}/1.8.0-glibc212.patch"
+	"${FILESDIR}/1.8.1-autoconf-update.patch"
+	"${FILESDIR}/1.8.1-fix-buffer-overflow.patch"
+	"${FILESDIR}/1.8.1-parallel-build.patch"
+	"${FILESDIR}/1.8.1-libgcrypt.patch"
+	"${FILESDIR}/1.8.1-fix-c++14.patch"
+	"${FILESDIR}/1.8.1-gnutls-3.4.patch"
+	"${FILESDIR}/1.8.1-libressl.patch" # bug 674416
+)
+
+pkg_setup() {
+	use doc && HTML_DOCS+=( doc/html/. )
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use ssl && local myconf=( $(usex gnutls '--with-gnutls' '--with-openssl') )
+
+	econf \
+		$(use_enable debug) \
+		$(use_with ipv6) \
+		$(use_enable static-libs static) \
+		$(use_with doc doxygen) \
+		"${myconf[@]}"
+}
+
+src_install () {
+	default
+	prune_libtool_files
+
+	dodoc COPYING.addendum
+
+	if use examples; then
+		docinto examples
+		dodoc demo/{*.cpp,*.h,*.xml,README}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-cpp/commoncpp2/files/1.8.1-libressl.patch b/dev-cpp/commoncpp2/files/1.8.1-libressl.patch
new file mode 100644
index 000000000000..9779a53d8fa0
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.8.1-libressl.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Submitted [bug-commoncpp@gnu.org]
+
+diff --git a/src/ssl.cpp b/src/ssl.cpp
+index 5bf526d..3cd7040 100644
+--- a/src/ssl.cpp
++++ b/src/ssl.cpp
+@@ -386,7 +386,7 @@ bool SSLStream::getSession(void)
+     if(so == INVALID_SOCKET)
+         return false;
+ 
+-    ctx = SSL_CTX_new(SSLv3_client_method());
++    ctx = SSL_CTX_new(SSLv23_client_method());
+     if(!ctx) {
+         SSL_CTX_free(ctx);
+         return false;
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 758ac8fc37e5..09907ce05f60 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,10 +1,3 @@
-AUX eigen-3.2.7-adaolc-backport.patch 1192 BLAKE2B 92be1ae6f4310a8b6b7ffce4f24711543ff67918fc3950c505d385138e175db8fbef7d5c49b44c2ef02efcaa665ddc71d4d096865fd85f5a76d7beae7aa984f7 SHA512 49aa6b1e85572d6a589cf44e21367e6e107bec3721bca50ce7477eb81d39fa43b68d67e28890a933f34aa7abdbb3a6e09eb3519c03b734875c7a4ad8ed0f8b45
-AUX eigen-3.2.7-pastix-5.2-backport.patch 1893 BLAKE2B 4b192d74f12f579afd8ea1574a8219daa0a4b266981470f10285d3b9f2520b2e6d0117f343ef42ac5a73a4ef11db74d177ea8f3294d64b8bab1c620e49664402 SHA512 8d5a05dc707c08161895fc566b94b38d8e190869178f1e89a616062e81f2c1e8b4b05461b3e962671f5338b14bec474ff539da054f22af74c53187e0194aeee1
-AUX eigen-3.3.5-fix-prototype.patch 706 BLAKE2B 18111be2400aabbf475b5c6d6640165a18cb12428eeb715baad3bb8c88a2c2f04f525af27c2c8c16b94fec290d46749533e06508ea7e90c5312babf85a005c80 SHA512 0aed176f7b6622b5b0b7160a314dbca97043e0f0dc5f81ccb2416f5ca92843fc2734352404c40ae8951c56a0d036179ac53ed01b92ebd19bc45adeea243ffb9c
-DIST eigen-3.2.8.tar.bz2 1161201 BLAKE2B 35bace5138f601e73d56412e87bf591ef2f96778050b0a2a4fc8f1e75f02498fb4eb80bf79988dd4bd6b985945a122d44581ccedd925f398f7d282790da06385 SHA512 53c27ba530c985dfef52188e03273eeef33abbc67e3f150cacd3371c8b9ddbd399228730595821c4c56c061d109cf509266c1dab2b8a7c730902cbd6fb18c100
-DIST eigen-3.3.5.tar.bz2 1663467 BLAKE2B 7f4b6339f8cea815004057361734e53129b5bde45c9c310eab87f0aa20da90e46dd67359e669f8b36477339df7bd7c8bd8eb18baaf0f1a779372ec3623c50aca SHA512 740ed41862c1e422a751b205513754e9c7bd04cc8ad4e3b08e2ccd1c1d30dea43a90896bc8eecd0cb4253b4adf803a814ddd48d6166fb5a53f507cf3e6940a38
 DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
-EBUILD eigen-3.2.8-r2.ebuild 2578 BLAKE2B 106cce3438812d9d0800e4d9096d57532557ecdddd33b1f812d992a7d89bf107bd71128a18f9a9649408690f4bc61cc88037f5f623e7477a4a987cb500d70bd9 SHA512 4b7876b48f2bfbe54db5b764d1ec1e7ad371c46beabb4befac3bd980572a081f86f9c07ad985c11a8aa5d7f4b01afee172abe6e2f09d017ce9d6a7b8ce4fbe8d
-EBUILD eigen-3.3.5-r1.ebuild 2238 BLAKE2B e0777ad78a4a7bd919cca9bfc55a7d0170870e7471b625a81d816c44edc2594634d9f35775d4b74b7d8e518e1da7c74dd9460f851a511fa0a0f2832a9ce2afb6 SHA512 63274b3971cd5186c009023f06f1aeba9e711796cd57c5ffee12fbd76196c06348016f4ea801d7af791cc580cd55a05cbb8ecfeb7be5ab718851a1bbd2e8fe1e
 EBUILD eigen-3.3.7.ebuild 2179 BLAKE2B 7082f7a390550679b113bd031bf1f8cfa0138d93a72ac30c89c8bb9640d08a051e38d33c9f746a042abfe4f9ce1e4fc5b553f6ddef8967140e506da32357cdb8 SHA512 74d84587e1156d83dd9c012e0b26dda3502d46af13514f58566ee86d05cd6fc83effc8b2e50909e4f1d7efff92339f82db1d661f4ea7a3ba4e4e007848d1bd11
 MISC metadata.xml 945 BLAKE2B 1e9f416b0c69bc66b08934efc902a21f557bcf5b910439dee978b46a11b0b6767681d6bb298402b050b3e994b56ad9163b91c2d526f8fd04eeb5b9ac3c74f451 SHA512 c5401b0251bf5668117951522b019e6fcce6b5ed41ec933a6edec7869ed5505040d8f75fea7c4c17eeb691f331412bc3d2a7103b7f706cd582496feb6e7a3e57
diff --git a/dev-cpp/eigen/eigen-3.2.8-r2.ebuild b/dev-cpp/eigen/eigen-3.2.8-r2.ebuild
deleted file mode 100644
index 91ae1429ee00..000000000000
--- a/dev-cpp/eigen/eigen-3.2.8-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED="test"
-
-inherit cmake-utils fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="http://eigen.tuxfamily.org/"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="LGPL-2 GPL-3"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="altivec debug doc openmp test"
-IUSE+=" cpu_flags_x86_sse2"
-IUSE+=" cpu_flags_x86_sse3"
-IUSE+=" cpu_flags_x86_sse4_1"
-IUSE+=" cpu_flags_x86_sse4_2"
-IUSE+=" cpu_flags_x86_ssse3"
-#IUSE+=" cpu_flags_x86_x87"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!dev-cpp/eigen:0"
-DEPEND="
-	doc? ( app-doc/doxygen[dot,latex] )
-	test? (
-		dev-libs/gmp:0
-		dev-libs/mpfr:0
-		media-libs/freeglut
-		media-libs/glew
-		sci-libs/adolc
-		sci-libs/cholmod
-		sci-libs/fftw:3.0
-		sci-libs/pastix
-		sci-libs/umfpack
-		sci-libs/scotch
-		sci-libs/spqr
-		sci-libs/superlu
-		virtual/opengl
-		virtual/pkgconfig
-	)
-	"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.7-pastix-5.2-backport.patch
-	"${FILESDIR}"/${PN}-3.2.7-adaolc-backport.patch
-)
-
-src_unpack() {
-	default
-	mv ${PN}* ${P} || die
-}
-
-src_prepare() {
-	sed \
-		-e 's:-g2::g' \
-		-i cmake/EigenConfigureTesting.cmake || die
-
-	sed -i CMakeLists.txt \
-		-e "/add_subdirectory(demos/d" \
-		|| die "sed disable unused bundles failed"
-
-	if ! use test; then
-		sed -i CMakeLists.txt \
-			-e "/add_subdirectory(blas/d" \
-			-e "/add_subdirectory(lapack/d" \
-			|| die "sed disable unused bundles failed"
-	fi
-
-	sed -i -e "/Unknown build type/d" CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DEIGEN_BUILD_TESTS=ON
-		-DEIGEN_TEST_NOQT=ON
-		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
-		-DEIGEN_TEST_OPENMP="$(usex openmp)"
-		-DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)"
-		-DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)"
-		-DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)"
-		-DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)"
-		-DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)"
-#		-DEIGEN_TEST_X87="$(usex cpu_flags_x86_x87)"
-	)
-	cmake-utils_src_configure
-	cmake-utils_src_compile blas
-	cmake-utils_src_compile buildtests
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r "${BUILD_DIR}"/doc/html
-
-	# Debian installs it and some projects started using it.
-	insinto /usr/share/cmake/Modules/
-	doins "${S}/cmake/FindEigen3.cmake"
-}
diff --git a/dev-cpp/eigen/eigen-3.3.5-r1.ebuild b/dev-cpp/eigen/eigen-3.3.5-r1.ebuild
deleted file mode 100644
index 2e8c6f919e8d..000000000000
--- a/dev-cpp/eigen/eigen-3.3.5-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED="test"
-inherit cmake-utils cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="http://eigen.tuxfamily.org/"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="altivec c++11 cuda debug doc neon openmp test" #zvector vsx
-RESTRICT="!test? ( test )"
-
-RDEPEND="!dev-cpp/eigen:0"
-DEPEND="
-	doc? ( app-doc/doxygen[dot,latex] )
-	test? (
-		dev-libs/gmp:0
-		dev-libs/mpfr:0
-		media-libs/freeglut
-		media-libs/glew
-		sci-libs/adolc[sparse]
-		sci-libs/cholmod
-		sci-libs/fftw:3.0
-		sci-libs/pastix
-		sci-libs/umfpack
-		sci-libs/scotch
-		sci-libs/spqr
-		sci-libs/superlu
-		virtual/opengl
-		virtual/pkgconfig
-		cuda? ( dev-util/nvidia-cuda-toolkit )
-	)
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-PATCHES=( "${FILESDIR}/${P}-fix-prototype.patch" )
-
-src_unpack() {
-	default
-	mv ${PN}* ${P} || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e 's:-g2::g' \
-		-i cmake/EigenConfigureTesting.cmake || die
-
-	sed -e "/add_subdirectory(demos/d" \
-		-i CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/add_subdirectory(test/d" \
-			-i CMakeLists.txt || die
-
-		sed -e "/add_subdirectory(blas/d" \
-			-e "/add_subdirectory(lapack/d" \
-			-i CMakeLists.txt || die
-	fi
-	sed -e "/Unknown build type/d" \
-		-i CMakeLists.txt || die
-
-	use cuda && cuda_src_prepare
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DEIGEN_TEST_NOQT=ON
-		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
-		-DEIGEN_TEST_CXX11="$(usex c++11)"
-		-DEIGEN_TEST_CUDA="$(usex cuda)"
-		-DEIGEN_TEST_OPENMP="$(usex openmp)"
-		-DEIGEN_TEST_NEON64="$(usex neon)"
-	)
-	cmake-utils_src_configure
-	cmake-utils_src_compile blas
-	cmake-utils_src_compile buildtests
-	cmake-utils_src_test
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake-utils_src_install
-
-	# Debian installs it and some projects started using it.
-	insinto /usr/share/cmake/Modules/
-	doins "${S}/cmake/FindEigen3.cmake"
-}
diff --git a/dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch b/dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch
deleted file mode 100644
index 82547e11951a..000000000000
--- a/dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# HG changeset patch
-# User Gael Guennebaud <g.gael@free.fr>
-# Date 1448895622 -3600
-# Node ID e515e2706d00294a5749db7832d10ea366b9389f
-# Parent  eb4bf011a2ea5fc4ddb0aa5332d6e616198ed886
-Update ADOL-C support.
-
-diff --git a/unsupported/Eigen/AdolcForward b/unsupported/Eigen/AdolcForward
---- a/unsupported/Eigen/AdolcForward
-+++ b/unsupported/Eigen/AdolcForward
-@@ -25,7 +25,7 @@
- #ifndef NUMBER_DIRECTIONS
- # define NUMBER_DIRECTIONS 2
- #endif
--#include <adolc/adouble.h>
-+#include <adolc/adtl.h>
- 
- // adolc defines some very stupid macros:
- #if defined(malloc)
-diff --git a/unsupported/test/forward_adolc.cpp b/unsupported/test/forward_adolc.cpp
---- a/unsupported/test/forward_adolc.cpp
-+++ b/unsupported/test/forward_adolc.cpp
-@@ -13,8 +13,6 @@
- #define NUMBER_DIRECTIONS 16
- #include <unsupported/Eigen/AdolcForward>
- 
--int adtl::ADOLC_numDir;
--
- template<typename Vector>
- EIGEN_DONT_INLINE typename Vector::Scalar foo(const Vector& p)
- {
-@@ -123,7 +121,7 @@
- 
- void test_forward_adolc()
- {
--  adtl::ADOLC_numDir = NUMBER_DIRECTIONS;
-+  adtl::setNumDir(NUMBER_DIRECTIONS);
- 
-   for(int i = 0; i < g_repeat; i++) {
-     CALL_SUBTEST(( adolc_forward_jacobian(TestFunc1<double,2,2>()) ));
diff --git a/dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch b/dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch
deleted file mode 100644
index fafaf3a68629..000000000000
--- a/dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User Gael Guennebaud <g.gael@free.fr>
-# Date 1393589499 -3600
-# Node ID b88efb384b160880131ad17e39bb690719112bfa
-# Parent  576120ad694efe29b70999576964d3816288fb4e
-Fix PaStiX support for Pastix 5.2
-
-diff --git a/Eigen/src/PaStiXSupport/PaStiXSupport.h b/Eigen/src/PaStiXSupport/PaStiXSupport.h
---- a/Eigen/src/PaStiXSupport/PaStiXSupport.h
-+++ b/Eigen/src/PaStiXSupport/PaStiXSupport.h
-@@ -12,6 +12,14 @@
- 
- namespace Eigen { 
- 
-+#if defined(DCOMPLEX)
-+  #define PASTIX_COMPLEX  COMPLEX
-+  #define PASTIX_DCOMPLEX DCOMPLEX
-+#else
-+  #define PASTIX_COMPLEX  std::complex<float>
-+  #define PASTIX_DCOMPLEX std::complex<double>
-+#endif
-+
- /** \ingroup PaStiXSupport_Module
-   * \brief Interface to the PaStix solver
-   * 
-@@ -74,14 +82,14 @@
-   {
-     if (n == 0) { ptr = NULL; idx = NULL; vals = NULL; }
-     if (nbrhs == 0) {x = NULL; nbrhs=1;}
--    c_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<COMPLEX*>(vals), perm, invp, reinterpret_cast<COMPLEX*>(x), nbrhs, iparm, dparm); 
-+    c_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<PASTIX_COMPLEX*>(vals), perm, invp, reinterpret_cast<PASTIX_COMPLEX*>(x), nbrhs, iparm, dparm); 
-   }
-   
-   void eigen_pastix(pastix_data_t **pastix_data, int pastix_comm, int n, int *ptr, int *idx, std::complex<double> *vals, int *perm, int * invp, std::complex<double> *x, int nbrhs, int *iparm, double *dparm)
-   {
-     if (n == 0) { ptr = NULL; idx = NULL; vals = NULL; }
-     if (nbrhs == 0) {x = NULL; nbrhs=1;}
--    z_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<DCOMPLEX*>(vals), perm, invp, reinterpret_cast<DCOMPLEX*>(x), nbrhs, iparm, dparm); 
-+    z_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<PASTIX_DCOMPLEX*>(vals), perm, invp, reinterpret_cast<PASTIX_DCOMPLEX*>(x), nbrhs, iparm, dparm); 
-   }
- 
-   // Convert the matrix  to Fortran-style Numbering
diff --git a/dev-cpp/eigen/files/eigen-3.3.5-fix-prototype.patch b/dev-cpp/eigen/files/eigen-3.3.5-fix-prototype.patch
deleted file mode 100644
index e4d128f502e3..000000000000
--- a/dev-cpp/eigen/files/eigen-3.3.5-fix-prototype.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Gael Guennebaud <g.gael@free.fr>
-# Date 1528444561 -7200
-# Node ID 27cac8430247a65739fcd0b83ef984d0a9c010c7
-# Parent  d4cbff8d06baf95045869ed7d0c012d641c88fcf
-fix prototype
-
-diff --git a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h
---- a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h
-+++ b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h
-@@ -173,7 +173,7 @@
-   /** 
-    * Set the restart value (default is 30)  
-    */
--  Index set_restart(const Index restart) { m_restart=restart; }
-+  void set_restart(const Index restart) { m_restart=restart; }
-   
-   /** 
-    * Set the number of eigenvalues to deflate at each restart 
\ No newline at end of file
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index ffd5c603446f..1d5608f34f63 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -3,5 +3,5 @@ DIST gtkmm-3.22.2.tar.xz 12341028 BLAKE2B cac55d0358be4be50ff2d603b245a34af4bab0
 DIST gtkmm-3.24.0.tar.xz 12515792 BLAKE2B d1150019b28ecffbf1e2f561e8b691d584dfc893dbc1ef46f1dd33e2c9050ea77e00a1cb7ce1f3832568fd9865c977dbc71a461923c285331372371a5f235369 SHA512 94658fbf7eebbac2a864d6c7d3cd0e6ffd4ac213fd1d9986d721d4906c7a43a45d8757df475879ee37ef54ec5e3fac7d9a8e4a194b97b2be72a10743bf2e13ac
 EBUILD gtkmm-2.24.5.ebuild 1539 BLAKE2B bcde9c3cabad5325df0293ea9bd8dafaa68245222b0cd8e378b41bbfb7d026265a1f3dbdab7120cf6d43d7108917be08556b4958aa9623cefbd99da321c7c435 SHA512 0333f5d68fd5d7f5d14c8e7c765b5b9723d2842068751be364d8b7e52ebc8ddb22afb77f846236ac92a48918674ad0da713f277f20e8dbec398d91038f97bda2
 EBUILD gtkmm-3.22.2.ebuild 1830 BLAKE2B a94019630550703e0fed33bdf6728bc483077a0e52e804f369c576306ef4f395bd37d5bf53d52bb53492f3ccc18d0bdf3e7bba68fe86cb5649091e0681a823f1 SHA512 b43a93016963292bb8c5725eb9ea0b0d0faefc6aff6293722c5db5058c76220b0d339b9e227001c6f557f9229ab13064fd025fc95d8f31fd8d4f8590052ed8bd
-EBUILD gtkmm-3.24.0.ebuild 1829 BLAKE2B d2bc1ed45d21031f96ed801822e97ba22ab852cad2bb6c873cfadace3324b99da7e12f52c4f90cba067526c586af28d550302165b133f55c06e2d40bd26a6bcc SHA512 dc5ac042b48d6ebd5b7abbcc89ecdbe6819f480dd7d4f3153b1f6ed43e6961755cb09517aabecb37fd307ab17ca93a9d3a265a9f659c919cce222b2029f47347
+EBUILD gtkmm-3.24.0.ebuild 1828 BLAKE2B 4f166e4be2021650dd1f92608480a89d87a4155fe68cd9e198bfc86b1f1684a7ae2e75208ecef093bd9d8144fd756783b43656b10fcbe0994d385465ead59bf2 SHA512 c7eb48244030f811522ec569f5c040eb6bf554d1a2315d9f5b3f09720308416fce25f9bcaec8d6bd6a5178612d72bc2a2821b41662103f819e10118b43b261e6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild
index 924b6c4ae413..c1a79e804c21 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index c4452c4f49a1..7d8014236677 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,5 +1,5 @@
 DIST pangomm-2.40.1.tar.xz 810384 BLAKE2B 18b875afe43fb561cc96d24e796dbaa4f4255346ced6ea510403f48047fbd30ec7d2bb89cfd316b0b1cf709cb39982814e90899084d098ad9bb8f5d6270e399c SHA512 bed19800b76e69cc51abeb5997bdc2f687f261ebcbe36aeee51f1fbf5010a46f4b9469033c34a912502001d9985135fd5c7f7574d3de8ba33cc5832520c6aa6f
 DIST pangomm-2.42.0.tar.xz 853064 BLAKE2B e0aac439565c4fc80c71cfdd430133373cca4c88c88484ab5b77a2a395154e3d381bc0158a9d312280f409ba325b547504016d8bc50830794dee13c199ee1e62 SHA512 2cebf76150414cde96b911eae947a6e1a073352927f01a44ddc276711151dffe0b9d8c54c3df16289d9002f982fa3e3386ddfe002be902f3086b44fff95fdb59
 EBUILD pangomm-2.40.1.ebuild 959 BLAKE2B 5f7d3b540e523369308f236d08130e67be86bc07ada76f084afc85cbb20b493f0ab17516f2e39c09440e8e9a028cdd58e6c8c88128115681c351eef82842724d SHA512 fd8123776c3ee34cc4537c1b5f044e0dbd48abb5a252b972c1e79d2b088b3b43265b6f9066cfcbc6bffdda8fca3f556d539624436dabb8be541d454e4a11b05f
-EBUILD pangomm-2.42.0.ebuild 958 BLAKE2B 745bd00943cc72d69e58f54ff8700db2163488d028a4bc1063822caf4124b349d8dbf2afef2e487758d81a7619e32145160d422013ca7a5cda6eb95bf882c2d0 SHA512 5e2f889ce8e068b0ebbb7713cda53bcb3bc39121840dc67d626b32394039c4ee5344b3face0e8d2cc601f5e539b2c922deed5531ebf1d47e03bbf49ebc4200dd
+EBUILD pangomm-2.42.0.ebuild 956 BLAKE2B b25eb2f0b8314ad3d520bcfb4d87582f03d3f3ac96891ea3a387dea5aa73b87febc6b1f4a77993564daa8952997a8ec107f8560384cf1247398fecf7e6de8a92 SHA512 27ec42924791bed5ae312be96641b4d7373ed01da7dba46ec1bd0eef0c6a67b9c0411b75ffba888279dec44a46f50481abbdfa02ae5f388d65cec8cbcff7e091
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.42.0.ebuild b/dev-cpp/pangomm/pangomm-2.42.0.ebuild
index cfb113bdb5bc..78708544c32f 100644
--- a/dev-cpp/pangomm/pangomm-2.42.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index 9bf86e36c6c4..6a7d5eb93303 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -1,18 +1,8 @@
-DIST waylandpp-0.1.0.tar.gz 166427 BLAKE2B eef7f14df491e053f2c8cb63aaafc9e9251af6a5f769208240484974767ab971ec1ed03bfdc58275d756d42e4605e19af84ed8aa311ddfeaa92c8b3c25a4595f SHA512 e0521ea99eeb7ae196ed9c8759e10d28406c5b99534b52ac51845cdd9c384ff820e4cc1fec65c537a0d071046746884793da122c72f6e75e7df4bca089d19eca
-DIST waylandpp-0.1.2.tar.gz 166624 BLAKE2B 8136fb8c7ece2a2ce9d93bd833dbc9c604c47dfd27b17cda60b0c5894d4aada7761e220d9cabf8e5107115e00d2d16fd99a098dac9be6614926b428ea234d788 SHA512 2304390be26134561fb69e208a6bafd0e9789e6b212ff2f46384c6ed50ae1c9eca3f06a3b4958c8e710cc1a0be61ed84c7ff292ec7011dbb0396cd2d83363f7f
-DIST waylandpp-0.1.4.tar.gz 168409 BLAKE2B 43811051f1c4cf8795c63d24c54f6f3fac59bf4a482b9dd0f3e2645272475abc732a44330e08449e34f67aa90224382d18ffb0e6f52d9f250685813186ad6e97 SHA512 3f2e9bca0776c02ec3b7a4f76a34214333e0663e2ab81d81cfbc37e1f14bda47e16b3840386b961d47ca993207b0b9f4d4859b621f22fe4e3653c4b14842e001
-DIST waylandpp-0.1.5.tar.gz 168432 BLAKE2B 0d3efcb489a713be1ae9db0366b47436b0789468b956ac781f981b3bf1feaebdf2be083f6d1263190e202a45e4416d2d972ffc67d8b87115146f14a5c4af41a5 SHA512 bce1f29607fe61f4b8464abc6111121e3c18777d2e982f143b33087d53af58e9d3a61e412c46dbe73d8cbbaa889da806978e9b3854ce01db8feb53d777625a6f
-DIST waylandpp-0.1.6.tar.gz 180123 BLAKE2B 552dbea6b6d9c3f937aa56a69c90485f6946366589793e53817bada7b2dc1eca0c58a741b22f5f0f7fac04bb14d668f01a1c2418343ebf32845dc1bf02656957 SHA512 93ed7157017394f7df0d7cdf2f56e1d8621893cc8cb77b01206534b8ca40528aba6bd2b922b359809bdca7831fa45668f85903e9e3dd6f0759839c7318349c94
-DIST waylandpp-0.2.2.tar.gz 180313 BLAKE2B 558f26e9ce2edcafacfbd874bcf99176a3bc10b2991eaba0dee64c06f0e7a25f3800b2facdd7e86c775003bd2f06ddb6911a3f956f9d8089512e95fd5d03c120 SHA512 e9288482e1b59eacf71a4164dfec3236f2d6d63aee6d530d1f71bbdb20db6986137a50ac34438219463a4208897424d28d2346d2c51dccaf3e77953e4db085f2
 DIST waylandpp-0.2.3.tar.gz 180539 BLAKE2B 8941200b46235c8b65926065a3a758871581fe21ffbcc17dc33a00c546c920247739d3137b528fe8971b7c1c2240b5a056387dcbaa1437047709e079cb2e58c2 SHA512 424ccef67e1faedfb03aa7465917e4dfc0eae578a1eb42bcdbe71df02955fef00fc1b480acb4828e168f051a82a13f923e0c9be93d3ede221e791a7af88647a5
 DIST waylandpp-0.2.4.tar.gz 240718 BLAKE2B 4493f3e19dd546412f110227c44440a422d0e1156eb24ed8bc3e58e5ebda22c0aee16e5f2a2efc1328a697c5436f81c11c67d7c46855f32f7531783a1d514ae1 SHA512 74855ea86926692a9f6ccb5645a7ed30000bab0f01a2f37a30f2c0a341d67d511ae217b8f69adc52fa2c25ac65afa182a6dbf2318360435a02b6ff428b4c9d51
-EBUILD waylandpp-0.1.0.ebuild 1246 BLAKE2B cb14f13bef95773ce5ea8edc6a94dd8917a658953a4b88ead8d3d3de61bffdeaf075aa14bdd2164549735db40f1bfde315af883110d722d3cf05407a150d90ba SHA512 cdeb50fcad7a3630338a1b830c81313ae2af699ff3b3dc7f16c2b4cd20fe25a55821afbbb56d741ba10d0352429683160fe22bb5f54f6e3c28a5d0716465cc6c
-EBUILD waylandpp-0.1.2.ebuild 1276 BLAKE2B f9acf8a81b75abcd6563c50967fc2e6935908b152d8696d94be7bb11867057c45893be2bf53a6e70c82aa99d9ada3a9c5207e2a7cd2bc1b143ff49f70187f20e SHA512 d41b8ce0f9f0fcc4c5ba5a0eccea6498a0750cf441d2bfe995d38a6ecc1c8d8e94d01147b28e9c1fcb0da6c45c593c27637eece7462cdd045e8f5441678d3182
-EBUILD waylandpp-0.1.4.ebuild 824 BLAKE2B 0de5bffc21852ee018103a2403fc83fbd93691e5fcd014c2f78408b8ce905cc5174cf52f4dd17705f30610a6527ee85d04baa6f820722e30cbde7d985e254929 SHA512 af76bd5c8fee9b019cde74af63bc56a0c740ddfd2455a7e86672b94773dc3c946e1d7d912134d3d8371e12bb5202de3521f385a30797c7553f6454bf59ff9750
-EBUILD waylandpp-0.1.5.ebuild 824 BLAKE2B 0de5bffc21852ee018103a2403fc83fbd93691e5fcd014c2f78408b8ce905cc5174cf52f4dd17705f30610a6527ee85d04baa6f820722e30cbde7d985e254929 SHA512 af76bd5c8fee9b019cde74af63bc56a0c740ddfd2455a7e86672b94773dc3c946e1d7d912134d3d8371e12bb5202de3521f385a30797c7553f6454bf59ff9750
-EBUILD waylandpp-0.1.6.ebuild 824 BLAKE2B 0de5bffc21852ee018103a2403fc83fbd93691e5fcd014c2f78408b8ce905cc5174cf52f4dd17705f30610a6527ee85d04baa6f820722e30cbde7d985e254929 SHA512 af76bd5c8fee9b019cde74af63bc56a0c740ddfd2455a7e86672b94773dc3c946e1d7d912134d3d8371e12bb5202de3521f385a30797c7553f6454bf59ff9750
-EBUILD waylandpp-0.2.2.ebuild 838 BLAKE2B ff161112d3fdb95abaa1d7b1df081faf705dfd4f4e704af21ee4f724b551aa97ac5cf913800f6f1fde6d0615771cda497d668c4e4cd15b43278b79adb576a304 SHA512 8265df8c99fa23b48680a98cdf78c7702cfe48aaf93dd77feb67275a5063aa2ebea93a044f3202c151d5d8d1aad89300d0bb7bbe8016b062058e19c161a6731b
+DIST waylandpp-0.2.5.tar.gz 177735 BLAKE2B 9add6147b7694d275f2f15f03476aef5bddebdca029f012743a0c0c388c7ef7394536b4401c78830487bb1c36a0b29ea348bc2acf60617af7bcbf917a5b691dd SHA512 a8c80282022b2ede3c3d0f5516e236aedaf3ef685565da8c61214fe37eda139bf152093eb29960be1889798eef5631b9d68a5e832c10cf1160c4a90f45eccb6e
 EBUILD waylandpp-0.2.3.ebuild 833 BLAKE2B 7556dc863efb653831be0c99d190726c9e8729ae28e5afa45163d775c96b0961bdcf2ea485aca2bd5c761003a1714ecd4dfe244124ba03e26490e051b0fee824 SHA512 5e996f8c29632d6a3e7aedb23fe97a93ffa23c43d19ec7f2d7e24bcc68c6114cc8d7bf33f370b437e35b32c6640a7f03e957b9d3647c2bc4bd4ac03c9faf1782
 EBUILD waylandpp-0.2.4.ebuild 827 BLAKE2B f634ef2225206060dcdc2ad3b93d4e5055c3020819b32d4715490e13f90075783f716f155b7b1b96872c57311a60973ed895effaba8259208be2923b2aaf6afe SHA512 badf44bfaa0b56ce7f7b0ed5b49b4ff02f92bf7d14511a296187feb4eb144bd23a66aec7926dee962f01e05ed2410b18d45e080a7e52c900a981957884020cd3
-EBUILD waylandpp-9999.ebuild 827 BLAKE2B f634ef2225206060dcdc2ad3b93d4e5055c3020819b32d4715490e13f90075783f716f155b7b1b96872c57311a60973ed895effaba8259208be2923b2aaf6afe SHA512 badf44bfaa0b56ce7f7b0ed5b49b4ff02f92bf7d14511a296187feb4eb144bd23a66aec7926dee962f01e05ed2410b18d45e080a7e52c900a981957884020cd3
+EBUILD waylandpp-0.2.5.ebuild 830 BLAKE2B 795ce6c27c6edbe2ecd76f5d8ce68e77c20006d93674329454a76e6536becfd22f1a16b0fc6dfbc491e692b17b568f8a73b67f7b736f9e000ea7cf5abb81ea1b SHA512 f3e74a252e08f9c729455666a13a1c90fa662aa30d4ab9fc572438de3d674481faf130078f5d3d0611a44394aaec902f88f198cf44b1c0927e99006e88c475d9
+EBUILD waylandpp-9999.ebuild 830 BLAKE2B 795ce6c27c6edbe2ecd76f5d8ce68e77c20006d93674329454a76e6536becfd22f1a16b0fc6dfbc491e692b17b568f8a73b67f7b736f9e000ea7cf5abb81ea1b SHA512 f3e74a252e08f9c729455666a13a1c90fa662aa30d4ab9fc572438de3d674481faf130078f5d3d0611a44394aaec902f88f198cf44b1c0927e99006e88c475d9
 MISC metadata.xml 401 BLAKE2B 3270a9fb51a7a5a0cede7e9bc863f1445db1eda5a3b132b8ed9d2eaaaddeb60b85720484a136e09d3e00b80240a637a9f8a9533311e2b6f17fb9798e2ed19ef6 SHA512 3501904a23158eeae58c78bcc7cc3549bd877cf13f6490a8d63a0586ed080c28e27a6d302a9170020b571460dd0ca64acde471d765c8880bb2427d6c8ed76ada
diff --git a/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild b/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild
deleted file mode 100644
index 112c1a2776d8..000000000000
--- a/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit scons-utils toolchain-funcs versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_prepare() {
-	default
-	sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e "s:os.path.join(prefix, \"lib\":os.path.join(prefix, \"$(get_libdir)\":g" SConstruct || die
-}
-
-src_compile() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons
-	if use doc; then
-		doxygen || die "error making docs"
-	fi
-}
-
-src_install() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install
-	# fix multilib-strict QA failures
-	if use doc; then
-		doman doc/man/man3/*.3
-		local HTML_DOCS=( doc/html )
-		einstalldocs
-	fi
-}
diff --git a/dev-cpp/waylandpp/waylandpp-0.1.2.ebuild b/dev-cpp/waylandpp/waylandpp-0.1.2.ebuild
deleted file mode 100644
index 4b36e9aea8e8..000000000000
--- a/dev-cpp/waylandpp/waylandpp-0.1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit scons-utils toolchain-funcs versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_prepare() {
-	default
-	sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e "s:os.path.join(root, prefix, \"lib\":os.path.join(root, prefix, \"$(get_libdir)\":g" SConstruct || die
-}
-
-src_compile() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" escons
-	if use doc; then
-		doxygen || die "error making docs"
-	fi
-}
-
-src_install() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" escons install
-	# fix multilib-strict QA failures
-	if use doc; then
-		doman doc/man/man3/*.3
-		local HTML_DOCS=( doc/html )
-		einstalldocs
-	fi
-}
diff --git a/dev-cpp/waylandpp/waylandpp-0.1.4.ebuild b/dev-cpp/waylandpp/waylandpp-0.1.4.ebuild
deleted file mode 100644
index e8100f35eb98..000000000000
--- a/dev-cpp/waylandpp/waylandpp-0.1.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/waylandpp/waylandpp-0.1.6.ebuild b/dev-cpp/waylandpp/waylandpp-0.1.6.ebuild
deleted file mode 100644
index e8100f35eb98..000000000000
--- a/dev-cpp/waylandpp/waylandpp-0.1.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.2.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.2.ebuild
deleted file mode 100644
index 14c6fc58c138..000000000000
--- a/dev-cpp/waylandpp/waylandpp-0.2.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_version_component_range 1-2)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/waylandpp/waylandpp-0.1.5.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild
index e8100f35eb98..ea9a34e1e54b 100644
--- a/dev-cpp/waylandpp/waylandpp-0.1.5.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils versionator
+inherit cmake-utils
 
 DESCRIPTION="Wayland C++ bindings"
 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
 
 LICENSE="MIT"
 IUSE="doc"
-SLOT="0/$(get_major_version)"
+SLOT="0/$(ver_cut 1-2)"
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
@@ -23,6 +23,7 @@ fi
 RDEPEND="
 	>=dev-libs/wayland-1.11.0
 	media-libs/mesa[wayland]
+	>=dev-libs/pugixml-1.9-r1
 "
 DEPEND="${RDEPEND}
 	doc? (
diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild
index c176d851c87e..ea9a34e1e54b 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -23,7 +23,7 @@ fi
 RDEPEND="
 	>=dev-libs/wayland-1.11.0
 	media-libs/mesa[wayland]
-	>=dev-libs/pugixml-1.4
+	>=dev-libs/pugixml-1.9-r1
 "
 DEPEND="${RDEPEND}
 	doc? (