gentoo resync : 25.08.2020

5 files changed, 62 insertions, 41 deletions

diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 07dcbbf0747c..940243639c6c 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,7 +1,7 @@
 DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
-DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
+DIST libevent-2.1.12.tar.gz 1100847 BLAKE2B bc1ace15f639ecef2e6b3f95976b8830c1d86f1d06606dd949e2978611fdf9859ed4eb9292d13e6e90e3835063edb94aae64a15c518d5dabe680f37d5a7f5290 SHA512 88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f
 EBUILD libevent-2.1.11.ebuild 1676 BLAKE2B f49807e0141e8dce19fbc298fa83c06bada4ea7be36abd0456bae012b0d7582adede6b0674dcf9235c0dcf8fb237e8b8b9b09a10373eaa78ea077120bf5d6e0a SHA512 7390987df1199e264c25a364cd323f8c14e409059461bae0eb16493f5e118720b25d2e245bee43da8677a55388e7e03704d9d2bdf68d18c3c4aeb9f0e7742b40
-EBUILD libevent-2.1.8.ebuild 1669 BLAKE2B 54aa18351c31a916764cfa58ab80162aea085b2e47a79c580a15f98e88bfd24524dff4494b89c4d6de8447161672dc2ed0a20095e77093cea1f84f4fb8015990 SHA512 a1eeb850d53b60c071240591387d01377216a8272c83e6b507196ce4b2fdea80d7e123a52dbbaa35a36b4c09e2183a490df8ddfd4293c92f334b28bb94d8e2b5
-EBUILD libevent-2.1.9999.ebuild 1325 BLAKE2B 00950c513155950753eb2a59d53b082101f883581318f74f17b8ac19b8f01c032e3705e015ce9d389785b588e17ecb7b8b54601f1c150ac5c87689afd5b25ab2 SHA512 be226220566535a11b0372307b80c6505574bafdf644ad5242d374ea5e27a04c05181aaebfe61529b45805fb13d6bb5ac01da852f49417afb41891f038be6dc8
-EBUILD libevent-9999.ebuild 1262 BLAKE2B 22ce0e6670997f58d38256d01c014db1d0c1b3375c9c33e410cf9afa177b774695276fbcaea5e2729e5dbbf55290fc0c55556a94b0ca299cea06ae4451502b0e SHA512 f95954c09907a4983bdaac89f230d6f35382f52bd2a3cfaf78323406f2152a524860a59187e9766d65977cf33cc72777ed1c70cfbf924192d0690f62cbb34fc0
-MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
+EBUILD libevent-2.1.12.ebuild 1814 BLAKE2B 327abda5ded9d4f501caec1b34a9e0c2b026034e8dbde231a605273948d69aa74e91a7930d4ce1fa841b2b69df489c1a33f5b0cf8196dc7dfcbea401f0122ac1 SHA512 4db5a373ca47fbdc9511335cc457e0ab909cfc082ee7dcb6410bb7016509a32771ec6b4f5d3ffdbe750f85c28e319204783447fe05a29707864dd0a874b39389
+EBUILD libevent-2.1.9999.ebuild 1454 BLAKE2B ea626beb07c670f44b0d66f534933baa9a56c1db12e330022eb79388ce86518b9394187008c0107cae83abfab219bd179a9f0f79b7cbb79d1f5d78fbd0602a43 SHA512 68daa118fe9171bf7e5818628cff1b41aa21f67ea965b95aa2d3c0f544f57f2f42905ff9847b27ea4ec516b007ad3273a3e0ea98b7063c38ab3904cc2e6e98c6
+EBUILD libevent-9999.ebuild 1456 BLAKE2B ef35cb0e687a4e96c43112c6fcca73e9596ebc51f07beb1f28f19babdfb064c462b38c6c791f20e0efa64c4ca4b446b91df68051f9eb0a5f378021008c22e3fc SHA512 a41daeef937820670ab644e658e15399b5eb2dfca6cea10b149dc3aa281d2dbbc7ec2a391bcca71fa4b105feebc880bfaa8d0246b7c90daaaba883f56d404159
+MISC metadata.xml 903 BLAKE2B 821ef22428235e3fa2821a7c7b41210966f75144a7c6ec16f25a333e0548e4fef339060d7e199e58c2860792baf6f78297696216b3ab2ad79a1c541840217195 SHA512 29d47bfbb688221bd9d7759893328eb03b59c4b4b07d135b6fb3aa1968ee97abb44a2196da27ba01abade5fc8d754e4ce80b05f712b2f267b83a9fc71bde8f3e
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.12.ebuild
index 5af707d91492..89f9d1095ebe 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.12.ebuild
@@ -1,39 +1,41 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils ltprune multilib-minimal
+EAPI=7
+inherit multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
 HOMEPAGE="
 	https://libevent.org/
 	https://github.com/libevent/libevent/
 "
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/${P}-stable.tar.gz -> ${P}.tar.gz"
-
+SRC_URI="
+	https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}-stable/${P/_/-}-stable.tar.gz -> ${P}.tar.gz
+"
 LICENSE="BSD"
