gentoo auto-resync : 21:05:2023 - 20:55:01

4 files changed, 118 insertions, 30 deletions

diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index b74c03f270ee..0083751e2be1 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,6 +1,10 @@
 AUX libevent-2.1.12-clang16.patch 3562 BLAKE2B d2cf6b7d9499330f0ea5abddd935b2370da2f82e8941a82b81ed9821297d77f1ac39195b12f7966edd06f909491e6ab519fc28c11d97fe6014a646e6431eb038 SHA512 e6d2dbd3e0db9afc4d60a23c7302d56be74aed355d975b6a401fec1c33d7252f67854354249683a0722cccb0176f554e641d2366e9ac00c47edf7d381fbe3de3
 AUX libevent-2.1.12-libressl.patch 1237 BLAKE2B 796e4138fa97ff99c6431ee0de84f8ff23469d2b761f83190679b1c7bf19a3354087948707fbcf1b5e6172e65c91b0848acf701e907ab7b08f6a3e712208ce15 SHA512 491311429b0ec63b90c27228271830d55590090623cac4b4400bec4b46bed3f0e7542ef671f467afc1732e3b76eec448179734c2c642d13cbccf8508fae1bf20
-DIST libevent-2.1.12.tar.gz 1100847 BLAKE2B bc1ace15f639ecef2e6b3f95976b8830c1d86f1d06606dd949e2978611fdf9859ed4eb9292d13e6e90e3835063edb94aae64a15c518d5dabe680f37d5a7f5290 SHA512 88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f
-EBUILD libevent-2.1.12-r1.ebuild 1834 BLAKE2B f249081803492a9adf9fbc5021fdba2a9734063ce57235f43dfa68fb515a8de56aca28f8b077bc7ec00a25069a9e2b1b25a04f52a6bf476caa9d0ca59d7b1b58 SHA512 ceb95f6651595ffcbcffe59d74c7b0862e24d9a8e08be2d70e1ac3f5dc6cab887dd643652f69a00569a257581e60bf1c64cc49116f40218dde525d1ad4dd951f
-EBUILD libevent-9999.ebuild 1325 BLAKE2B cf9b2d43f87d6dede05b4a8249e041c793eb38187e20f445b08dfc8ababda07b4dec48a6fcd4a57178ca90e6b2f29b22de38a3c19c9635ffed6ee59d70518a6f SHA512 bb2d56df73c13844fbc6627480f2f9e4dc7de150316c4df0df823dda1a9508f3603db945678fc27c7ec40a9e45546d2fcac67955ee5353ab56886aa31de72fda
+DIST libevent-2.1.12-stable.tar.gz 1100847 BLAKE2B bc1ace15f639ecef2e6b3f95976b8830c1d86f1d06606dd949e2978611fdf9859ed4eb9292d13e6e90e3835063edb94aae64a15c518d5dabe680f37d5a7f5290 SHA512 88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f
+DIST libevent-2.1.12-stable.tar.gz.asc 488 BLAKE2B 629109913fe57110d0d78f5a7f18f36a7556b6b438ca65d9ce7c8f1d46e04cb9af4df8d7504d31165b510869154ea3a546e55a83bd7b1247bcfdf7c7d9509312 SHA512 841b57a0f6ba645b1871f257b9929093b11b7d6fd03332e6339adceddda233e78f6190faa2339e2b67b26dc2a56ddd7ce622792820b582168b31a2d1d1854f1f
+DIST libevent-2.2.1-alpha-dev.tar.gz 1166550 BLAKE2B 4ab460a521aab90852ade14c937c06a21f8e5649a1a1dc4114f978a99272deb77b4e05923861e979f4ee5f50e04149d7b8f8e38294279757f27779597f407d79 SHA512 3e0ef283979a30cce11065c3b9a1078f3f006dbab86e8b49f75dc3aac2384085cb74477d95e5bc4e88c0d81ee2359fcd1cf292107d4791de87191019f2fcdfa5
+DIST libevent-2.2.1-alpha-dev.tar.gz.asc 488 BLAKE2B d3e2b2782edd3bcabe42183b5b6647b6e55cd52292813901015a96c6eeec40e1ce57e9be731b2bd027c787f22b8ac5a587b7bed1dff95993bedde8b88fc1e89c SHA512 af720bce0829e806fb8bbb043eaf973fa6765ee17f059367b72344ce111a68f878b7a2fe361e4a3db61c7b4724c7dff19f960636b98e4208e7e27a2a077b8848
+EBUILD libevent-2.1.12-r1.ebuild 2043 BLAKE2B 6da7aeba1c7ceb5077fe8ebad783e70b377301eeb89d5b36401e75f13ec60de69a125bdbc2b197f459e7d67132a2e75e573a78eac963021cf5aadd3cbf9ba645 SHA512 365920c35f830fa859ed0e6a930a380a906389bcf3b2813fe81a82a5a89596a4fba9bc921d4f5d21901c1e17c57cf0e6345fe45accc8d9e5a35e5c4b0cc173c0
+EBUILD libevent-2.2.1.ebuild 1646 BLAKE2B 8f97d6c73af1eb4cef4bf7f6aecce53ff4e199b32a7581b4f6432f349f95813482cf95ce64876d8094da89df920b739f9667b0c7c5677f1bb4bc7d169a0a8ebc SHA512 7e5e4c87c7905bded4993c7802323a0eedfdda059fda0f4250fcc7a8993c2d3665739b286b2a3d4be135062cd7dd0b9ff0549c06d351323e30a7cb112ea6e87a
+EBUILD libevent-9999.ebuild 1394 BLAKE2B f1c6080e3315545c7af5341498f8e8d3df9eeb71fc57e22ec7b6471be61a969a4a65e4b7a47a269cad258adbeb8fbd97fd0c6c5d67ff97bd8f4ee68c2c6cc840 SHA512 685ce4c93fefb5d08c005e4f3002749d2a6a71a3e8ad8806da16b870f609a1e0d75dcb8de9bbbeffcc393532a83713fbc21138be0a2d504c1004dc2e539ab304
 MISC metadata.xml 935 BLAKE2B 45e1677dd467a0b9f0de89bf9966cec3368da090bc330c7b31aa8528d19440e3523ef3afb67d27102cbf4b40ad8343dc03d040f5961629e2a43d55fe46d7e5a6 SHA512 a7a5ac5c59e2a767bbb511c4eefb53535d894a936d5cd0e9206c176a4f50dfc90387a46a35ece2b48740974f9352793ab56026573678ab74e3e1e5250799bdcf
