gentoo auto-resync : 14:07:2022 - 19:40:39

8 files changed, 48 insertions, 7 deletions

diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz
index 8a176b7a03ad..e5fa0d3510a1 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 841dba9147a6..278fe2aafb30 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -3,5 +3,5 @@ AUX gnustep-base-1.27.0-icu68.patch 875 BLAKE2B d622e9ee420a626f306b90239a239515
 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
 EBUILD gnustep-base-1.27.0-r1.ebuild 2015 BLAKE2B 61fcc154d228ee5eb2d7d6038721ee348f9c2f8894902c970831ebc3ddb463e7395eda9bc086e7e9422c75f196d05cf8c552cc7ae4e1109cc6984bb5d61eec99 SHA512 a0280e17fcc21f408ec8e86ae9255681bbf3f1f206a338065846098d7d107db83d6aad4b67ed9b7ac94f6c034fe16c9c78b9a8f73e6fff41293fa1cc7f6655af
-EBUILD gnustep-base-1.28.0-r1.ebuild 1987 BLAKE2B cd41c21027669f1896081fa3d971fd580322091ccc3b2caf9d3cf07bbdd4c44197cda9b86032854894ffdaa8dd3f90caa44bd8388776b04bf83de0e6ac65be90 SHA512 e51ae09d951cbee436a22084f6a58a2b68af14a0d57e78c1dd83d891d3ed8793665689fd437d672754a034a9726d16f231fcc465ad0518b849c717594a96220b
+EBUILD gnustep-base-1.28.0-r1.ebuild 2061 BLAKE2B 42c3a66633df78100e61a39b98fd4e52656cd9e0052655c7110aafce99f408cab8f91661231632b7f3f6ef24cb6081602faf77e76c3ba3de6e3ccea973a3d9de SHA512 ac245bb3138dadeb852c1a2f0104931316cc7dcc6b7feefb652e0065e54ddbe7b0cfa09b695e4707d5e0fd05bb4584548cef54d49aeb48392e133bee7df4432a
 MISC metadata.xml 764 BLAKE2B c06e433d8900af16d4044465c1576d7ba4aadc3dd44d96a70f5e2d523008518506d754a72a05d6993546d19df7653c62012b6935b41abeb3b1936311e070a5ad SHA512 8d0e798c01bb9ca747d75e64497e4db478a66950001eba8deaad2425ac40927d13a791227d7a4b9b6fabd045c6fe6df042ff3e6625c754c93d555799030350bb
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.28.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.28.0-r1.ebuild
index 8a246c6ba767..13d4cb7f7860 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.28.0-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.28.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,11 +11,12 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="+gnutls +icu +libffi zeroconf"
+IUSE="+gnutls +iconv +icu +libffi zeroconf"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
 	>=gnustep-base/gnustep-make-2.6.0
 	gnutls? ( net-libs/gnutls:= )
+	iconv? ( virtual/libiconv )
 	icu? ( >=dev-libs/icu-49.0:= )
 	!libffi? ( dev-libs/ffcall
 		gnustep-base/gnustep-make[-native-exceptions] )
