gentoo resync : 21.05.2019

16 files changed, 5 insertions, 468 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 4338f03dd8cd..a0da41a0d2cf 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index 5be930f4e323..17911339e7a9 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -8,7 +8,5 @@ AUX 1.8.1-libgcrypt.patch 1054 BLAKE2B fc96efbbc132972035ca9622cd21427e8d662a3ee
 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 1630 BLAKE2B 36ad7389606de02eb99db905899dad6e3bbb7cd5d070fb27ec3b5c83259ed738cd669a826c17af97d250bbcc7ffb4d379f1de326306044699597e79a7625984a SHA512 3ce819800fa54cae329c6bed6c1808e35e0374018bd2e5cecee208511e24478586b71c6c5c63bb32b60400394161a8950c30a6669e6223a2133ac6562505e826
+EBUILD commoncpp2-1.8.1-r4.ebuild 1628 BLAKE2B f66de5ac8273b9a35a70925123d1d9454f37eabe81c3c00d1dd93a68e94b6ab0f749be3ae3014ffe8c8ead6db9b50e80fa73081564a0b880e82ea9517c448f71 SHA512 b8c6c63d6ab22730f21a3c0141a518489160f55700d96638e26725266058a949f0a5d72c013eeeda776aa932530dc3845ad841af7e0bea19a110039e7e4a1d54
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild
deleted file mode 100644
index dee8c708de05..000000000000
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-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 ipv6 gnutls ssl static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:0=
-			net-libs/gnutls:=
-		)
-		!gnutls? ( dev-libs/openssl:0= )
-	)"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.3.6 )"
-
-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"
-)
-
-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 () {
-	# Only install html docs
-	# man and latex available, but seems a little wasteful
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	dodoc COPYING.addendum
-
-	if use examples; then
-		docinto examples
-		dodoc demo/{*.cpp,*.h,*.xml,README}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild
deleted file mode 100644
index f75eac737a8e..000000000000
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ipv6 gnutls ssl static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:0=
-			net-libs/gnutls:=
-		)
-		!gnutls? ( dev-libs/openssl: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"
-)
-
-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/commoncpp2-1.8.1-r4.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
index 981ca2ef16af..6f8faaf756bf 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="debug doc examples gnutls ipv6 libressl ssl static-libs"
 
 RDEPEND="