diff --git a/dev-libs/libevent/libevent-2.1.12-r1.ebuild b/dev-libs/libevent/libevent-2.1.12-r1.ebuild
index 52b0dc8fd562..4171ba58ee19 100644
--- a/dev-libs/libevent/libevent-2.1.12-r1.ebuild
+++ b/dev-libs/libevent/libevent-2.1.12-r1.ebuild
@@ -3,18 +3,24 @@
 
 EAPI=7
 
-inherit libtool multilib-minimal
+inherit libtool multilib-minimal verify-sig
 
+MY_P="${P}-stable"
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
 HOMEPAGE="
 	https://libevent.org/
 	https://github.com/libevent/libevent/
 "
+BASE_URI="https://github.com/libevent/libevent/releases/download/release-${MY_P#*-}"
 SRC_URI="
-	https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}-stable/${P/_/-}-stable.tar.gz -> ${P}.tar.gz
+	${BASE_URI}/${MY_P}.tar.gz
+	verify-sig? (
+		${BASE_URI}/${MY_P}.tar.gz.asc
+	)
 "
-LICENSE="BSD"
+S=${WORKDIR}/${MY_P}
 
+LICENSE="BSD"
 SLOT="0/2.1-7"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="
@@ -32,15 +38,20 @@ RDEPEND="
 	${DEPEND}
 	!<=dev-libs/9libs-1.0
 "
+BDEPEND="
+	verify-sig? (
+		sec-keys/openpgp-keys-libevent
+	)
+"
+
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/event2/event-config.h
 )
-S=${WORKDIR}/${P/_/-}-stable
-
 PATCHES=(
 	"${FILESDIR}"/${P}-clang16.patch #880381
 	"${FILESDIR}"/${P}-libressl.patch #903001
 )
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libevent.asc
 
 src_prepare() {
 	default
diff --git a/dev-libs/libevent/libevent-2.2.1.ebuild b/dev-libs/libevent/libevent-2.2.1.ebuild
new file mode 100644
index 000000000000..66a742241c13
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.2.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal verify-sig
+
+MY_P="${P}-alpha-dev"
+DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="
+	https://libevent.org/
+	https://github.com/libevent/libevent/
+"
+BASE_URI="https://github.com/libevent/libevent/releases/download/release-${PV}-alpha"
+SRC_URI="
+	${BASE_URI}/${MY_P}.tar.gz
+	verify-sig? (
+		${BASE_URI}/${MY_P}.tar.gz.asc
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0/2.2"
+KEYWORDS=""
+IUSE="
+	+clock-gettime debug malloc-replacement mbedtls +ssl static-libs
+	test verbose-debug
+"
+# TODO: hangs
+RESTRICT="test"
+
+DEPEND="
+	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	ssl? ( >=dev-libs/openssl-1.0.1h-r2:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	verify-sig? (
+		sec-keys/openpgp-keys-libevent
+	)
+"
+
+DOCS=( README.md ChangeLog{,-1.4,-2.0} whatsnew-2.{0,1}.txt )
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/event2/event-config.h
+)
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libevent.asc
+
+multilib_src_configure() {
+	# fix out-of-source builds
+	mkdir -p test || die
+
+	local ECONF_SOURCE="${S}"
+	local myconf=(
+		$(use_enable clock-gettime)
+		$(use_enable debug debug-mode)
+		$(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 verbose-debug)
+		--disable-samples
+	)
+	econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index f5619ac0a1b0..471fb8418bef 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -1,42 +1,39 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools git-r3 multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-EGIT_REPO_URI="https://github.com/libevent/libevent"
 HOMEPAGE="
 	https://libevent.org/
-	https://github.com/libevent/libevent
+	https://github.com/libevent/libevent/
 "
+EGIT_REPO_URI="https://github.com/libevent/libevent.git"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/2.2"
 KEYWORDS=""
 IUSE="
 	+clock-gettime debug malloc-replacement mbedtls +ssl static-libs
 	test verbose-debug
 "
+# TODO: hangs
 RESTRICT="test"
 
 DEPEND="
-	mbedtls? ( net-libs/mbedtls )
-	ssl? (
-		>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-	)
+	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	ssl? ( >=dev-libs/openssl-1.0.1h-r2:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
 	${DEPEND}
-	!<=dev-libs/9libs-1.0
 "
 
+DOCS=( README.md ChangeLog{,-1.4,-2.0} whatsnew-2.{0,1}.txt )
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/event2/event-config.h
 )
-DOCS=(
-	ChangeLog{,-1.4,-2.0}
-)
 
 src_prepare() {
 	default
@@ -47,17 +44,19 @@ multilib_src_configure() {
 	# fix out-of-source builds
 	mkdir -p test || die
 
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable clock-gettime) \
-		$(use_enable debug debug-mode) \
-		$(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 verbose-debug) \
+	local ECONF_SOURCE="${S}"
+	local myconf=(
+		$(use_enable clock-gettime)
+		$(use_enable debug debug-mode)
+		$(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 verbose-debug)
 		--disable-samples
+	)
+	econf "${myconf[@]}"
 }
 
 multilib_src_install_all() {