gentoo resync : 20.02.2019

4 files changed, 139 insertions, 6 deletions

diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 7fe1fe834b1f..eed6ed80a6b2 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,4 +1,7 @@
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
+DIST libevent-2.1.9_beta.tar.gz 1067050 BLAKE2B d59f424995742e6a57df74420d91c8a1614d7dbb6e3928a3dd666269f7c2f4876d6fedd649e4e947a6db63c15f69c18866bda9997c3bb3571452a8dbf126916a SHA512 672bff332292ec76503bc0ccb9462058e093f1867740fece51f77bb666c77c85e10271730b32b36d6faa9ab2ccee0433879457e201bf94b6bf704dba2c066051
+EBUILD libevent-2.1.8-r1.ebuild 1716 BLAKE2B 54c609bbc0cdeb0bc2e59a650006cdc7a48aae4ea137eb3fc9d51a604eafd1829cce2bece1bd3ceca96eab137129350bf308d64a5009f032f4328ba7e47b9f08 SHA512 30792a15db52a90fbc2624a464993ef489e2369b14f3d465c819d9860aa610537232bf73b1457a6dc5f7c0a28d93323945c6aecd85a441232e533ded311354b6
 EBUILD libevent-2.1.8.ebuild 1705 BLAKE2B d483a5f882b40db3891d48f3e7de7f7b4916c45711e60e83d92249988f6afdece6808c71a7212680548d45f58ed3163cad4bcdbb2ad67d2a8a62df5ea66658ca SHA512 b44f94eb5db73acad177149232465f1dd11eb2bd37fb3680e4ef050ef5429d49080f978046e9a8af7aa203fa0504580f24dae9d51ed7b624e6a6aeca1bde1f3f
-EBUILD libevent-9999.ebuild 1229 BLAKE2B 87b91ad5aab6cc863fe86b44e4332d100e051166c5a79fd034298db0c722a83e89dc4ca3a2faa01cbd3c0a1e030de9907c7d1f60deb7755fc0d0184212cf2efc SHA512 1e4892c311545bf0ab6dca1cd789a3a03920de6f39c7ba7520cf706eecc714c841463c3991c571557dec218e799551dfdf3655c1ccc0798555a83dc43800a51f
+EBUILD libevent-2.1.9_beta.ebuild 1719 BLAKE2B 2d2c471a992d6fd49269fbdc2094fcf9448d2c5df5c81e340e527cf3519c6798bbbf081d7c9cafb67d69d9e22f002af81214166adf9b4acb098a23cbb13fa3f0 SHA512 3e74a2fde7e26160154c121d3e1b81cb226d4ad10c8341af2b2c404437b962d2c460f370d1ba9a0e214b91a54e7cfcce815c12a69a2873819eb2bf7332c7624d
+EBUILD libevent-9999.ebuild 1241 BLAKE2B b45af1e1260ea97758c8c83df2f300e08866340dffdc23f4db3aaa2d4cd05290445cd50bc43e7022276a5891c6188bc29a3acdbc22a21f96d747aeb67d68001d SHA512 77ba2b774b0d8ac4fbb3da98eb8b838343e78b1aebe884f2222132d55cebe7cf5e8960b0b7648cb91928c6351aee59a218c51b5c76d9c814a9e53c7941705352
 MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.8-r1.ebuild b/dev-libs/libevent/libevent-2.1.8-r1.ebuild
new file mode 100644
index 000000000000..a9e66dc5bced
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.1.8-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://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"
+
+LICENSE="BSD"
+# libevent-2.1.so.6
+SLOT="0/2.1-6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug libressl +ssl static-libs test +threads"
+
+DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${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
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# fix out-of-source builds
+	mkdir -p test || die
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-samples \
+		$(use_enable debug debug-mode) \
+		$(use_enable debug malloc-replacement) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_enable test libevent-regress) \
+		$(use_enable threads thread-support)
+}
+
+src_test() {
+	# The test suite doesn't quite work (see bug #406801 for the latest
+	# installment in a riveting series of reports).
+	:
+	# emake -C test check | tee "${T}"/tests
+}
+
+DOCS=( ChangeLog{,-1.4,-2.0} )
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libevent/libevent-2.1.9_beta.ebuild b/dev-libs/libevent/libevent-2.1.9_beta.ebuild
new file mode 100644
index 000000000000..9c98cb2fe64e
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.1.9_beta.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://libevent.org/ https://github.com/libevent/libevent/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}/${P/_/-}.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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug libressl +ssl static-libs test +threads"
+
+DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${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/_/-}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# fix out-of-source builds
+	mkdir -p test || die
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-samples \
+		$(use_enable debug debug-mode) \
+		$(use_enable debug malloc-replacement) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_enable test libevent-regress) \
+		$(use_enable threads thread-support)
+}
+
+src_test() {
+	# The test suite doesn't quite work (see bug #406801 for the latest
+	# installment in a riveting series of reports).
+	:
+	# emake -C test check | tee "${T}"/tests
+}
+
+DOCS=( ChangeLog{,-1.4,-2.0} )
+
+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 06fa234e5ef5..16a0b3af8b69 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils git-r3 multilib-minimal
+EAPI=7
+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"
@@ -20,7 +20,7 @@ RESTRICT="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="
@@ -57,5 +57,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }