diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libverto/Manifest index 80b26d0e95..e762a29618 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libverto/Manifest @@ -1,2 +1 @@ -DIST libverto-0.3.1.tar.gz 383390 BLAKE2B 2d8366d85c2a02becf8fa9224d195a8d85f64aab735a0101997a52dd99750537b181a6dd2fc494b435b949b4a9cb785acb7222ba3f2424b7a7ddcf5d3c832387 SHA512 baef4fd280e0cb30167743608fd5a950fb4340eeb89e3630a0f63f8eab4d56f0f894a2e3283583b7ed8774d5e896c44e2c68c25882d95a07350f980af36b8740 DIST libverto-0.3.2.tar.gz 383181 BLAKE2B 76d43397ecd6b7839be2a588c5b668eb6657138e48b786cde6fd82bb33aa071ce5f9efa19f06765d868033fa2ef4a03cf6d43bcd087c431909d2ca17562a5a48 SHA512 342f20f83b8f674230fefba013505e1339dab0022e5e232c39d6763e4307088fa290b5a8e83f588e97142f5c4d190b1430288750e45f37a5fe4174d84ef85fc1 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch deleted file mode 100644 index df7162e21a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch +++ /dev/null @@ -1,133 +0,0 @@ -Strips bashisms from configure.ac causing breakage in net-nds/gssproxy -https://bugs.gentoo.org/762823 ---- a/configure.ac -+++ b/configure.ac -@@ -91,22 +91,22 @@ AC_ARG_WITH([tevent], - - # Ensure that if a builtin is chosen only one is built - BUILTIN_MODULE= --if test x$WITH_GLIB == xbuiltin; then -+if test x$WITH_GLIB = xbuiltin; then - BUILTIN_MODULE=glib - WITH_LIBEV=no - WITH_LIBEVENT=no - WITH_TEVENT=no --elif test x$WITH_LIBEV == xbuiltin; then -+elif test x$WITH_LIBEV = xbuiltin; then - BUILTIN_MODULE=libev - WITH_LIBGLIB=no - WITH_LIBEVENT=no - WITH_TEVENT=no --elif test x$WITH_LIBEVENT == xbuiltin; then -+elif test x$WITH_LIBEVENT = xbuiltin; then - BUILTIN_MODULE=libevent - WITH_LIBGLIB=no - WITH_LIBEV=no - WITH_TEVENT=no --elif test x$WITH_TEVENT == xbuiltin; then -+elif test x$WITH_TEVENT = xbuiltin; then - BUILTIN_MODULE=tevent - WITH_GLIB=no - WITH_LIBEV=no -@@ -118,29 +118,29 @@ if test x$BUILTIN_MODULE != x; then - fi - - # Ensure that there is only one default (convert duplicate default to yes) --if test x$WITH_GLIB == xdefault; then -+if test x$WITH_GLIB = xdefault; then - AC_DEFINE([DEFUALT_MODULE], [glib]) -- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes -- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes -- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes -+ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes -+ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes -+ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes - fi --if test x$WITH_LIBEV == xdefault; then -+if test x$WITH_LIBEV = xdefault; then - AC_DEFINE([DEFUALT_MODULE], [libev]) -- test x$WITH_LIBGLIB == xdefault && WITH_GLIB=yes -- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes -- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes -+ test x$WITH_LIBGLIB = xdefault && WITH_GLIB=yes -+ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes -+ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes - fi --if test x$WITH_LIBEVENT == xdefault; then -+if test x$WITH_LIBEVENT = xdefault; then - AC_DEFINE([DEFUALT_MODULE], [libevent]) -- test x$WITH_GLIB == xdefault && WITH_GLIB=yes -- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes -- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes -+ test x$WITH_GLIB = xdefault && WITH_GLIB=yes -+ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes -+ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes - fi --if test x$WITH_TEVENT == xdefault; then -+if test x$WITH_TEVENT = xdefault; then - AC_DEFINE([DEFUALT_MODULE], [tevent]) -- test x$WITH_GLIB == xdefault && WITH_GLIB=yes -- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes -- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes -+ test x$WITH_GLIB = xdefault && WITH_GLIB=yes -+ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes -+ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes - fi - - BUILD_GLIB=no -@@ -151,7 +151,7 @@ BUILD_TEVENT=no - if test x$WITH_GLIB != xno; then - PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB], - [test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")]) -- if test x$BUILD_GLIB == xauto; then -+ if test x$BUILD_GLIB = xauto; then - BUILD_GLIB=yes - fi - fi -@@ -165,7 +165,7 @@ if test x$WITH_LIBEV != xno; then - ), - [test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")] - ) -- if test x$BUILD_LIBEV == xauto; then -+ if test x$BUILD_LIBEV = xauto; then - BUILD_LIBEV=yes - fi - fi -@@ -173,7 +173,7 @@ fi - if test x$WITH_LIBEVENT != xno; then - PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT], - [test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")]) -- if test x$BUILD_LIBEVENT == xauto; then -+ if test x$BUILD_LIBEVENT = xauto; then - BUILD_LIBEVENT=yes - fi - fi -@@ -181,19 +181,19 @@ fi - if test x$WITH_TEVENT != xno; then - PKG_CHECK_MODULES([tevent], [tevent], [BUILD_TEVENT=$WITH_TEVENT], - [test x$WITH_TEVENT != xauto && AC_MSG_ERROR("tevent not found")]) -- if test x$BUILD_TEVENT == xauto; then -+ if test x$BUILD_TEVENT = xauto; then - BUILD_TEVENT=yes - fi - fi - --AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE == x && test x$BUILD_GLIB != xno]) --AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEV != xno]) --AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEVENT != xno]) --AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_TEVENT != xno]) --AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE == xglib]) --AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE == xlibev]) --AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE == xlibevent]) --AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE == xtevent]) -+AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE = x && test x$BUILD_GLIB != xno]) -+AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEV != xno]) -+AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEVENT != xno]) -+AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_TEVENT != xno]) -+AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE = xglib]) -+AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE = xlibev]) -+AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE = xlibevent]) -+AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE = xtevent]) - - AC_MSG_NOTICE() - AC_MSG_NOTICE([BUILD CONFIGURATION]) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/libverto-0.3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libverto/libverto-0.3.1-r1.ebuild deleted file mode 100644 index 298ede94f7..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/libverto-0.3.1-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 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" -REQUIRED_USE="|| ( glib libev libevent tevent ) " - -DEPEND="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}" - -DOCS=( AUTHORS ChangeLog NEWS INSTALL README ) - -PATCHES=( - # Runtime breakage caused by bashisms, bug #762823 - "${FILESDIR}/${PN}-0.3.1-non-bash.patch" -) - -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/sdk_container/src/third_party/portage-stable/dev-libs/libverto/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libverto/metadata.xml index 53b04b18b7..a8ac1e8d61 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libverto/metadata.xml @@ -13,6 +13,5 @@ Support event loops using dev-libs/glib Support event loops using dev-libs/libev Support event loops using dev-libs/libevent - Support event loops using sys-libs/tevent