gentoo resync : 22.05.2021

6 files changed, 59 insertions, 87 deletions

diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index ac8d98190793..ad368a18e99c 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,10 +1,9 @@
+AUX kea-1.8.2-fix-cxx11-detection.patch 1388 BLAKE2B 96adf841b29936442b81aed5cd5d4bf9433db039026ca8e7235499d6a52692b37915d9ee5df3247b9b5d08fb0a9ef3a448c202ef9081816acac253eb96f37c13 SHA512 5a71bbe97051577207d22791c284db27c7558c98fa886744cb8ec7208c0c2e5d2aeccb21c0eb461309019784b69ac6a82c4cf2456b6250df36b59f55c5d54bc2
 AUX kea-confd-r1 289 BLAKE2B da62fc34c87d791f765a7077020f7ca1c224c2b2bc86880e4bacdbc12e60840675750e2c5c71dc90e99a1d11d1e5e725f59d1045d4b973d6155d22876314aeb5 SHA512 9f74344bc39fd2d85d2e305060e35e96a43ec9775793f29d4140a2a6ebf40cc0e8c6b2766fd6ad1fef531fc4be66b004ce0631ac76ac7646df4e655d9a2805e6
 AUX kea-initd-r1 2210 BLAKE2B 052fbbf03c6c1e8c66beb3161dbc8d46c6c704b7d931438039321177e792e1d7f08ccf17acb87d7c36af1878413c2f17cd00b951d4076c3be049cbe31de3e32a SHA512 051f4b86f083931c3934e2c63aeb45409bae5d50e6a91b29e642bf4cb609a539e2c23029b8dc70b48517a4646fa3db06961c823d804c514f05213be0b172cf9d
-DIST kea-1.8.1.tar.gz 9001243 BLAKE2B f121c173b915b82055048fb05dcde622ef3f7ee1d113604d94c7df737f9de1b15e5cedbe414ea583f6a6c9e9ceca615eaad2778a2736addc21b27fe45521aa3e SHA512 0f0972d63a1e146623dd30b8acab9a72af2d10c25fbdf9cf31e66ed25dee14f6b7602226c475f574a723415ba5569b04e13a97711bd933448e1045636ca6b96f
 DIST kea-1.8.2.tar.gz 9005645 BLAKE2B fec1118ca34adc4bdafea13dd6c1c3abcd42df80043b621d1ed994e7ec6906a5d13e86a1bbb6dcbdfee32a4d70281c751b46c57d4866bd92557448ab7c602c30 SHA512 7bea9eb30ee819bd350ba3f64da7dc46d1176363e7243e934ff0f0498fcd47ef4eccb7fe8d8dd4f883ab9e376174aaba4fae06b20405181d46b6b12cfbdf7dd0
 DIST kea-1.9.4.tar.gz 9280374 BLAKE2B 8fa3917ac9d3a95524b89474ac6ed09bc3b118b349a192a69a68bc7638295bd4b3e9bba532d4baba5575140d3b76f7d319a1ae4275d781ce6ffe9f931127f3bb SHA512 1808583194d426cf3881426a4d2c2f4134c463c6804648e2b1baa6a8ae48bca8b12ee2bc230349c785aff385a05a98a943d1c6ba09565e2204f262a2255be911