diff --git a/dev-cpp/gccxml/Manifest b/dev-cpp/gccxml/Manifest
deleted file mode 100644
index 92e765ac5d8c..000000000000
--- a/dev-cpp/gccxml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gccxml-0.9.0_pre20131217.tar.xz 8134060 BLAKE2B d76d9710d9d5a1b1e8b111dbb93c7c2c53ae6162484490aad65a3349f1e29dd441864b32afec16f2c1f666c1577286306205e95eb22c778fff3294ce55f05d50 SHA512 3fedb2fb7ec8025921b4d416230acd8f5dcc01858089e12837d702bd4bec0f841ec23dfd949ae7ff42b559e5da1832bfc32ee24c1a4b3ff6004e73d49a1a81cf
-EBUILD gccxml-0.9.0_pre20131217.ebuild 770 BLAKE2B ad61969ec4a0aa060eddc251c44e42ac7899ab1dd1f332c0e898e4b9e9abbe0873c2571f6ba75199585454687d3dc691082e979c7892c4b95525f80ce98d6c3f SHA512 7c5900031a549c278d3c9f9a2f41e1c23c892951f2eedc077c62bbbf8b2faafac75d78f27f1534e96aa5077ae4526dfcc9322d02d6615c2230f7e5993a4f4683
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-cpp/gccxml/gccxml-0.9.0_pre20131217.ebuild b/dev-cpp/gccxml/gccxml-0.9.0_pre20131217.ebuild
deleted file mode 100644
index ddd2732740d1..000000000000
--- a/dev-cpp/gccxml/gccxml-0.9.0_pre20131217.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="XML output extension to GCC"
-HOMEPAGE="http://www.gccxml.org/"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-src_prepare() {
-	# fix bug 549300 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	# patch below taken from Debian
-	sed -i \
-		-e 's/xatexit.c//' \
-		GCC/libiberty/CMakeLists.txt || die "sed failed"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		 -DGCCXML_DOC_DIR:STRING="share/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/gccxml/metadata.xml b/dev-cpp/gccxml/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-cpp/gccxml/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-cpp/rudiments/Manifest b/dev-cpp/rudiments/Manifest
deleted file mode 100644
index e556428e1567..000000000000
--- a/dev-cpp/rudiments/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX rudiments-0.46-buildsystem.patch 2944 BLAKE2B 2263e3b6de878e5cfe44b249523981e2ebdd9395411cd978d7509ab3a87f718584b1663f1ed40f51eb994ab88202c62f0170d35857899c81b8e05778ffbcf89e SHA512 09fcb34274784f6446437060f42f9d4951af19d39f4d0b7ef1c77807f0d9415b1e13d4e4f846f16fddba44ed6482e14bc9ccce0c00f4f805ab5a37a6a2b91c57
-AUX rudiments-0.51-buildsystem.patch 3075 BLAKE2B e4f0515986be36fd2a64e5b679137ebad7800d3fe348bb6e98972c470c0922e6e65e2242ea5e8afdeb6ab1aa51038b2578f9abe455e3a6beb6ca2c36b5c94e04 SHA512 850bae8eb24ded82f3a95ae1602aa0b052f6798f029488cab186b34152af6e0678c99352234bda7fb71d90f879eb54c0f154d089d8411b93ed9e976529ea0fe8
-DIST rudiments-0.46.tar.gz 1732565 BLAKE2B 91093656d6a1a732ab34d52c1637846f091239b717f79c6e65fcf58535d2e03f7e81c8b6353e59d9ac8345910b81e95b880bf3bfd43a888c37d0ff39ae881071 SHA512 2248db71c23ced4344dbdd26e9efe8c45f20da2e8e106101c762b334b8797dc62c47621c0477d42ac06fc665aa91b772e959802b10103c6256d1dbc68418f2f1
-DIST rudiments-0.51.tar.gz 1923612 BLAKE2B d6c108b260b57ce2578d47c3da540b92c61a6df1cafee29227197c8a81afe894262b58d099978a99bf9e02a0fc426b9f1a103ca84da2ab22ed8624851bfb65b6 SHA512 e36a93b21f8beb86f58d2e1f4d955d865fc68c40af11462f716e849a476786f99c9264dd5097f7110ef6f44752f113db8b62092a9db2f08d0eb34e861ea85888
-EBUILD rudiments-0.46.ebuild 905 BLAKE2B d890c08e29c498879ef7169fcc7063b8bd081813113917a05e4f7a3379055fd4f8bedfede6ef493ec45165eecd03e78b0e2e23a640865e2a9e3e5ae96ba1dee2 SHA512 c83fa926b50ffc0a37a57bc1de67aeb5d7ce66e574aebbf148727b609dcbc23c34121a30198673d5e12921f1d9c4f04023aec1511a6d629b3d40da13663ce0a2
-EBUILD rudiments-0.51.ebuild 905 BLAKE2B d890c08e29c498879ef7169fcc7063b8bd081813113917a05e4f7a3379055fd4f8bedfede6ef493ec45165eecd03e78b0e2e23a640865e2a9e3e5ae96ba1dee2 SHA512 c83fa926b50ffc0a37a57bc1de67aeb5d7ce66e574aebbf148727b609dcbc23c34121a30198673d5e12921f1d9c4f04023aec1511a6d629b3d40da13663ce0a2
-MISC metadata.xml 537 BLAKE2B 2f4180f7d81f9aafce68a18d37ae96bfef2b84197e3421b5246163771647edd46a88240e955117d77984959555cd5457fe93ea294730f668f6005879fe476cb2 SHA512 b61df249b99e56d32a1af2fc396b119adf0a4e1d5fd873118bfa7434e9b9b10717a4277370772c5b29efcec5e2f7edcdd2e6446a834da7519e54772dbc8957d2
diff --git a/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch b/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch
deleted file mode 100644
index fa869c89144a..000000000000
--- a/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/config.mk.in b/config.mk.in
-index ae29f27..c0b7e3d 100644
---- a/config.mk.in
-+++ b/config.mk.in
-@@ -11,7 +11,7 @@ includedir = @includedir@
- libdir = @libdir@
- mandir = @mandir@
- datadir = @datadir@
--docdir = ${datadir}/doc/rudiments
-+docdir = @docdir@
- 
- # compiler to use
- CC = @CC@
-@@ -21,7 +21,7 @@
- AR = @AR@
- 
- # includes and defines
--BASECPPFLAGS = @WALL@ @WERROR@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@
-+BASECPPFLAGS = @WALL@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@
- 
- # debug and optimization flags (-g, -O2, etc.)
- # NOTE: -FPIC gets added if we're not using libtool
-diff --git a/configure.ac b/configure.ac
-index d82ea0e..290a80b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -28,7 +28,7 @@ AC_ARG_WITH(pthread-prefix,
- 	PTHREADPATH="")
- AC_ARG_ENABLE(ssl,
- 	[  --disable-ssl           Disable SSL support],
--	ENABLE_RUDIMENTS_SSL="no",
-+	ENABLE_RUDIMENTS_SSL="$enableval",
- 	ENABLE_RUDIMENTS_SSL="yes")
- AC_ARG_WITH(ssl-includes,
- 	[  --with-ssl-includes     SSL includes],
-@@ -40,7 +40,7 @@ AC_ARG_WITH(ssl-libs,
- 	SSLLIBS="")
- AC_ARG_ENABLE(pcre,
- 	[  --disable-pcre          Don't use PCRE for regular expressions],
--	ENABLE_RUDIMENTS_PCRE="no",
-+	ENABLE_RUDIMENTS_PCRE="$enableval",
- 	ENABLE_RUDIMENTS_PCRE="yes")
- AC_ARG_WITH(pcre-includes,
- 	[  --with-pcre-includes    PCRE includes],
-@@ -56,7 +56,7 @@ AC_ARG_ENABLE(built-in-regex,
- 	USE_BUILT_IN_REGULAREXPRESSION="0")
- AC_ARG_ENABLE(threads,
- 	[  --disable-threads       Disable thread support],
--	ENABLE_RUDIMENTS_THREADS="no"; INCLUDE_THREAD="0"; INCLUDE_THREADMUTEX="0",
-+	ENABLE_RUDIMENTS_THREADS="$enableval"; INCLUDE_THREAD="0"; INCLUDE_THREADMUTEX="0",
- 	ENABLE_RUDIMENTS_THREADS="yes")
- 
- dnl   options to disable building various classes
-@@ -3716,6 +3716,10 @@ if ( test "`echo $datadir | cut -c1`" = "/" )
- then
- 	datadir='${DESTDIR}'"$datadir"
- fi
-+if ( test "`echo $docdir | cut -c1`" = "/" )
-+then
-+	docdir='${DESTDIR}'"$docdir"
-+fi
- 
- 
- dnl Output files.
-diff --git a/src/Makefile.in b/src/Makefile.in
-index a224d83..3b990fb 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -4,7 +4,7 @@ include ../config.mk
- 
- .PHONY: all clean install uninstall
- 
--CPPFLAGS = $(WERROR) $(BASECPPFLAGS) -I../ -I../include @EXTRACPPFLAGS@
-+CPPFLAGS = $(BASECPPFLAGS) -I../ -I../include @EXTRACPPFLAGS@
- 
- SRCS = namevaluepairs.cpp winsock.cpp @SRCS@
- LOBJS = namevaluepairs.lo winsock.lo @LOBJS@
---- a/acsite.m4	2014-05-04 01:44:03.265919456 +0400
-+++ b/acsite.m4	2014-05-04 01:44:34.008920936 +0400
-@@ -266,7 +237,7 @@
- 	dnl Sometimes -Wall includes -Wunused-variables and -Wunused-parameters
- 	dnl which we don't care about.  Disable it if it does.
- 	OLDCPPFLAGS=$CPPFLAGS
--	CPPFLAGS="$WALL $WERROR $CPPFLAGS"
-+	CPPFLAGS="$WALL $CPPFLAGS"
- 	AC_MSG_CHECKING(whether -Wall includes -Wunused-*)
- 	AC_TRY_COMPILE([void f(int a) { return; }],[f(1);],AC_MSG_RESULT(no),WALL=""; AC_MSG_RESULT(yes))	
- 	CPPFLAGS=$OLDCPPFLAGS
diff --git a/dev-cpp/rudiments/files/rudiments-0.51-buildsystem.patch b/dev-cpp/rudiments/files/rudiments-0.51-buildsystem.patch
deleted file mode 100644
index 37cffc9e7680..000000000000
--- a/dev-cpp/rudiments/files/rudiments-0.51-buildsystem.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/config.mk.in b/config.mk.in
-index ae29f27..c0b7e3d 100644
---- a/config.mk.in
-+++ b/config.mk.in
-@@ -9,7 +9,7 @@ includedir = @includedir@
- libdir = @libdir@
- mandir = @mandir@
- datadir = @datadir@
--docdir = ${datadir}/doc/rudiments
-+docdir = @docdir@
-
- # command separator
- AND = ; 
-@@ -25,7 +25,7 @@
- CXX = @CXX@
- COMPILE = -c
- OUT = -o 
--BASECPPFLAGS = @WALL@ @WERROR@ @WNOLONGDOUBLE@ @WNOFORMAT@ @WNOOVERLOADEDVIRTUAL@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@
-+BASECPPFLAGS = @WALL@ @WNOLONGDOUBLE@ @WNOFORMAT@ @WNOOVERLOADEDVIRTUAL@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@
- EXPORTSCPPFLAGS =
- EXTRACPPFLAGS = @EXTRACPPFLAGS@
- CXXFLAGS = @CXXFLAGS@ @PIPE@
-diff --git a/configure.ac b/configure.ac
-index d82ea0e..290a80b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ AC_ARG_WITH(pthread-prefix,
- 	PTHREADPATH="")
- AC_ARG_ENABLE(ssl,
- 	[  --disable-ssl           Disable SSL support],
--	ENABLE_RUDIMENTS_SSL="no",
-+	ENABLE_RUDIMENTS_SSL="$enableval",
- 	ENABLE_RUDIMENTS_SSL="yes")
- AC_ARG_WITH(ssl-includes,
- 	[  --with-ssl-includes     SSL includes],
-@@ -44,7 +44,7 @@ AC_ARG_WITH(ssl-libs,
- 	SSLLIBS="")
- AC_ARG_ENABLE(pcre,
- 	[  --disable-pcre          Don't use PCRE for regular expressions],
--	ENABLE_RUDIMENTS_PCRE="no",
-+	ENABLE_RUDIMENTS_PCRE="$enableval",
- 	ENABLE_RUDIMENTS_PCRE="yes")
- AC_ARG_WITH(pcre-includes,
- 	[  --with-pcre-includes    PCRE includes],
-@@ -60,7 +60,7 @@ AC_ARG_ENABLE(built-in-regex,
- 	USE_BUILT_IN_REGULAREXPRESSION="0")
- AC_ARG_ENABLE(threads,
- 	[  --disable-threads       Disable thread support],
--	ENABLE_RUDIMENTS_THREADS="no"; INCLUDE_THREAD="0",
-+	ENABLE_RUDIMENTS_THREADS="$enableval"; INCLUDE_THREAD="0",
- 	ENABLE_RUDIMENTS_THREADS="yes")
- 
- dnl   options to disable building various classes
-@@ -4034,6 +4034,10 @@ if ( test "`echo $datadir | cut -c1`" = "/" )
- then
- 	datadir='${DESTDIR}'"$datadir"
- fi
-+if ( test "`echo $docdir | cut -c1`" = "/" )
-+then
-+	docdir='${DESTDIR}'"$docdir"
-+fi
- 
- 
- dnl Output files.
-diff --git a/src/Makefile.in b/src/Makefile.in
-index a224d83..3b990fb 100644
-@@ -2,7 +2,7 @@
- 
- include ../config.mk
- 
--CPPFLAGS = $(WERROR) $(BASECPPFLAGS) $(EXPORTSCPPFLAGS) $(INC)../ $(INC)../include $(EXTRACPPFLAGS)
-+CPPFLAGS = $(BASECPPFLAGS) $(EXPORTSCPPFLAGS) $(INC)../ $(INC)../include $(EXTRACPPFLAGS)
- LIBS = $(SOCKETLIBS) $(PTHREADLIB) $(SSLLIBS) $(PCRELIBS) $(NANOSLEEPLIB) $(CLOCKNANOSLEEPLIB) $(SHMOPENLIB) $(CRYPTLIB) $(INETATONLIB) $(NETAPI32LIB) $(BELIB) $(GNULIB) $(CRTLIB) $(DLLIB) $(DEBUGLIB)
- 
- SRCS = @SRCS@
---- a/acsite.m4	2014-05-04 01:44:03.265919456 +0400
-+++ b/acsite.m4	2014-05-04 01:44:34.008920936 +0400
-@@ -279,7 +250,7 @@
- 	dnl Sometimes -Wall includes -Wunused-variables and -Wunused-parameters
- 	dnl which we don't care about.  Disable it if it does.
- 	OLDCPPFLAGS=$CPPFLAGS
--	CPPFLAGS="$WALL $WERROR $CPPFLAGS"
-+	CPPFLAGS="$WALL $CPPFLAGS"
- 	AC_MSG_CHECKING(whether -Wall includes -Wunused-*)
- 	AC_TRY_COMPILE([void f(int a) { return; }],[f(1);],AC_MSG_RESULT(no),WALL=""; AC_MSG_RESULT(yes))	
- 	CPPFLAGS=$OLDCPPFLAGS
diff --git a/dev-cpp/rudiments/metadata.xml b/dev-cpp/rudiments/metadata.xml
deleted file mode 100644
index 3eaa551144d1..000000000000
--- a/dev-cpp/rudiments/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		Rudiments is an Open Source C++ class library providing base classes
-		for things such as daemons, clients and servers, and wrapper classes
-		for the standard C functions for things like such as regular
-		expressions, semaphores and signal handling.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">rudiments</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-cpp/rudiments/rudiments-0.46.ebuild b/dev-cpp/rudiments/rudiments-0.46.ebuild
deleted file mode 100644
index 71813b690f57..000000000000
--- a/dev-cpp/rudiments/rudiments-0.46.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils
-
-DESCRIPTION="C++ class library for daemons, clients and servers"
-HOMEPAGE="http://rudiments.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rudiments/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug pcre ssl static-libs"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-	ssl? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
-
-src_prepare() {
-	mv configure.in configure.ac || die
-
-	# bug #535936
-	rm aclocal.m4 || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="/usr/share/doc/${PF}/html" \
-		$(use debug && "--enable-debug") \
-		$(use_enable pcre) \
-		$(use_enable ssl)
-	)
-	autotools-utils_src_configure
-}
diff --git a/dev-cpp/rudiments/rudiments-0.51.ebuild b/dev-cpp/rudiments/rudiments-0.51.ebuild
deleted file mode 100644
index 71813b690f57..000000000000
--- a/dev-cpp/rudiments/rudiments-0.51.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils
-
-DESCRIPTION="C++ class library for daemons, clients and servers"
-HOMEPAGE="http://rudiments.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rudiments/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug pcre ssl static-libs"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-	ssl? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
-
-src_prepare() {
-	mv configure.in configure.ac || die
-
-	# bug #535936
-	rm aclocal.m4 || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="/usr/share/doc/${PF}/html" \
-		$(use debug && "--enable-debug") \
-		$(use_enable pcre) \
-		$(use_enable ssl)
-	)
-	autotools-utils_src_configure
-}
diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest
index 70c2525bd50a..0378e89294c2 100644
--- a/dev-cpp/tclap/Manifest
+++ b/dev-cpp/tclap/Manifest
@@ -1,5 +1,5 @@
 DIST tclap-1.2.1.tar.gz 442387 BLAKE2B 413d77f59224dd7751621f32a5712178c4954cb532095203a1eb839c97d20e8651f94f90d4961a47f654d5b478946fb988db66df0d17c8230fde0b771af77405 SHA512 8bd6ee724600880840048c7b36f02d31b1aa4910b17f80fb04aef89b1f1917856d9979ec488edbd457b66d9d689aea97540abb842a8b902bbd75c66a6e07b9b1
 DIST tclap-1.2.2.tar.gz 231714 BLAKE2B 94fc3d5253c08a305e5f75f6b4b7ab556e94980193502b64665ff828609cde20f340e3fe18cef12011da07ae2db2c2bb52a08f112d052d74c45be8290d525092 SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107
-EBUILD tclap-1.2.1.ebuild 570 BLAKE2B f8657c52bf383ba97efe4c716d59be9d085c82bc01b6175e8b4351151953017f9c89cb8a5ea9e6ac410ee88378d8b1c5ca08cd9b219a216a45349632286197a9 SHA512 f8de56c7311945e191f222517b4265649bbe172c6c3262c79a4aec8738c8d4721438aac503b5e06c0c53dc18b4be4a9a8d0b1b094787862e8c4645ac79da0b9d
+EBUILD tclap-1.2.1.ebuild 566 BLAKE2B bd3c30004fb51a75d05638dc278b5df220d7df31e2c59466b8e62b9053a591b7ff0e46a1bd5a2ec357667893c983e020eb41fffc2ab06cf992c9c8760bc7d159 SHA512 9b8c12bb936f420fb787032854fafa929f1b84b7d6794559a5abf4eb776f51583c41be3a3b780d1272bb4aff3788259f9d324529f1e78059914a9c6f80419a44
 EBUILD tclap-1.2.2.ebuild 556 BLAKE2B 0dc7079a1f4cc5d800b760479ea51b716cf626f9274cdfd441bb60d86c5969cbc583c48ad971a79d9b03d824ee0149c37ede77e4568925283c5e24a55c3d3fd9 SHA512 fcb2c63c094b819a7e452267faa50aef1b28e6f4f9d822afd59330d80cfe34bc6421afd721aaedf3993605504b6e15e188124a50d6b36b4d4ba0de23ee5ea752
 MISC metadata.xml 438 BLAKE2B e325bd7ec0e700a1880e240b8dc045da9cc393b755180b529594e1b65cd888156b059c0391673f69379851f7ffbede7cb49c8749baf8164292fb9926ba372445 SHA512 892cde44dd9d835b40d08872c00b4d5ed9090f1ee6bdfe706a3d387b49a9e3552b3f899653a88a39732601de8ae9be9b8f6057d5d4b06f77d4d5f4b277c49583
diff --git a/dev-cpp/tclap/tclap-1.2.1.ebuild b/dev-cpp/tclap/tclap-1.2.1.ebuild
index 4e4d959393f3..f499c9d0373e 100644
--- a/dev-cpp/tclap/tclap-1.2.1.ebuild
+++ b/dev-cpp/tclap/tclap-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"