gentoo resync : 11.05.2021

4 files changed, 43 insertions, 7 deletions

diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index e79e3dd343ca..dcd088e70793 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -1,5 +1,5 @@
-DIST cxxtools-2.2.1.tar.gz 821324 BLAKE2B 95139a3862a7c2e6652b475527bf0946e0921e0e80fafa0731c3a9ca3dd57a9383ebde080eebdfb80ae572aa5638316ddcf81e032195e162e3aa58289675e643 SHA512 b6dc3f63c39fbbc35af973eea668a44d30673140c72bfa7efbdc21a71816be2983e85312b9213264d4f5162c3e420eedb41974bacb7fe8176f2a069b6f8f6f7b
+AUX cxxtools-3.0_gcc11.patch 847 BLAKE2B ae4c4caf2d33351a33e7f54addeda32a922dabab867d1ca41684a3fa73b040a2b4df515a0af7fc33a1e3a8159c03d8189b4b97f2d36dab882c6d237e6d50faf8 SHA512 cb53d59849c8034fde4bb81e9db2f71ea34ccb809671e269dce47bd4d9847369213f43f1a32bb578547fd03f60df31f96d678249c34613ee4619fe1f32af8355
 DIST cxxtools-3.0.tar.gz 1079247 BLAKE2B 536680373e194dbdb6a79bdb09960830b6aad34c2657a0024b218321154de81653f1e47db13abfcf13f0179fa6f85e0a30a4b97f0e64ca0ac5f1cc7be003270d SHA512 839be18a8bf40c1cbaa016ac50ddacfd879d1f9bea6521209c65790d67d5ee81377519aac2fb373a5de154a293e33185401848e41a697aa57ad6aa42d4854250
-EBUILD cxxtools-2.2.1.ebuild 473 BLAKE2B 32106e510b978e7ab418230272024b0a8703364d3297c91c8a8e2f2237c3aa124a8ad16134d1bfe32544f30ac3c21fcc757d365d3fa932719d7fd4e634c5b081 SHA512 80dcc712ddb860c1e15598351a42cb9bdec2ce91318a26a20b0f8ad8a658948ff0cca86dab766456d6fad2ea0c50ebebc2af7f95e2d190765b0e829a8bebb36a
-EBUILD cxxtools-3.0.ebuild 677 BLAKE2B 1a1d3b0419d833e51dacd2620cf5c57cd35859edde2309128afc54f12756dd40cd65be8a4284d157ce69b56b934af08b22e7dadef2e5b2a8e3d5bf4cd698fa20 SHA512 f38c2fe5c964b0661b88da20bb854c334625bea1fcb3cbd04eab5abe5ff7e9d143cb94e1af4a2f65f4ea069e77faa3775d23e5a5318a2e5d35e0b22480c08445
+EBUILD cxxtools-3.0-r1.ebuild 718 BLAKE2B 4d27b6535b5081de15511541e3e1642f210517e544ba87c5f998d0e1ac0364d1d909b8866b211854310e9046a1e4692b046d5d58966fc4df7a0eb0bed5e10c41 SHA512 e505492432b83d85566a9b51cc37645b970b6cdb2f36793abb141eb203e72e528cbc814828b5cb55aae6a685d9d69a5b2ce5197e9b2571fdad0a934698732694
+EBUILD cxxtools-3.0.ebuild 676 BLAKE2B f640431bf4c41b1f1d87d1ece7005638c8e6b4caf9c7e365a03550f1d4c0b540e57cc78114185e9ad60d21599eab699177f9cf3d4973004f11d8705b4d0225b9 SHA512 4d10b859219f52027fab420a5e215076513705481b84b59b06df59320ffb4f960cb35593a60b5d0fe0c901de4a3056d2ae12e22acd3381db1b2a4e0b9007842d
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r1.ebuild
index eb54949ddad6..63310078b432 100644
--- a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
+++ b/dev-libs/cxxtools/cxxtools-3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,15 +9,28 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 RDEPEND="virtual/libiconv"
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS ChangeLog )
+DOCS=( AUTHORS )
 
 src_configure() {
 	econf \
+		--disable-dependency-tracking \
 		--disable-demos \
 		--disable-unittest
+
+	eapply "${FILESDIR}/${P}_gcc11.patch"
+
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# remove static libs
+	rm -f "${ED}"/usr/$(get_libdir)/libcxxtools{,-bin,-http,-json,-unit,-xmlrpc}.la || die
 }
diff --git a/dev-libs/cxxtools/cxxtools-3.0.ebuild b/dev-libs/cxxtools/cxxtools-3.0.ebuild
index 124abb7c1635..23367377184d 100644
--- a/dev-libs/cxxtools/cxxtools-3.0.ebuild
+++ b/dev-libs/cxxtools/cxxtools-3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 
 RDEPEND="virtual/libiconv"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/cxxtools/files/cxxtools-3.0_gcc11.patch b/dev-libs/cxxtools/files/cxxtools-3.0_gcc11.patch
new file mode 100644
index 000000000000..d8fb34886420
--- /dev/null
+++ b/dev-libs/cxxtools/files/cxxtools-3.0_gcc11.patch
@@ -0,0 +1,23 @@
+compilefix gcc 11
+
+based on compile fix from upstream
+https://www.gitmemory.com/issue/maekitalo/cxxtools/30/770247974
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (09 May 2021)
+diff -Naur cxxtools-3.0.orig/include/cxxtools/char.h cxxtools-3.0/include/cxxtools/char.h
+--- cxxtools-3.0.orig/include/cxxtools/char.h	2021-05-09 18:32:41.415653108 +0200
++++ cxxtools-3.0/include/cxxtools/char.h	2021-05-09 18:33:56.117653108 +0200
+@@ -68,9 +68,10 @@
+             typedef int32_t value_type;
+ 
+             //! Constructs a character with a value of 0.
+-            Char()
+-            : _value(0)
+-            {}
++//            Char()
++//            : _value(0)
++//            {}
++            Char() = default;
+ 
+             //! Constructs a character using the given value as base for the character value.
+             Char(value_type ch)