gentoo auto-resync : 15:06:2023 - 13:38:09

3 files changed, 98 insertions, 3 deletions

diff --git a/dev-libs/libmacaroons/Manifest b/dev-libs/libmacaroons/Manifest
index 2ecd389cb1f9..a2a72d46887b 100644
--- a/dev-libs/libmacaroons/Manifest
+++ b/dev-libs/libmacaroons/Manifest
@@ -1,4 +1,5 @@
 AUX libmacaroons-0.3.0-json-c.patch 832 BLAKE2B dce0d7ef4be20972a1da7b218d7f66372e25b77d307cd18bc7d70a2893ae0fac8d97e3d71ea83882ce408b642244deb78a92a86035e81047dab07e4e3057e18c SHA512 c258effe1bd9eed548350a066352f358795de16a6dd04be32422874b602226f18114e91a51d803309433bb08d404ece9022dfe68c73de719264aa9665688b6f7
+AUX libmacaroons-0.3.0-no-python.patch 3435 BLAKE2B d1a437bf274db13a04dc73599bebb24c0e8d9d99ea2eec90edd8130a02ccd9efcb2a4c9900b0fa76c9920a6dbb183f8290166ad4de7a921530aec39dd4f2523d SHA512 216c127c1dd7030f42524b2850058f37e73b5ee10a1a19bb82ae032a321684cf77b97e816e1032fa96ec890361dda5256720a314063ffb91fcf7f58931fa75f0
 DIST libmacaroons-0.3.0.tar.gz 47762 BLAKE2B 69371bb69262a88c736121861d9b136fa444b912d2c3a5d603c5897c8af85e9f4af6a6733e35c126ea44c97cfdd1359e1f41ee97452fa7275850769f2134d825 SHA512 79ae2e515bd673949bc1338f06f5f811a0e853ca61ff995bb4cddaf95e5297e77b012c9975b0bb0dba96520b9a24619a4593e3722e64610f1147e131f8c96de0
-EBUILD libmacaroons-0.3.0.ebuild 763 BLAKE2B efb054789e066ef5d665cb3915ae819be3dc1ee6f8e8d01c18d985b27418f2db35810d395534211a241155f52078fa4aa4f74fc8f59c4e5aa4faa0208b4b9313 SHA512 10140b22704e0ad6e8fc3dac49a7e87d64ac295473a4d060dbf5463ca5fd0ddf81942af100068c628804c66abfcba97efa9382dc0bc64a2b0b4055033e7490f1
+EBUILD libmacaroons-0.3.0-r1.ebuild 776 BLAKE2B 71efa358508ca0a3195ac48e4c2ef85144396fedda1aa5553589d437f02378637fde8d79535af9c264044f9957c258686b87536c5baf057c67bad9b57de4401f SHA512 5e2d826ebc923f5298e09ce8503208f84f28434b91ff7f9db5e62b1dabee59a71a6cd48cb151dad567285a542baddb111c99fbb270a7f1426e144bf7d760e797
 MISC metadata.xml 664 BLAKE2B 94ec73791cac9442622243a129d918336340e74768e7c7342cfed73227236fb3a05ad3051b2d76c0daeac5928d3b7a87ddf3b43bdb856ed069609ab3ae0a9129 SHA512 4ddd1a7e9981d50de6737734d7f0708450c4f36949bc3ec43c5c3b0b7da56b2e3f40d3e15edd489f347ad7599d232549904268e8b4a87ff9f4826d948ca1c295
