gentoo new year resync : 01.01.2021

8 files changed, 2 insertions, 265 deletions

diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest
index 48276095c3f4..de03e7748a1e 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -1,11 +1,3 @@
-AUX libverto-Wflags.patch 800 BLAKE2B c933153042d1d66dd41e4cd307a6e1c6ac96c77d147e0574b35e75dfab5e42278e73177648e49524ce22b3da3829b92a69cb79d8349eeb883780da086de41c04 SHA512 c8e05cfdf7537624b844731e3bf595765641745ce18d88ac4e1cceb80f6ae6bb1a97480bdac50f7d222b334e7226a495c5bbe33d6d537dc8d79ca825fd90fb52
-AUX libverto-libev-c89.patch 392 BLAKE2B 265d2d37db847cfbd495d26ea7ce93e7fa244960c99f4758a7b6a6c7d315b84788def5a0254a80f0ece1b2ca08b188da8e215d2bdaa672796aa98740c1051ab1 SHA512 a9e1cf3206f350ecb7acd1b77417d2cea387396ac7dd68e30fd3b0ad097a677bee4d6735e8fb9abe95ed2758206e226bb85e002a5a9974865b87f8b01d59b619
-AUX libverto-load.patch 2058 BLAKE2B b0a5fc276fe34cca97b6622f74ce22b56faf4f0a88cf5fbd0d47360a660e0a29927d17dbfe47afbd0c72404843f3847466f199e0d865de4f3856f3fb133878c8 SHA512 caa4d4d3be591e9e025f7a75e1cb20190469888c35563b332244a7c6a0191147888a19415ca3fe33171336e4b7361c3dc75d62e1c60380892452c13c0e1b8490
-AUX libverto-verify-cflags.patch 736 BLAKE2B 67b4d65955a8bfa51dac8c0bb2a116ee21ab777ab58da2098132118bfad24701b0bc1dd47233ebd247836be9812e9572732fd666a08ea70fd0cd4992845492af SHA512 83cd538542af376f3875e00cd5732d779b4b0aab920d0d63ead89ffe47c513ee4e55651c8c9e18adb95118b67ba964a7e401b3691992a5c012202962fb3b7abe
-DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e
-DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f
 DIST libverto-0.3.1.tar.gz 383390 BLAKE2B 2d8366d85c2a02becf8fa9224d195a8d85f64aab735a0101997a52dd99750537b181a6dd2fc494b435b949b4a9cb785acb7222ba3f2424b7a7ddcf5d3c832387 SHA512 baef4fd280e0cb30167743608fd5a950fb4340eeb89e3630a0f63f8eab4d56f0f894a2e3283583b7ed8774d5e896c44e2c68c25882d95a07350f980af36b8740
-EBUILD libverto-0.2.5-r1.ebuild 1506 BLAKE2B 5849f6a5689d62b5d5e7e29bdcb3e012332996ab6c48f89ea91d36000dbb12bfa38c8fcff00bd1db6dbb745a36edf4c348c23b717d2308fe425b0d6b31601db3 SHA512 78cf8dfbb97b286b1bd71b8918346b0b513021979dfc0043dde5ef62aa7d747f48c2f8f54f9f86c8c2195ede84bd3d36018e823ad9c02a685d4eb42ed97fce29
-EBUILD libverto-0.3.0.ebuild 1728 BLAKE2B 0d62b343c892c3585949dd7bc2d5f5f1fe6d3c2007eaa68ef7ac3347bfe6a6a07cc71baa671ec79769b0daed0c736a46bab8e022b12f96390180c0227ae2bc0a SHA512 dfeb4d5922be73a243070242a6bb75c2e111fa1f29989b4a191354bc82eafef8433764c7da34daa291fed0c6374952cb324a52143ecb35e1b8d8c074d3275ed9
-EBUILD libverto-0.3.1.ebuild 1445 BLAKE2B 100f9ecf28b2b01b0803780e5004d4c77d0038b690e6e369c7c250ca75cb0f33da1ed7b8a4ed4d39b41202b4de0fdfae3da3d233dd7c02dcef24a26a9de38b01 SHA512 bfc2a99e1c7de79917f050f89654fbaf3fdeaae623a0e4716e4cfe3f8a2da548a3df2c03eacd09f5c28e432e3a2eb3bc0cdd0cc2578783a25e3e1691678ad1f3
+EBUILD libverto-0.3.1.ebuild 1443 BLAKE2B cacdbf318729ba2892c90e7703feee3091124c8365697299ad82d67e7a4e1b4ee75ef353f61686fc1fc0b2481e6579bed76932451693b29cdd3abcb0662badf7 SHA512 029d81916ef31582cf7375f4bfe859d3e77ed93b34ed144eda2d9f1a1eeb81df42f2db00a9316f12cd1c8d75ccdc00a6049fae600694a7892876d9073083d606
 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00