@@ -43,6 +44,7 @@ src_configure() {
 	fi
 
 	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"
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 4793703594f7..01be2e5defd9 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,7 +1,8 @@
 AUX gnustep-5.csh 348 BLAKE2B 5a53bd83fffbba5db434c90c1b527cf32697b87ad51bf4abdaf09a843a211c4c52b81c2d2d65772847f1d5eb16e82a2561b6d24fde1efb7709766315261e8a9c SHA512 6345bd8559ead4e8433f9e7d3f85412b4cd155188a8daffb6c99c00257c1a5af89fd492fde53e819b887be19f4ebbdb09ae74428fe492c39256a6b476f073209
 AUX gnustep-5.sh 359 BLAKE2B 2df675c570e6343b3303cb3c82e0eb6c6fe60f842fe61297b147acca485df93b8a5a5ecc235b0e3a9854c0fb25cb06c2fcac34ee75933157fc8c230ac94ca843 SHA512 ceb39b583e7583bc6715723878eff1c06685b4786c9607f3ef581ef230a755efd80c7b18202458d4af54bac01c0ff2f5cec443d8c87639c6cdffc7604bb07700
+AUX gnustep-make-2.9.0-no_compress_man_pages.patch 2216 BLAKE2B 7cf3ccc8e0587c5f06df6410252023b7913b32a1977f87c71dc649d830d3564bb0a617090c8e6db71de2ecedb03eae9b034b0a82ac6a703255fcb83cd228a58a SHA512 e986d0bba2f89cc6152ec399b08ca5c23721329e43222dcfd5e1283ae8bf45048a5033d1a3ecdf1eb48293418fec7e21ccea459e19340ce4e09f7e6127448e77
 DIST gnustep-make-2.8.0.tar.gz 606337 BLAKE2B b4defb8fdd8fc17ce2ac14c7d3d63b85e817bb639b7c1ae6a150baf74cda222ac046d890e677b50398bb9953e1496a98e9eb542809c961243f4f620276ab13fb SHA512 e9e57ed7a1c360c2dbf17f70d38e5107a1a9613842dcc645f10ed7a01eb9f9ee71bd2d0cacbe00439ce73f194a3eb3ed2e71409241ac96ee3bba704dcf6dfd7b
 DIST gnustep-make-2.9.0.tar.gz 611406 BLAKE2B 73bae19b5d3d3c1e069d22ce7087308166f632277d870fa5ab125d5bc004a1518a1edb6822c61e00b98fc13a1b3354440024bd13d98662002c15298745c4e935 SHA512 ff185affe32d4efc2009d72a3862bc3bffebce05ea5a7fdfbf4372774e57b6654863e317ce648c248716dd3e97a4320d697a313e7eefd04f5723186be6cbf1e3
 EBUILD gnustep-make-2.8.0.ebuild 3669 BLAKE2B 3e138297504eb90c7a232bef734000e46bead1f3fe2d335a768f27497450c56cb81a20b942b25c1e44bd5c3edc3d040431570eef927e5010d90e4369dc5bdc40 SHA512 1ca02c3d8046baf58df51f9a771cbffb87ace3067d8c9ba1e7a034ee513ef867038051ec35ab05a9038c16b70a9fe9efb3b871bc4eb3e9cc78649d901a062859
-EBUILD gnustep-make-2.9.0.ebuild 3674 BLAKE2B a4edce5131553665613df39de98182598cb871605540781f6219cf310a3b7e7de5a5b411a9033257b906b430f7f00771156f0829b57f37c815ccadb1ee2a7291 SHA512 6d2e44d29f3ef244a01d9d8d2be2a7ae7ae28142fe04ec578d956a7ba631a84f7b381530f863a51731686d5c7ccfa47d9d9f1f0e25a46091e789c5b556c538d7
+EBUILD gnustep-make-2.9.0.ebuild 3734 BLAKE2B c22f08fa0cf3a2226fdcc929115759f2bb9e39ee8058bf4bc898eca73f94dfb21508628b7f5b3a47aa98e652a9fe95ce109f8b9b1c3b39cd5121f0c7494bf3ed SHA512 91f73b5010c29a1fb3514b8ddfdd0282b90c8c29e515331fbe0ae5fd64a9963e11f71459a86afc618f69fb417eaa725474b95f5f4cffbceb84577b02c0da2a77
 MISC metadata.xml 992 BLAKE2B 9080bcf4934cee4e7f6efe7a7875a830e5a693a2174a1eb8d1134fd5fb8f17e8962e47f151cfa7b080af1734dcc9f2e1b8ce4fd7532d91ede58409449e803274 SHA512 746eaa9497ea688ac9549dc0f14693f34bde4906c8df9a5e6e3a863b98c18e965bd1943effaa637eace6cf05adfae11ad376c2fd7b738a8e2563dd51b60b6641
diff --git a/gnustep-base/gnustep-make/files/gnustep-make-2.9.0-no_compress_man_pages.patch b/gnustep-base/gnustep-make/files/gnustep-make-2.9.0-no_compress_man_pages.patch
new file mode 100644
index 000000000000..c013ce3a282c
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep-make-2.9.0-no_compress_man_pages.patch
@@ -0,0 +1,29 @@
+diff -Naur gnustep-make-2.9.0.orig/GNUmakefile.in gnustep-make-2.9.0/GNUmakefile.in
+--- gnustep-make-2.9.0.orig/GNUmakefile.in	2021-03-21 22:56:13.000000000 +0100
++++ gnustep-make-2.9.0/GNUmakefile.in	2022-07-14 14:21:10.545943581 +0200
+@@ -255,23 +255,16 @@
+ 	   for f in $(TEST_FRAMEWORK_FILES); do \
+ 	     $(INSTALL_DATA) "$(srcdir)/TestFramework/$$f" "$(testdir)"; \
+ 	   done)
+-	$(EC)(echo "Installing (and compressing) manpages"; \
++	$(EC)(echo "Installing manpages"; \
+ 	  "$(srcdir)/mkinstalldirs" "$(mandir)/man1" \
+ 	                          "$(mandir)/man7"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/debugapp.1" "$(mandir)/man1"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/debugapp.1.gz" && gzip -9 -n "$(mandir)/man1/debugapp.1"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/gnustep-config.1" "$(mandir)/man1"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/gnustep-config.1.gz" && gzip -9 -n "$(mandir)/man1/gnustep-config.1"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/gnustep-tests.1" "$(mandir)/man1"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/gnustep-tests.1.gz" && gzip -9 -n "$(mandir)/man1/gnustep-tests.1"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/openapp.1" "$(mandir)/man1"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/openapp.1.gz" && gzip -9 -n "$(mandir)/man1/openapp.1"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/opentool.1" "$(mandir)/man1"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/opentool.1.gz" && gzip -9 -n "$(mandir)/man1/opentool.1"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/GNUstep.7" "$(mandir)/man7"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man7/GNUstep.7.gz" && gzip -9 -n "$(mandir)/man7/GNUstep.7"; \
+-	  $(INSTALL_DATA) "$(srcdir)/Documentation/library-combo.7" "$(mandir)/man7"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man7/library-combo.7.gz" && gzip -9 -n "$(mandir)/man7/library-combo.7")
++	  $(INSTALL_DATA) "$(srcdir)/Documentation/library-combo.7" "$(mandir)/man7";)
+ 	$(EC)(if [ "@GNUSTEP_STRIP_MAKEFILES@" = "strip" ]; then \
+ 	   echo "Stripping makefiles and shell scripts..."; \
+ 	   cd "$(makedir)"; ./strip_makefiles.sh; \
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
index 3657bdcd66fa..d50df165f623 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,8 @@ DEPEND="${GNUSTEP_CORE_DEPEND}
 		) )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-no_compress_man_pages.patch )
