gentoo resync : 29.12.2022

4 files changed, 100 insertions, 0 deletions

diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index ee928655eef4..d2b94110bde8 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,7 +1,10 @@
 AUX gloox-1.0.24-Makefile.patch 664 BLAKE2B cf2e193f4378f8bea9798053f61044037ae69710328836970f3f56770fb07504c901fa083e81b227d3ccf1b43434cf51ba86cd602a3d7929c7017614ac9be987 SHA512 e54676464e08e9ee4fe7a5e19fd5abfad8333ebafbabb31a99b326e7725733f6ee18ae65329461a4b5fe89b398a10415d518780da685a1bc728a76ef45b2c2e1
+AUX gloox-1.0.24-bashism-configure.patch 529 BLAKE2B eef0f671386ae33a81c0ae667330a9432cdf1351c5d71d07dd244f9e21d3da7f7c4d4cf9ef748d039ba2845bb2b7b4784b759c3ceacf0faa7fad0b1de95d3753 SHA512 6c9aea8282d30637cdc3f9cb01ee7d1b0578ded4316129ec141e8b6207ae12c0b4b123f8a5ac73a24a23375c70345e9fd95e30690ada2d3175a6113a387637f6
+AUX gloox-1.0.24-fix-gcc12-time.patch 483 BLAKE2B 96149086b679aa2be6bee8a854b14e50e618334dad26a22c6c20deb507e6f5fa695e7baf87f226be767eecd36a3d8bee5f9eb523a201bad12a5eb92fc78fec9f SHA512 0d54a8956a46d34de1efeb26b42662db095059d87e39e177560753f1971f3816442ac884a6699cab05ba0ee12bfac2395d812d46b471cd01b91aff1d05c72877
 AUX gloox-1.0.24-musl.patch 339 BLAKE2B e3cb58c64057fb991050544b4886827031b574ba95eea10eaffc8d49e741f69499aefa197995ce9525554f9079ce54ff4bf72634810bb1823133585198cd4b9d SHA512 d19dbd9f4e2db63b6b05a514357c6165900c4557de180a87691e815cf72f2a116b806854eef1060b08b30ffda0679956fd8d374f87a714be48b95bb32c388f68
 AUX gloox-1.0.24-pthread-link.patch 566 BLAKE2B 50437d74410f7f6992b3d2a191fe51ebb0346dfe0d36d2d8aa77404e132a9ced7bff3b680fb11ec697a8d4fab5c9f74c15cfd5322a0d6b84ea56afd371e1d936 SHA512 c1f1c0e52bc765c263e31b0c533ccae78184c418720b74541555b52e12c5283d691330f912aeed143e871313bfb6b3f725ee4258cfce6e5a3bc3f561ff9299a3
 AUX gloox-1.0.24-slibtool.patch 503 BLAKE2B c760faea8d4aaa9adb3d70494b55a0a327456f8976f8c017dd3326cde93147f126d9e53390e9b47c0555ae9a8a7bd0259cff8b0e86b4f845aef99222bf3c001e SHA512 bede6b41aa5695de8d7caff391eda0c75a2fbeffd0d3bc2a8e0cb943123283fca7519d4406c3d5f5db1585976dd84d2023554c7f5a42c74683fb38336d1f3904
 DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee
+EBUILD gloox-1.0.24-r1.ebuild 1459 BLAKE2B 87776f7fba6cf508b46b5489dc5a98375b0e81553e51e14227e046fa038c5fa2de5c8c14a0985234b79134d91da8d326b56c73e39b1a616e6851519ceecd5129 SHA512 dfc20149ab7c496e6a644727913102142a744e3629cd8a5033d78ed5cdd4a566f78cd3d9a8d0cc4337776d14f4d837b9c9684a63e551b118aa4c39b2bd087bdb
 EBUILD gloox-1.0.24.ebuild 1356 BLAKE2B f715cda112cf9a07be23d75f8a67c650c8ff181dae24c69143e2cfa033d575933657d46e4a119ed66b3a3396329f3d1dfe9f2ee58a0c905978963a17113f9004 SHA512 ae0b80b556a8aba9d1c75964b5ca5e23c7f6110d6cd289a8d0e53c1c41dadeb0b3b42778b0dc40a14ca4913e6626642df670b89792f9eb8a974bb813af9731d4
 MISC metadata.xml 254 BLAKE2B 6df9f9f117e6404d21549d2fcf1c42687a10067493455f5fae06939105c6907689c41ae0eb2adabadf662c22c40c0755624bbb3ea042794f9f197024ff3554ec SHA512 2f0148fc50acb99e01438869f0e7792a9d6b7b9591371d882592c372a4eeebff00c9410829006093ccb73fd00fefc0db4b7521975d41d86481aaa111e69e9711
diff --git a/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch b/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch
new file mode 100644
index 000000000000..a9e09f113bcc
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,7 @@ if test -z "`${CC} check_atomicbuiltins.c -o check_atomicbuiltins 2>&1`" ; then
+ 	HAVE_GCC_ATOMIC_BUILTINS=yes
+ 	AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS, 1, [Define to 1 if GCC atomic builtins are available])
+ 	AC_MSG_RESULT([yes])
+-	if test $cross_compiling == "yes"; then
++	if test $cross_compiling = "yes"; then
+ 		# Some platforms don't seem to be fully happy for libraries using GCC atomic builtins
+ 		#  unless -lgcc and -lgcc_s are explicitly included.
+ 		# (Errors like
diff --git a/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch b/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch
new file mode 100644
index 000000000000..dc0c4cd1aced
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/852182
+--- a/src/tests/tag/tag_perf.cpp
++++ b/src/tests/tag/tag_perf.cpp
+@@ -20,6 +20,7 @@ using namespace gloox;
+ #include <cstdlib>
+ #include <string>
+ #include <cstdio> // [s]print[f]
++#include <ctime>
+ 
+ #include <sys/time.h>
+ 
+--- a/src/tests/zlib/zlib_perf.cpp
++++ b/src/tests/zlib/zlib_perf.cpp
+@@ -24,6 +24,7 @@ using namespace gloox;
+ #include <string>
+ #include <sys/time.h>
+ #include <cstdio> // [s]print[f]
++#include <ctime>
+ 
+ #ifdef HAVE_ZLIB
+ 
diff --git a/net-libs/gloox/gloox-1.0.24-r1.ebuild b/net-libs/gloox/gloox-1.0.24-r1.ebuild
new file mode 100644
index 000000000000..4cef23c79743
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.24-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="${P/_/-}"
+DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
+HOMEPAGE="https://camaya.net/gloox/"
+SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+# Check upstream changelog: https://camaya.net/gloox/changelog/
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gnutls idn ssl static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	idn? ( net-dns/libidn:= )
+	gnutls? ( net-libs/gnutls:= )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.24-musl.patch"
+	"${FILESDIR}/${PN}-1.0.24-Makefile.patch"
+	"${FILESDIR}/${PN}-1.0.24-slibtool.patch"
+	"${FILESDIR}/${PN}-1.0.24-pthread-link.patch"
+	"${FILESDIR}/${PN}-1.0.24-bashism-configure.patch"
+	"${FILESDIR}/${PN}-1.0.24-fix-gcc12-time.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Examples are not installed anyway, so - why should we build them?
+	local myeconfargs=(
+		--without-examples
+		$(usex debug "--enable-debug" '')
+		$(use_enable static-libs static)
+		$(use_with idn libidn)
+		$(use_with gnutls)
+		$(use_with ssl openssl)
+		$(use_with test tests)
+		$(use_with zlib)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+}