diff --git a/dev-libs/libmacaroons/files/libmacaroons-0.3.0-no-python.patch b/dev-libs/libmacaroons/files/libmacaroons-0.3.0-no-python.patch
new file mode 100644
index 000000000000..89293b707bd0
--- /dev/null
+++ b/dev-libs/libmacaroons/files/libmacaroons-0.3.0-no-python.patch
@@ -0,0 +1,91 @@
+
+  Disable Python by force (works only with Python 2.x).
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -30,13 +30,8 @@ AM_CPPFLAGS = $(SODIUM_CFLAGS)
+ AM_CFLAGS   = -fvisibility=hidden $(SODIUM_CFLAGS) $(WANAL_CFLAGS)
+ AM_CXXFLAGS = -fvisibility=hidden -fvisibility-inlines-hidden $(SODIUM_CFLAGS) $(WANAL_CXXFLAGS)
+ 
+-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-python-bindings
+ TESTS_ENVIRONMENT = . $(abs_top_srcdir)/test/env.sh "${abs_top_srcdir}" "${abs_top_builddir}" "${VERSION}";
+ 
+-pyx_verbose = $(pyx_verbose_$(V))
+-pyx_verbose_ = $(pyx_verbose_$(AM_DEFAULT_VERBOSITY))
+-pyx_verbose_0 = @echo "  PYX   " $@;
+-
+ EXTRA_DIST  =
+ EXTRA_DIST += README
+ EXTRA_DIST += LICENSE
+@@ -57,39 +52,3 @@ libmacaroons_la_LDFLAGS = -version-info 0:1:0
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libmacaroons.pc
+-
+-##################################### Tests ####################################
+-
+-EXTRA_DIST += test/env.sh
+-EXTRA_DIST += test/python-hmac-sanity-check
+-EXTRA_DIST += test/python-hmac-sanity-check.sh
+-EXTRA_DIST += test/readme.sh
+-
+-TESTS  =
+-TESTS += test/python-hmac-sanity-check.sh
+-#TESTS += test/readme.sh
+-
+-#################################### Python ####################################
+-
+-pyexec_LTLIBRARIES =
+-if ENABLE_PYTHON_BINDINGS
+-pyexec_LTLIBRARIES += bindings/python/macaroons.la
+-endif
+-
+-EXTRA_DIST += bindings/python/macaroons.pyx
+-
+-bindings_python_macaroons_la_SOURCES = bindings/python/macaroons.c
+-bindings_python_macaroons_la_CPPFLAGS =
+-bindings_python_macaroons_la_CPPFLAGS += $(PYTHON_CPPFLAGS)
+-bindings_python_macaroons_la_CPPFLAGS += $(AM_CPPFLAGS)
+-bindings_python_macaroons_la_CPPFLAGS += $(CPPFLAGS)
+-bindings_python_macaroons_la_CFLAGS =
+-bindings_python_macaroons_la_CFLAGS += -fvisibility=default
+-bindings_python_macaroons_la_CFLAGS += -fno-strict-aliasing
+-bindings_python_macaroons_la_CFLAGS += $(CFLAGS)
+-bindings_python_macaroons_la_LIBADD =
+-bindings_python_macaroons_la_LIBADD += libmacaroons.la
+-bindings_python_macaroons_la_LIBADD += $(PYTHON_LDFLAGS)
+-bindings_python_macaroons_la_LDFLAGS = -module -avoid-version -export-symbols-regex initmacaroons $(AM_LDFLAGS) $(LDFLAGS)
+-bindings/python/macaroons.c: bindings/python/macaroons.pyx
+-	$(pyx_verbose)cython bindings/python/macaroons.pyx
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,6 @@ m4_define([serial_tests], [
+ ])
+ AM_INIT_AUTOMAKE(foreign serial_tests subdir-objects dist-bzip2)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-AM_PATH_PYTHON([2.6])
+ LT_PREREQ([2.2])
+ LT_INIT
+ AC_CONFIG_SRCDIR([macaroons.h])
+@@ -35,13 +34,6 @@ AC_TYPE_SIZE_T
+ # Checks for library functions.
+ 
+ # Optional components
+-AC_ARG_ENABLE([python_bindings], [AS_HELP_STRING([--enable-python-bindings],
+-              [build Python bindings @<:@default: no@:>@])],
+-              [python_bindings=${enableval}], [python_bindings=no])
+-if test x"${python_bindings}" = xyes; then
+-    AC_PYTHON_DEVEL([>= '2.6'])
+-fi
+-
+ AC_ARG_ENABLE([json_support], [AS_HELP_STRING([--enable-json-support],
+               [enable support for JSON macaroons @<:@default: no@:>@])],
+               [json_support=${enableval}], [json_support=no])
+@@ -69,7 +61,6 @@ Please install libjson to continue.
+ ----------------------------------------])])
+ fi
+ 
+-AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS], [test x"${python_bindings}" = xyes])
+ AM_CONDITIONAL([ENABLE_JSON_SUPPORT], [test x"${json_support}" = xyes])
+ 
+ AH_BOTTOM([#include <custom-config.h>])
diff --git a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild b/dev-libs/libmacaroons/libmacaroons-0.3.0-r1.ebuild
index a5e65f40f211..71fbf928561c 100644
--- a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild
+++ b/dev-libs/libmacaroons/libmacaroons-0.3.0-r1.ebuild
@@ -22,7 +22,10 @@ BDEPEND=""
 
 S="${WORKDIR}"/${PN}-releases-${PV}
 
-PATCHES=( "${FILESDIR}"/${P}-json-c.patch )
+PATCHES=(
+		"${FILESDIR}"/${P}-json-c.patch
+		"${FILESDIR}"/${P}-no-python.patch
+)
 
 src_prepare() {
 	default
@@ -30,7 +33,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-python-bindings --enable-json-support
+	econf --enable-json-support
 }
 
 src_install() {