+
 pkg_setup() {
 	# Determine libobjc.so to use
 	if use libobjc2; then
diff --git a/gnustep-base/gnustep-updater/Manifest b/gnustep-base/gnustep-updater/Manifest
index 6da86f08eb99..e9519d0d9799 100644
--- a/gnustep-base/gnustep-updater/Manifest
+++ b/gnustep-base/gnustep-updater/Manifest
@@ -1,3 +1,3 @@
 DIST gnustep-updater-0.3.tar.bz2 3685 BLAKE2B df4d4e54243e0ffaa2ba28c71eefb7107b1cec59574f69ba4587a76a759d33d68c4d06250160b97814ef2c00e6e628664c30c760ad1fc3c9ac0c035451b5520a SHA512 079b51c54a7860c4eea65ffc63172ea69e88de4a34f2ca0d0c5ad3a1342ea37ee69edb107f287f04d33c3ee03658edd5386d1323f47e9bc201bc70d68d0c9c4b
-EBUILD gnustep-updater-0.3-r1.ebuild 585 BLAKE2B 6ac357b7e24d67460399ae725bf4afbe7dc111efad38aad0ddd64b7d33aed570f2c12d1dc132f6356609e6e2c902ec483ac7326b1345c983310838874c7bc915 SHA512 a244e13fa093a405ff7dc6b3bb43e5d4b93ef85936441e7a56aeeeda28e5de434f663c0ea73fccecd0719a0f7b8026e9bf7fa08772fff84b3c4d18434b281575
+EBUILD gnustep-updater-0.3-r1.ebuild 707 BLAKE2B 2b3a01c52eda0ea08f9e7d3a489f3906a99255c9c1503de3eabfe74bcef016e387ed846c87195f18a26627bc60b4482965ba9eef36b75acd2bc4fbae43bfd431 SHA512 939b3916c97b9b6e8e23401649d3cd09c858d2847d4adae107c3476ab4f32c78ea8c8461dc2aeeb8b2171e4dfe20070577c9eaa5400a12b73f90040121e546ea
 MISC metadata.xml 258 BLAKE2B 2d5066672e93f52c887e0733cf4d05470fafb0128f75c44259fd046360f67f2d9571ddd143a8f6352477c39bacd8fcf6e1d8b6554b623a64fa230d4f3ed90653 SHA512 490a494189a1a1826ef34c2997b7032f80527568f07eecd4aabcc343aa8c7c142ea5423e1f874f288177aee6058e5342ae5805b644e15be12fa8bb280a43e905
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
index c03c159ce0b4..fdf837fd0ec1 100644
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
+++ b/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,13 @@ RDEPEND="app-misc/pax-utils
 	>=gnustep-base/gnustep-make-2.6.0"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+
+	sed -e "s#/etc/init.d/functions.sh#/lib/gentoo/functions.sh#" \
+		-i gnustep-updater || die
+}
+
 src_install() {
 	dosbin gnustep-updater
 	doman gnustep-updater.1