commit: 1a720b41737ae88adc368418b296bcd26a0eb742 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jan 7 14:20:19 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 7 14:20:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a720b41
dev-libs/libverto: fix runtime breakage with non-bash Thanks-to: Nick Bowler <nbowler <AT> draconx.ca> Closes: https://bugs.gentoo.org/762823 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libverto/files/libverto-0.3.1-non-bash.patch | 133 +++++++++++++++++++++ ...verto-0.3.1.ebuild => libverto-0.3.1-r1.ebuild} | 10 +- 2 files changed, 140 insertions(+), 3 deletions(-) diff --git a/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch b/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch new file mode 100644 index 00000000000..df7162e21a7 --- /dev/null +++ b/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch @@ -0,0 +1,133 @@ +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/dev-libs/libverto/libverto-0.3.1.ebuild b/dev-libs/libverto/libverto-0.3.1-r1.ebuild similarity index 90% rename from dev-libs/libverto/libverto-0.3.1.ebuild rename to dev-libs/libverto/libverto-0.3.1-r1.ebuild index 8ea4ef46aa1..6964058d33d 100644 --- a/dev-libs/libverto/libverto-0.3.1.ebuild +++ b/dev-libs/libverto/libverto-0.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,6 +13,7 @@ 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}] ) @@ -21,10 +22,13 @@ DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) RDEPEND="${DEPEND}" -REQUIRED_USE="|| ( glib libev libevent tevent ) " - 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