-# libevent-2.1.so.6
-SLOT="0/2.1-6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug libressl +ssl static-libs test +threads"
+
+SLOT="0/2.1-7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="
+	+clock-gettime debug libressl malloc-replacement +ssl static-libs test
+	+threads verbose-debug
+"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 	)
 "
 RDEPEND="
 	${DEPEND}
 	!<=dev-libs/9libs-1.0
 "
-
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/event2/event-config.h
 )
-
-S=${WORKDIR}/${P}-stable
+S=${WORKDIR}/${P/_/-}-stable
 
 multilib_src_configure() {
 	# fix out-of-source builds
@@ -41,13 +43,15 @@ multilib_src_configure() {
 
 	ECONF_SOURCE="${S}" \
 	econf \
-		--disable-samples \
+		$(use_enable clock-gettime) \
 		$(use_enable debug debug-mode) \
-		$(use_enable debug malloc-replacement) \
+		$(use_enable malloc-replacement malloc-replacement) \
 		$(use_enable ssl openssl) \
 		$(use_enable static-libs static) \
 		$(use_enable test libevent-regress) \
-		$(use_enable threads thread-support)
+		$(use_enable threads thread-support) \
+		$(use_enable verbose-debug) \
+		--disable-samples
 }
 
 src_test() {
@@ -61,5 +65,5 @@ DOCS=( ChangeLog{,-1.4,-2.0} )
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libevent/libevent-2.1.9999.ebuild b/dev-libs/libevent/libevent-2.1.9999.ebuild
index c9ecb810481e..5bc82f314e7a 100644
--- a/dev-libs/libevent/libevent-2.1.9999.ebuild
+++ b/dev-libs/libevent/libevent-2.1.9999.ebuild
@@ -16,7 +16,10 @@ LICENSE="BSD"
 # libevent-2.1.so.6
 SLOT="0/2.1-7"
 KEYWORDS=""
-IUSE="debug libressl +ssl static-libs test +threads"
+IUSE="
+	+clock-gettime debug libressl malloc-replacement +ssl static-libs test
+	+threads verbose-debug
+"
 RESTRICT="test"
 
 DEPEND="
@@ -48,13 +51,15 @@ multilib_src_configure() {
 
 	ECONF_SOURCE="${S}" \
 	econf \
-		--disable-samples \
+		$(use_enable clock-gettime) \
 		$(use_enable debug debug-mode) \
-		$(use_enable debug malloc-replacement) \
+		$(use_enable malloc-replacement malloc-replacement) \
 		$(use_enable ssl openssl) \
 		$(use_enable static-libs static) \
 		$(use_enable test libevent-regress) \
-		$(use_enable threads thread-support)
+		$(use_enable threads thread-support) \
+		$(use_enable verbose-debug) \
+		--disable-samples
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index 4a9b798d3529..ed19f34dab5f 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -14,10 +14,14 @@ HOMEPAGE="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug libressl +ssl static-libs test +threads"
+IUSE="
+	+clock-gettime debug libressl malloc-replacement mbedtls +ssl static-libs
+	test +threads verbose-debug
+"
 RESTRICT="test"
 
 DEPEND="
+	mbedtls? ( net-libs/mbedtls )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
@@ -46,13 +50,16 @@ multilib_src_configure() {
 
 	ECONF_SOURCE="${S}" \
 	econf \
-		--disable-samples \
+		$(use_enable clock-gettime) \
 		$(use_enable debug debug-mode) \
-		$(use_enable debug malloc-replacement) \
+		$(use_enable malloc-replacement malloc-replacement) \
+		$(use_enable mbedtls) \
 		$(use_enable ssl openssl) \
 		$(use_enable static-libs static) \
 		$(use_enable test libevent-regress) \
-		$(use_enable threads thread-support)
+		$(use_enable threads thread-support) \
+		$(use_enable verbose-debug) \
+		--disable-samples
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml
index 6036c10bd580..78451ccf1300 100644
--- a/dev-libs/libevent/metadata.xml
+++ b/dev-libs/libevent/metadata.xml
@@ -1,16 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id>
-		<remote-id type="sourceforge">levent</remote-id>
-		<remote-id type="github">libevent/libevent</remote-id>
-	</upstream>
-	<use>
-		<flag name="debug">Support runtime debug mode and malloc hooks (for programmers)</flag>
-	</use>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+<upstream>
+<remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id>
+<remote-id type="github">libevent/libevent</remote-id>
+<remote-id type="sourceforge">levent</remote-id>
+</upstream>
+<use>
+<flag name="clock-gettime">Disable use of clock_gettime even if it is available</flag>
+<flag name="debug">Support for running in debug mode</flag>
+<flag name="malloc-replacement">Support for replacing the memory management functions</flag>
+<flag name="mbedtls">Support for <pkg>net-libs/mbedtls</pkg> encryption</flag>
+<flag name="ssl">Support for <pkg>dev-libs/openssl</pkg> encryption</flag>
+<flag name="verbose-debug">Support for verbose debug logging</flag>
+</use>
 </pkgmetadata>