diff --git a/dev-libs/libverto/files/libverto-Wflags.patch b/dev-libs/libverto/files/libverto-Wflags.patch
deleted file mode 100644
index de403720dd62..000000000000
--- a/dev-libs/libverto/files/libverto-Wflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f3935464e3a823539394dcb4669a6e7a889a95ef Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 31 Jan 2018 18:21:04 +0100
-Subject: [PATCH] Turn off -Wcast-function-type
-
-The glib event library forces all callbacks to the same type, even
-when they have different arities.  Turn off the gcc warning for this
-gross behavior.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4084965..dcab593 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,7 +9,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
- 
- AC_PROG_CC_C99
- 
--for flag in -Wall -Wextra; do
-+for flag in -Wall -Wextra -Wno-cast-function-type; do
-   OLD_CFLAGS=$CFLAGS
-   CFLAGS="$CFLAGS $flag"
-   AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS])
diff --git a/dev-libs/libverto/files/libverto-libev-c89.patch b/dev-libs/libverto/files/libverto-libev-c89.patch
deleted file mode 100644
index e63c032b0c89..000000000000
--- a/dev-libs/libverto/files/libverto-libev-c89.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 09ee123..b7b5908 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,8 +7,8 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
-     [AC_USE_SYSTEM_EXTENSIONS],
-     [AC_GNU_SOURCE])
- 
--AC_PROG_CC_C89
--for flag in -std=c89 -Wall -Wextra; do
-+AC_PROG_CC_C99
-+for flag in -Wall -Wextra; do
-   AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],)
- done
- 
diff --git a/dev-libs/libverto/files/libverto-load.patch b/dev-libs/libverto/files/libverto-load.patch
deleted file mode 100644
index 94dceac5d69c..000000000000
--- a/dev-libs/libverto/files/libverto-load.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 7989b3c6bdfdeb8770d17d8717b4a0cd48e79386 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 24 Oct 2018 16:57:11 -0400
-Subject: [PATCH] Fix rare leak of DSO in module_load
-
----
- src/module.c | 31 +++++++++++++++----------------
- 1 file changed, 15 insertions(+), 16 deletions(-)
-
-diff --git a/src/module.c b/src/module.c
-index 1f1b7c9..0b59034 100644
---- a/src/module.c
-+++ b/src/module.c
-@@ -182,7 +182,7 @@ module_load(const char *filename, const char *symbname,
-     intdll = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
- #endif /* WIN32 */
-     if (!intdll)
--        return dllerror();
-+        goto fail;
- 
-     /* Get the module symbol */
- #ifdef WIN32
-@@ -190,16 +190,12 @@ module_load(const char *filename, const char *symbname,
- #else /* WIN32 */
-     intsym = dlsym(intdll, symbname);
- #endif /* WIN32 */
--    if (!intsym) {
--        module_close(intdll);
--        return dllerror();
--    }
-+    if (!intsym)
-+        goto fail;
- 
-     /* Figure out whether or not to load this module */
--    if (!shouldload(intsym, misc, &interr)) {
--        module_close(intdll);
--        return interr;
--    }
-+    if (!shouldload(intsym, misc, &interr))
-+        goto fail;
- 
-     /* Re-open the module */
-     module_close(intdll);
-@@ -208,9 +204,8 @@ module_load(const char *filename, const char *symbname,
- #else  /* WIN32 */
-     intdll = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
- #endif /* WIN32 */
--    if (!intdll) {
--        return dllerror();
--    }
-+    if (!intdll)
-+        goto fail;
- 
-     /* Get the symbol again */
- #ifdef WIN32
-@@ -218,14 +213,18 @@ module_load(const char *filename, const char *symbname,
- #else /* WIN32 */
-     intsym = dlsym(intdll, symbname);
- #endif /* WIN32 */
--    if (!intsym) {
--        module_close(intdll);
--        return dllerror();
--    }
-+    if (!intsym)
-+        goto fail;
- 
-     if (dll)
-         *dll = intdll;
-     if (symb)
-         *symb = intsym;
-     return NULL;
-+
-+fail:
-+    if (!interr)
-+        interr = dllerror();
-+    module_close(intdll);
-+    return interr;
- }
diff --git a/dev-libs/libverto/files/libverto-verify-cflags.patch b/dev-libs/libverto/files/libverto-verify-cflags.patch
deleted file mode 100644
index dce747239dc7..000000000000
--- a/dev-libs/libverto/files/libverto-verify-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5bbe8b009d6daa809f679fd1d25c270abba468b4 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 31 Jan 2018 17:52:39 +0100
-Subject: [PATCH] Verify flags prior to adding them to CFLAGS, not after
-
----
- configure.ac | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b7b5908..4084965 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,8 +8,11 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
-     [AC_GNU_SOURCE])
- 
- AC_PROG_CC_C99
-+
- for flag in -Wall -Wextra; do
--  AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],)
-+  OLD_CFLAGS=$CFLAGS
-+  CFLAGS="$CFLAGS $flag"
-+  AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS])
- done
- 
- AC_CANONICAL_SYSTEM
diff --git a/dev-libs/libverto/libverto-0.2.5-r1.ebuild b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
deleted file mode 100644
index 12650e13dfb6..000000000000
--- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="Main event loop abstraction library"
-HOMEPAGE="https://github.com/latchset/libverto/"
-SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="glib +libev libevent tevent +threads static-libs"
-
-# file collisions
-DEPEND="!=app-crypt/mit-krb5-1.10.1-r0
-	!=app-crypt/mit-krb5-1.10.1-r1
-	!=app-crypt/mit-krb5-1.10.1-r2
-	glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] )
-	libevent? ( >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] )
-	tevent? ( >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( glib libev libevent tevent ) "
-
-src_prepare() {
-	# known problem uptream with tevent write test.  tevent does not fire a
-	# callback on error, but we explicitly test for this behaviour.  Do not run
-	# tevent tests for now.
-	sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_with glib) \
-		$(use_with libev) \
-		$(use_with libevent) \
-		$(use_with tevent) \
-		$(use_with threads pthread) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog NEWS INSTALL README
-	use static-libs || prune_libtool_files --all
-}
diff --git a/dev-libs/libverto/libverto-0.3.0.ebuild b/dev-libs/libverto/libverto-0.3.0.ebuild
deleted file mode 100644
index 7786a2f773cc..000000000000
--- a/dev-libs/libverto/libverto-0.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Main event loop abstraction library"
-HOMEPAGE="https://github.com/latchset/libverto/"
-SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="glib +libev libevent tevent +threads static-libs"
-
-# file collisions
-DEPEND="!=app-crypt/mit-krb5-1.10.1-r0
-	!=app-crypt/mit-krb5-1.10.1-r1
-	!=app-crypt/mit-krb5-1.10.1-r2
-	glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] )
-	libevent? ( >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] )
-	tevent? ( >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( glib libev libevent tevent ) "
-
-PATCHES=( "${FILESDIR}/${PN}-libev-c89.patch" \
-	"${FILESDIR}/${PN}-verify-cflags.patch" \
-	"${FILESDIR}/${PN}-Wflags.patch" \
-	"${FILESDIR}/${PN}-load.patch" )
-
-DOCS=( AUTHORS ChangeLog NEWS INSTALL README )
-
-src_prepare() {
-	default
-	# known problem uptream with tevent write test.  tevent does not fire a
-	# callback on error, but we explicitly test for this behaviour.  Do not run
-	# tevent tests for now.
-	sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_with glib) \
-		$(use_with libev) \
-		$(use_with libevent) \
-		$(use_with tevent) \
-		$(use_with threads pthread) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-libs/libverto/libverto-0.3.1.ebuild b/dev-libs/libverto/libverto-0.3.1.ebuild
index ec855cec439d..8ea4ef46aa16 100644
--- a/dev-libs/libverto/libverto-0.3.1.ebuild
+++ b/dev-libs/libverto/libverto-0.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="glib +libev libevent tevent +threads static-libs"
 
 DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )