gentoo auto-resync : 29:05:2023 - 03:16:09

4 files changed, 51 insertions, 20 deletions

diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz
index 4048e4832f95..9b7769c0aa49 100644
--- a/gnustep-base/Manifest.gz
+++ b/gnustep-base/Manifest.gz
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index 65f44cf9e0e0..15dbafc3b5af 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -1,11 +1,12 @@
 AUX gnustep-base-1.26.0-no_compress_man.patch 1589 BLAKE2B 1c0096fe253c6cd0b61d09548941ddcd9de4d59fff9f6d902d613e15ba338f8434d77b8dd318d964a0e1dae0c84f850f617bb94b4c9aea490ebc282630afedac SHA512 68ab40d44eecbb8237dde1aec60a1482be4a78a591c145558c9278cef82ce3ffd4ec7584c7549c3adb247d352a8347cfac957e9b9ba28a592b2c784fa99c6114
 AUX gnustep-base-1.27.0-icu68.patch 875 BLAKE2B d622e9ee420a626f306b90239a2395153909328d31eeb656020848ffdcd9c154dcc43409477bcd88c06a1f8149fe47ebd5d8307ee0dfd427ebe9cd03445aaa41 SHA512 b4659bd5bcccbd2e1d30d4b3cf6f7040eb242aba6e62e2f411be35aa98c0f7df57a688e0314767770024fb315bcb6724749f9956dced6bcc58f46b00e66f0e95
 AUX gnustep-base-1.28.0-c99.patch 1719 BLAKE2B c81f0a1720b32dff11f2c7aa7da345b08a6c9c0d4776a3354d30f60601c0c0b2082b4616f08ff72d45813e87771a96acfdf3bde927014acdb36573125e978365 SHA512 2fcfaecddf1341ccaca593cf655184cda5a18263e3967356dfecacb5ee8fbe2158aeae6a2a2a9f5ee21e8172dceed076e7147f2d0e3787f8ad30e4d30c7eb3c1
+AUX gnustep-base-1.29.0-libxml2-2.11.patch 635 BLAKE2B 969c95cd6cacde55ff218389060308238d5a8306810db318543b30379255450050ff450e44b24a4024a0a37d04cf8116bec6fc869a4d1daf5c86bcdbc3232851 SHA512 a3a869f3270e56e9d8108d9e6fc9b18420f5e9e8ca84822d48e9ce1d4810ca23b866fcebcccaf22bff907f82c50e722ff3683df71a701a6e891f5bf80f693f5f
 DIST gnustep-base-1.27.0.tar.gz 4141163 BLAKE2B b27f7086949bcd5e43b8d6337c4f03eb87447baacb23de75b7df0d2ba769ff3e8cadd7035e78b35c91ccca83151cbe4b61b339aa265dcb53847089849b615f8b SHA512 bbdf45379dbb684f6bdb507b645e0f611cefb05caadff1bf620c2e85f104396cf91782bcce05ff2173078603b76b8a0ba2ea3b71bc56a84c220310910dbcb705
 DIST gnustep-base-1.28.0.tar.gz 4246622 BLAKE2B fdaa834ea3cb13b1d4717c2c7e6b59eff05d16e6a404ffed5f4ccfa2ee3db93ecfee5b95cc30be6a388f56fa28c67f1278ea298f222260dcc24abadaa1cb5e8f SHA512 e173fab28aa1b1df38de4216916db18934422a1d372b9fe6a68a6ff21b2ac0be38aa02631179a8ad62a4f2848080223f34771b364b1c0eebc96c84778677c50b
 DIST gnustep-base-1.29.0.tar.gz 3697809 BLAKE2B 9810e6220df79e75130e8e3cdda5d8c42e1e05351461920549e3163752eccc9fa4bb375c36a8b987877cf557140e961dda7e0fac1c1c9affdb38893567695ddf SHA512 19e876f32e4dce403beeb5522ae942c23cc2b947217a38fd045a495d81b3734a8cf160fb768d8cff64c45d8ae63ba422658f705519786016d3e8216efe0a044c
 EBUILD gnustep-base-1.27.0-r1.ebuild 1987 BLAKE2B 93e9e694294cefa39342d5576baabf951f01290f2e762a8ade2d784082c9c144ac1f32c83db0ea7a2dab0e45d0bd35371078f4746e26d081fe8bc93f68925850 SHA512 4da82b5769b8b6d79eaeab78a7eb1a8ee788c19d0840d9f37b48a4db5a0085c1b8a55b0d4da2f4204bb48a846d1cf376bf121aea9a1ff319d04235d7f3586d97
 EBUILD gnustep-base-1.28.0-r1.ebuild 2033 BLAKE2B 0e91b7a2e56e0b419f3f910a63eb81b68a3fb895a72f3bd921089fa5e16260b12892fa30591ac35df99441eeef739d545c7ac4643fa64ab9abee2535fffb5d33 SHA512 369ab6a2bd80f20cfb3823f0ee39aface6467ed7cc9de83ba180e1eeabd40aeaf44a2e4aeba9aefca84abc8cba9dce618f3c3e068053fca10638c77501f2feeb
 EBUILD gnustep-base-1.28.0-r2.ebuild 2063 BLAKE2B 326d93ade1ba1f9b7bcdf99d55be9d5aaa4485c4694448bdeb54f7396fbc55ec8d6501461228494a78f0a5d8e1fc866cbc0c684f0f9fab6d17cd0a52b3db8d77 SHA512 29ec53903c13b1863e945d2fa163480dd081c791856e2829c30dd37c68644a75652010133b9b4f774ec56e5f936d46b0d42fac28949eabaf81f7c9e86b038d75
-EBUILD gnustep-base-1.29.0.ebuild 2065 BLAKE2B 6ed8caf99e390ef74308001df7e2cd4ffea6baa57dbc0413d2260ea1f2ed5ff7d458e7d37b35093492eb1bf5cc7d4d72cd71b1b2f46cd146fe4538d357228ae8 SHA512 e09adf9458d62ff3ccfdcb2997a5a5c03db80af7db9c08960e1940f38a881f99083a235ebceefe8e76f38974d0bb2fe0d07ae7a1dbaf8a7ead8ac885702cd6f2
+EBUILD gnustep-base-1.29.0.ebuild 2025 BLAKE2B d148d6cc54143f39a915018eb68d4dbd9cb134e2562070a8a4ae2e99eac40fb813f2131bad12b3f20f6c5f9137f8fde6af31c6ef7aa06241b318b74b375f169f SHA512 0865a2dbbdcfbef37f1af1b253aa331a7aba6574c9a432d532c78772b9713c5cbdb26d4954c7b3f541f529d11515e7708cc305c2026a2b33a59495f21bd519c0
 MISC metadata.xml 340 BLAKE2B b3384c1d060004c669ad10ca3ac8045e4912548175ffe12e2c90c4a4cd2a60042925f28d16d49dd9393073d597e60a659b9ab7551dd5bc60eff9a7ee80884f76 SHA512 76586d0749461cfee32abec0c85d3ad4f39605c0cf92e90f293954f0d3b5fe024180964755ae884c3587e9bd4d9145b9dc13d5b6af9ec4dd93a6f78e038bde0a
diff --git a/gnustep-base/gnustep-base/files/gnustep-base-1.29.0-libxml2-2.11.patch b/gnustep-base/gnustep-base/files/gnustep-base-1.29.0-libxml2-2.11.patch
new file mode 100644
index 000000000000..84abdd59dc80
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/gnustep-base-1.29.0-libxml2-2.11.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/907226
+
+From 37913d006d96a6bdcb963f4ca4889888dcce6094 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Wed, 3 May 2023 13:49:09 +0200
+Subject: [PATCH] Fix GSXML compatibility with libxml2 v2.11.0
+
+Fixes #294.
+--- a/Source/Additions/GSXML.m
++++ b/Source/Additions/GSXML.m
+@@ -2671,10 +2671,12 @@ + (void) initialize
+                   return NULL;
+                 }
+               ret->owner = 1;
++#if LIBXML_VERSION < 21100
+               if (ret->checked == 0)
+                 {
+                   ret->checked = 1;
+                 }
++#endif
+             }
+         }
+     }
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.29.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.29.0.ebuild
index 6cdbc4653361..93fc96a1e08c 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.29.0.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.29.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit gnustep-base toolchain-funcs
 
 DESCRIPTION="A library of general-purpose, non-graphical Objective C objects"
@@ -18,45 +19,51 @@ RDEPEND="${GNUSTEP_CORE_DEPEND}
 	gnutls? ( net-libs/gnutls:= )
 	iconv? ( virtual/libiconv )
 	icu? ( >=dev-libs/icu-49.0:= )
-	!libffi? ( dev-libs/ffcall
-		gnustep-base/gnustep-make[-native-exceptions] )
 	libffi? ( dev-libs/libffi:= )
+	!libffi? (
+		dev-libs/ffcall
+		gnustep-base/gnustep-make[-native-exceptions]
+	)
 	>=dev-libs/libxml2-2.6
 	>=dev-libs/libxslt-1.1
 	>=dev-libs/gmp-4.1:=
 	>=sys-libs/zlib-1.2
 	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.26.0-no_compress_man.patch
+	"${FILESDIR}"/${PN}-1.29.0-libxml2-2.11.patch
 )
 
 src_configure() {
 	egnustep_env
 
-	local myconf
-	if use libffi ; then
-		myconf="--enable-libffi --disable-ffcall --with-ffi-include=$($(tc-getPKG_CONFIG) --variable=includedir libffi)"
-	else
-		myconf="--disable-libffi --enable-ffcall"
-	fi
+	local myconf=(
+		$(use_enable libffi)
+		$(use_enable !libffi ffcall)
+	)
+	use libffi &&
+		myconf+=( --with-ffi-include=$($(tc-getPKG_CONFIG) --variable=includedir libffi) )
 
-	myconf="$myconf $(use_enable gnutls tls)"
-	myconf="$myconf $(use_enable iconv)"
-	myconf="$myconf $(use_enable icu)"
-	myconf="$myconf $(use_enable zeroconf)"
-	myconf="$myconf --with-xml-prefix=${EPREFIX}/usr"
-	myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib"
-	myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf"
+	myconf+=(
+		$(use_enable gnutls tls)
+		$(use_enable iconv)
+		$(use_enable icu)
+		$(use_enable zeroconf)
+		--with-xml-prefix="${ESYSROOT}"/usr
+		--with-gmp-include="${ESYSROOT}"/usr/include
+		--with-gmp-library="${ESYSROOT}"/usr/$(get_libdir)
+		--with-default-config="${ESYSROOT}"/etc/GNUstep/GNUstep.conf
+	)
 
-	econf $myconf
+	econf "${myconf[@]}"
 }
 
 src_install() {
 	# We need to set LD_LIBRARY_PATH because the doc generation program
-	# uses the gnustep-base libraries.  Since egnustep_env "cleans the
+	# uses the gnustep-base libraries. Since egnustep_env "cleans the
 	# environment" including our LD_LIBRARY_PATH, we're left no choice
 	# but doing it like this.