[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu-layoutex/, dev-libs/icu-layoutex/files/

["Sam James" <sam@gentoo.org>]

commit:     896413d538362d1b621eadec054033d6549198b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 11 00:54:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 00:54:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=896413d5

dev-libs/icu-layoutex: undo Requires change in .pc file

Like in 5de097998a3ed84e9af43fce547aa143b5e61c14.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...youtex-76.1-undo-pkgconfig-change-for-now.patch | 30 ++++++++++++++++++++++
 ...tex-76.1.ebuild => icu-layoutex-76.1-r1.ebuild} |  8 +++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch b/dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch
new file mode 100644
index 000000000000..b99557871bc0
--- /dev/null
+++ b/dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch
@@ -0,0 +1,30 @@
+https://github.com/chimera-linux/cports/blob/master/main/icu/patches/pc.patch
+
+"""
+for some reason enable-shared only emits a requires.private here now and things
+underlink icu-uc libs when using other icu libs, even though the deps are correct
+this is https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56 ,
+consumers probably have to be explicit about -i18n -uc use now instead of it
+being implicit, but just undo .private for now
+"""
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -290,7 +290,7 @@
+ ifeq ($(ENABLE_SHARED),)
+ 	@echo "Requires: icu-uc" >> $@
+ else
+-	@echo "Requires.private: icu-uc" >> $@
++	@echo "Requires: icu-uc" >> $@
+ endif
+ 	@echo "Libs:" '-L$${libdir}' "${ICULIBS_I18N}" >> $@
+ 	@echo $@ updated.
+@@ -302,7 +302,7 @@
+ ifeq ($(ENABLE_SHARED),)
+ 	@echo "Requires: icu-i18n" >> $@
+ else
+-	@echo "Requires.private: icu-i18n" >> $@
++	@echo "Requires: icu-i18n" >> $@
+ endif
+ 	@echo "Libs:" '-L$${libdir}' "${ICULIBS_IO}" >> $@
+ 	@echo $@ updated.
+

diff --git a/dev-libs/icu-layoutex/icu-layoutex-76.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild
similarity index 93%
rename from dev-libs/icu-layoutex/icu-layoutex-76.1.ebuild
rename to dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild
index fe8903689de5..386834c67bb3 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-76.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild
@@ -34,7 +34,13 @@ BDEPEND="
 	verify-sig? ( >=sec-keys/openpgp-keys-icu-20241110 )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-76.1-remove-bashisms.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-76.1-remove-bashisms.patch"
+
+	# Undo change for now which exposes underlinking in consumers;
+	# revisit when things are a bit quieter and tinderbox its removal.
+	"${FILESDIR}/${PN}-76.1-undo-pkgconfig-change-for-now.patch"
+)
 
 src_prepare() {
 	default