-EBUILD kea-1.8.1-r1.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
-EBUILD kea-1.8.2.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
-EBUILD kea-1.9.4.ebuild 1687 BLAKE2B fbc35228e78f1588c94dec8903b6af6be614a73f8bde3e097374a652db656e9f1a8f28495e22aca7d4c2398d21b06c6b704bfa238dc9fa6ef7c310bd90884387 SHA512 95b7879dae4b8fd42b6025effd3db251d61d7cf44c4c4f6aa39f8d572d9116975fdc405bff99516be143af81152bf6b288d2c6d155f61441b1f40edb11db67f3
-EBUILD kea-9999.ebuild 1687 BLAKE2B fbc35228e78f1588c94dec8903b6af6be614a73f8bde3e097374a652db656e9f1a8f28495e22aca7d4c2398d21b06c6b704bfa238dc9fa6ef7c310bd90884387 SHA512 95b7879dae4b8fd42b6025effd3db251d61d7cf44c4c4f6aa39f8d572d9116975fdc405bff99516be143af81152bf6b288d2c6d155f61441b1f40edb11db67f3
+EBUILD kea-1.8.2.ebuild 1750 BLAKE2B 3cde9b01069147d468eba1d52dafc56ff0cb1b95d836eac34fa27fa6c6cb8f5926ecb3dd43ef0ca5047619caa1b429b757ca27f06f7ef8d990a886e5978744cd SHA512 021a790c8530dc2f361fc96b6ad90bea0a27a99eacc6b45eeebe7a3a12f2f2ff06be6bff4885f1cc98e58a40f4dad582280b73bbcaf418a27c06a3755b5a32b1
+EBUILD kea-1.9.4.ebuild 1662 BLAKE2B bb651942e59eac1372cd6cc30de20656319a9f8b484f47b60ab48627bb6d726ec027fc774e563c29d2f1d03207fc033a6dba0d8293168831c507791c71c054a7 SHA512 e7d259920ce263476e8a46f683c4ec50e4a75d73123f71610196f8adecde54c504f8b00116112dc78bb412a5161c0b965ab8b0451dd74795d603c8f1d1e24291
+EBUILD kea-9999.ebuild 1662 BLAKE2B bb651942e59eac1372cd6cc30de20656319a9f8b484f47b60ab48627bb6d726ec027fc774e563c29d2f1d03207fc033a6dba0d8293168831c507791c71c054a7 SHA512 e7d259920ce263476e8a46f683c4ec50e4a75d73123f71610196f8adecde54c504f8b00116112dc78bb412a5161c0b965ab8b0451dd74795d603c8f1d1e24291
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch b/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch
new file mode 100644
index 000000000000..867561f2e7e5
--- /dev/null
+++ b/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch
@@ -0,0 +1,50 @@
+--- a/m4macros/ax_cpp11.m4
++++ b/m4macros/ax_cpp11.m4
+@@ -182,6 +182,7 @@
+ 	AC_COMPILE_IFELSE(
+ 		[AC_LANG_PROGRAM(
+ 			[#include <thread>
++			 #include <memory>
+ 			 std::shared_ptr<std::thread> th;],
+ 			[th.reset(new std::thread([[]]() { return; }));
+ 			 th->join();])],
+--- a/src/bin/perfdhcp/Makefile.am
++++ b/src/bin/perfdhcp/Makefile.am
+@@ -3,7 +3,6 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
+ AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
+ AM_CPPFLAGS += $(BOOST_INCLUDES)
+-AM_CPPFLAGS += -Werror
+ 
+ AM_CXXFLAGS = $(KEA_CXXFLAGS)
+ 
+--- a/src/bin/perfdhcp/tests/Makefile.am
++++ b/src/bin/perfdhcp/tests/Makefile.am
+@@ -4,7 +4,6 @@
+ AM_CPPFLAGS += -I$(srcdir)/.. -I$(builddir)/..
+ AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\"
+ AM_CPPFLAGS += $(BOOST_INCLUDES)
+-AM_CPPFLAGS += -Werror
+ AM_CXXFLAGS = $(KEA_CXXFLAGS)
+ 
+ if USE_STATIC_LINK
+--- a/src/lib/database/backend_selector.cc
++++ b/src/lib/database/backend_selector.cc
+@@ -7,6 +7,7 @@
+ #include <database/backend_selector.h>
+ #include <exceptions/exceptions.h>
+ #include <climits>
++#include <limits>
+ #include <sstream>
+ 
+ using namespace isc::data;
+--- a/src/lib/dhcpsrv/subnet_id.h
++++ b/src/lib/dhcpsrv/subnet_id.h
+@@ -10,6 +10,7 @@
+ #include <exceptions/exceptions.h>
+ #include <stdint.h>
+ #include <typeinfo>
++#include <limits>
+ 
+ namespace isc {
+ namespace dhcp {
diff --git a/net-misc/kea/kea-1.8.1-r1.ebuild b/net-misc/kea/kea-1.8.1-r1.ebuild
deleted file mode 100644
index 3e20776fe7e7..000000000000
--- a/net-misc/kea/kea-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PV//_p/-P}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="http://www.isc.org/kea/"
-if [[ ${PV} = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
-else
-	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
-		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-IUSE="mysql +openssl postgres samples"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-cpp/gtest
-	dev-libs/log4cplus
-	mysql? ( dev-db/mysql-connector-c )
-	!openssl? ( dev-libs/botan:2= )
-	openssl? ( dev-libs/openssl:0= )
-	postgres? ( dev-db/postgresql:* )
-"
-RDEPEND="${DEPEND}
-	acct-group/dhcp
-	acct-user/dhcp"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	[[ ${PV} = *9999 ]] && eautoreconf
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--enable-perfdhcp
-		--localstatedir="${EPREFIX}/var"
-		--without-werror
-		$(use_with mysql)
-		$(use_with openssl)
-		$(use_with postgres pgsql)
-		$(use_enable samples install-configurations)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
-	keepdir /var/lib/${PN} /var/log
-	rm -rf "${ED}"/var/run || die
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/net-misc/kea/kea-1.8.2.ebuild b/net-misc/kea/kea-1.8.2.ebuild
index 3e20776fe7e7..8fa2128e5ae0 100644
--- a/net-misc/kea/kea-1.8.2.ebuild
+++ b/net-misc/kea/kea-1.8.2.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
-
 MY_PV="${PV//_p/-P}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
@@ -15,6 +13,7 @@ if [[ ${PV} = 9999* ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
 else
+	inherit autotools
 	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
 		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
 	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
@@ -41,9 +40,11 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.8.2-fix-cxx11-detection.patch )
+
 src_prepare() {
 	default
-	[[ ${PV} = *9999 ]] && eautoreconf
+	eautoreconf
 	# Brand the version with Gentoo
 	sed -i \
 		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
diff --git a/net-misc/kea/kea-1.9.4.ebuild b/net-misc/kea/kea-1.9.4.ebuild
index f693a2e9d6d1..cc899fb2dce2 100644
--- a/net-misc/kea/kea-1.9.4.ebuild
+++ b/net-misc/kea/kea-1.9.4.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit toolchain-funcs
-
 MY_PV="${PV//_p/-P}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index f693a2e9d6d1..cc899fb2dce2 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit toolchain-funcs
-
 MY_PV="${PV//_p/-P}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"