gentoo resync : 25.11.2020

5 files changed, 118 insertions, 2 deletions

diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 5d64eb306df1..5e0d9730a736 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,3 +1,7 @@
+AUX gloox-1.0.24-Makefile.patch 664 BLAKE2B cf2e193f4378f8bea9798053f61044037ae69710328836970f3f56770fb07504c901fa083e81b227d3ccf1b43434cf51ba86cd602a3d7929c7017614ac9be987 SHA512 e54676464e08e9ee4fe7a5e19fd5abfad8333ebafbabb31a99b326e7725733f6ee18ae65329461a4b5fe89b398a10415d518780da685a1bc728a76ef45b2c2e1
+AUX gloox-1.0.24-musl.patch 339 BLAKE2B e3cb58c64057fb991050544b4886827031b574ba95eea10eaffc8d49e741f69499aefa197995ce9525554f9079ce54ff4bf72634810bb1823133585198cd4b9d SHA512 d19dbd9f4e2db63b6b05a514357c6165900c4557de180a87691e815cf72f2a116b806854eef1060b08b30ffda0679956fd8d374f87a714be48b95bb32c388f68
 DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
+DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee
 EBUILD gloox-1.0.22.ebuild 1124 BLAKE2B 5dd191732bd7ee3c09bbb262189a5ad2d6fe73a4f6fa8834f804072771a5e3624f4504a1678b02fa8c3957502d7187a7832dfcabc878409a9c6f6f15dec6f65d SHA512 a12832ab6146e042f88bedab8c53ad683c46379fde248f61da2d103b90e06977d27ad32fded46eeb32fca873e156ad5b794c0e126110e76cc3bad594dbdcf2c6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD gloox-1.0.24.ebuild 1327 BLAKE2B c0ea949018b1ea4cc27d7f71dd63160f6f85bd51b1e8e2be1547ebacabc21bf56cf5569e2879097f354a4f354e1f07fed1f72c10fcf2d996632921838c4ad4f5 SHA512 d0e22822f288c91e0f938b4b41ceb06fc944700777bbbe73e8ff8ef18e432db1130abcfba8ae90ba3b9ec8f4f83436533c19997c484966eb2a34eafd3a781a1a
+MISC metadata.xml 253 BLAKE2B d71cef1027d455987adc9c6421216c7c2c1db2615b0e7beeb8e8ea22fb64f1d6da1067363164f9d4d970af759d9a71be31eb55890a6bba420efb09efbe917c66 SHA512 4a632f8fe7d7808076ecc07be60de72762423ecea35ef546a6e2b0a15eb90c018e1ab06c5169b1b5613451049965bd8d3a4ad6cf898845f6a871b46135f8d186
diff --git a/net-libs/gloox/files/gloox-1.0.24-Makefile.patch b/net-libs/gloox/files/gloox-1.0.24-Makefile.patch
new file mode 100644
index 000000000000..40fed6900f0d
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-Makefile.patch
@@ -0,0 +1,36 @@
+Call make with the current instance if possible.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,12 +17,12 @@ apidox:
+ check: test
+ 
+ test:
+-	make -C src test
++	$(MAKE) -C src test
+ 
+ leakcheck: leaktest
+ 
+ leaktest:
+-	make -C src leaktest
++	$(MAKE) -C src leaktest
+ 
+ includetest:
+-	make -C src includetest
++	$(MAKE) -C src includetest
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -117,12 +117,12 @@ noinst_HEADERS = config.h prep.h dns.h nonsaslauth.h mucmessagesession.h stanzae
+ EXTRA_DIST = version.rc
+ 
+ test:
+-	make -C tests test
++	$(MAKE) -C tests test
+ 
+ check: test
+ 
+ leaktest:
+-	make -C tests leaktest
++	$(MAKE) -C tests leaktest
+ 
+ leakcheck: leaktest
+ 
diff --git a/net-libs/gloox/files/gloox-1.0.24-musl.patch b/net-libs/gloox/files/gloox-1.0.24-musl.patch
new file mode 100644
index 000000000000..041841ef345e
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-musl.patch
@@ -0,0 +1,13 @@
+https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/gloox/patches/gloox-musl.patch
+https://bugs.gentoo.org/713224
+--- a/src/connectiontcpserver.cpp
++++ b/src/connectiontcpserver.cpp
+@@ -51,7 +51,7 @@
+ #endif
+ 
+ #include <cstdlib>
+-#include <string>
++#include <string.h>
+ 
+ #ifndef _WIN32_WCE
+ # include <sys/types.h>
diff --git a/net-libs/gloox/gloox-1.0.24.ebuild b/net-libs/gloox/gloox-1.0.24.ebuild
new file mode 100644
index 000000000000..e7a34c9e3dc3
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.24.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 libressl ssl static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	idn? ( net-dns/libidn:= )
+	gnutls? ( net-libs/gnutls:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.24-musl.patch"
+	"${FILESDIR}/${PN}-1.0.24-Makefile.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
+}
diff --git a/net-libs/gloox/metadata.xml b/net-libs/gloox/metadata.xml
index 6f49eba8f496..f9695bd1f37a 100644
--- a/net-libs/gloox/metadata.xml
+++ b/net-libs/gloox/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<changelog>https://camaya.net/gloox/changelog/</changelog>
+	</upstream>
 </pkgmetadata>