commit: bff16df36f5703e8e0407fc4e12b9614dc29a37a Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Sun Jul 27 17:34:28 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Sun Jul 27 17:34:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff16df3
dev-libs/icu-layoutex: treeclean Closes: https://bugs.gentoo.org/956106 (pkgremoved) Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-libs/icu-layoutex/Manifest | 2 - .../files/icu-layoutex-76.1-remove-bashisms.patch | 151 --------------------- ...youtex-76.1-undo-pkgconfig-change-for-now.patch | 30 ---- dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild | 141 ------------------- dev-libs/icu-layoutex/metadata.xml | 11 -- metadata/stabilization-groups/icu.group | 1 - profiles/package.mask | 1 - 7 files changed, 337 deletions(-) diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest deleted file mode 100644 index 54488cbffd2b..000000000000 --- a/dev-libs/icu-layoutex/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST icu4c-76_1-src.tgz 27437767 BLAKE2B 67223391123d2d2c75107fc4b87510b1d8d520301a863032951b894366ec8b414692ee3fa2acd652289b0ae2f60946d71bf9ca21ed87de40825e2fd02634c658 SHA512 b702ab62fb37a1574d5f4a768326d0f8fa30d9db5b015605b5f8215b5d8547f83d84880c586d3dcc7b6c76f8d47ef34e04b0f51baa55908f737024dd79a42a6c -DIST icu4c-76_1-src.tgz.asc 228 BLAKE2B 37a058e22da5ad122e3df6de2cb3979fa734b32e4e81d91201d2095fbf20ef2dbcba4579efab3041193e49c388d09618c965ddf082a8362aa82b694184804fa7 SHA512 c4bd81d4e98d7e37a6ba9540748c4ce1eb740d70bd689a13e2e51da76503b6e0287afd4d1cd3af4540210f37626dec998fcbd7269976cb801f238b789e604489 diff --git a/dev-libs/icu-layoutex/files/icu-layoutex-76.1-remove-bashisms.patch b/dev-libs/icu-layoutex/files/icu-layoutex-76.1-remove-bashisms.patch deleted file mode 100644 index 62bb3221116f..000000000000 --- a/dev-libs/icu-layoutex/files/icu-layoutex-76.1-remove-bashisms.patch +++ /dev/null @@ -1,151 +0,0 @@ ---- a/config/icu-config-bottom -+++ b/config/icu-config-bottom -@@ -218,65 +218,65 @@ - ;; - - --cflags) -- echo $ECHO_N "${CFLAGS} ${ECHO_C}" -+ printf "%s" "${CFLAGS} " - ;; - - --cc) -- echo $ECHO_N "${CC} ${ECHO_C}" -+ printf "%s" "${CC} " - ;; - - --cxx) -- echo $ECHO_N "${CXX} ${ECHO_C}" -+ printf "%s" "${CXX} " - ;; - - --cxxflags) -- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" -+ printf "%s" "${CXXFLAGS} " - ;; - - --cppflags) - # Don't echo the -I. - it's unneeded. -- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' -+ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' - ;; - - --cppflags-searchpath) -- echo $ECHO_N "-I${prefix}/include ${ECHO_C}" -+ printf "%s" "-I${prefix}/include " - ;; - - --cppflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCPPFLAGS} " - ;; - - --cxxflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCXXFLAGS} " - ;; - - --cflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCFLAGS} " - ;; - - --ldflags-system) -- echo $ECHO_N "${LIBS} ${ECHO_C}" -+ printf "%s" "${LIBS} " - ;; - - --ldflags) -- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" -+ printf "%s" "${LDFLAGS} ${ICULIBS} " - # $RPATH_LDFLAGS - ;; - - --ldflags-libsonly) -- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" -+ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " - ;; - - --ldflags-icuio) -- echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}" -+ printf "%s" " ${ICULIBS_ICUIO} " - ;; - - --ldflags-obsolete) -- echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}" -+ printf "%s" "${ICULIBS_OBSOLETE} " - ;; - - --ldflags-toolutil) -- echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}" -+ printf "%s" " ${ICULIBS_TOOLUTIL} " - ;; - - --ldflags-layout) -@@ -285,7 +285,7 @@ - ;; - - --ldflags-searchpath) -- echo $ECHO_N "-L${libdir} ${ECHO_C}" -+ printf "%s" "-L${libdir} " - ;; - - --detect-prefix) -@@ -321,47 +321,47 @@ - ;; - - --shared-datadir) -- echo $ECHO_N "${datadir} ${ECHO_C}" -+ printf "%s" "${datadir} " - ;; - - --incfile) -- echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}" -+ printf "%s" "${pkglibdir}/Makefile.inc " - ;; - - --incpkgdatafile) -- echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}" -+ printf "%s" "${pkglibdir}/pkgdata.inc " - ;; - - --icudata) -- echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}" -+ printf "%s" "${ICUDATA_NAME} " - ;; - - --icudata-mode) -- echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}" -+ printf "%s" "${PKGDATA_MODE} " - ;; - - --icudata-install-dir) -- echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}" -+ printf "%s" "${ICUPKGDATA_DIR} " - ;; - - --icudatadir) -- echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}" -+ printf "%s" "${ICUDATA_DIR} " - ;; - - --shlib-c) -- echo $ECHO_N "${SHLIB_c} ${ECHO_C}" -+ printf "%s" "${SHLIB_c} " - ;; - - --shlib-cc) -- echo $ECHO_N "${SHLIB_cc} ${ECHO_C}" -+ printf "%s" "${SHLIB_cc} " - ;; - - --version) -- echo $ECHO_N $VERSION -+ printf "%s" "$VERSION" - ;; - - --unicode-version) -- echo $ECHO_N $UNICODE_VERSION -+ printf "%s" "$UNICODE_VERSION" - ;; - - --host) 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 deleted file mode 100644 index b99557871bc0..000000000000 --- a/dev-libs/icu-layoutex/files/icu-layoutex-76.1-undo-pkgconfig-change-for-now.patch +++ /dev/null @@ -1,30 +0,0 @@ -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-r1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild deleted file mode 100644 index 3e0aed8d009b..000000000000 --- a/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please bump with dev-libs/icu -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/icu.asc -inherit autotools multilib-minimal toolchain-funcs verify-sig - -MY_PV=${PV/_rc/-rc} -MY_PV=${MY_PV//./_} - -DESCRIPTION="External layout part of International Components for Unicode" -HOMEPAGE="https://icu.unicode.org/"; -SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz"; -SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" -S="${WORKDIR}"/${PN/-layoutex}/source - -LICENSE="BSD" -SLOT="0/${PV%.*}" -if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86" -fi -IUSE="debug static-libs test" -RESTRICT="!test? ( test )" - -DEPEND=" - ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] - dev-libs/icu-le-hb[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" -BDEPEND=" - virtual/pkgconfig - verify-sig? ( >=sec-keys/openpgp-keys-icu-20241110 ) -" - -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 - - # TODO: switch uconfig.h hacks to use uconfig_local - # - # Disable renaming as it assumes stable ABI and that consumers - # won't use unofficial APIs. We need this despite the configure argument. - sed -i \ - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ - common/unicode/uconfig.h || die - # - # ODR violations, experimental API - sed -i \ - -e "s/# define UCONFIG_NO_MF2 0/#define UCONFIG_NO_MF2 1/" \ - common/unicode/uconfig.h || die - - # Fix linking of icudata - sed -i \ - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ - config/mh-linux || die - - eautoreconf -} - -src_configure() { - MAKEOPTS+=" VERBOSE=1" - - if tc-is-cross-compiler; then - mkdir "${WORKDIR}"/host || die - pushd "${WORKDIR}"/host >/dev/null || die - - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ - "${S}"/configure --disable-renaming --disable-debug \ - --disable-samples --enable-static || die - emake - - popd >/dev/null || die - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --disable-renaming - # We want a minimal build as this is just for layoutex - # so we disable as much as possible - --disable-samples - --disable-extras - --disable-icuio - - # This is icu-layoutex, so.. - --enable-layoutex - - $(use_enable debug) - $(use_enable static-libs static) - - # Need tools for tests, otherwise get this in configure: - # "## Note: you have disabled ICU's tools. This ICU cannot build its own data or tests. - # ## Expect build failures in the 'data', 'test', and other directories." - # ... although layoutex has no tests right now anyway, but let's keep this - # for the future. - $(use_enable test tools) - $(use_enable test tests) - ) - - tc-is-cross-compiler && myeconfargs+=( - --with-cross-build="${WORKDIR}"/host - ) - - # icu tries to use clang by default - tc-export CC CXX - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - # INTLTEST_OPTS: intltest options - # -e: Exhaustive testing - # -l: Reporting of memory leaks - # -v: Increased verbosity - # IOTEST_OPTS: iotest options - # -e: Exhaustive testing - # -v: Increased verbosity - # CINTLTST_OPTS: cintltst options - # -e: Exhaustive testing - # -v: Increased verbosity - emake -C layoutex VERBOSE="1" check -} - -multilib_src_install() { - pushd layoutex &>/dev/null || die - default - popd &>/dev/null || die -} diff --git a/dev-libs/icu-layoutex/metadata.xml b/dev-libs/icu-layoutex/metadata.xml deleted file mode 100644 index 607468902fd7..000000000000 --- a/dev-libs/icu-layoutex/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Office project</name> - </maintainer> - <upstream> - <remote-id type="github">unicode-org/icu</remote-id> - </upstream> -</pkgmetadata> diff --git a/metadata/stabilization-groups/icu.group b/metadata/stabilization-groups/icu.group index b976319cbeb2..c1abf7c71a33 100644 --- a/metadata/stabilization-groups/icu.group +++ b/metadata/stabilization-groups/icu.group @@ -1,4 +1,3 @@ dev-libs/icu -dev-libs/icu-layoutex dev-libs/icu-le-hb sec-keys/openpgp-keys-icu diff --git a/profiles/package.mask b/profiles/package.mask index 2e8933ab64e1..c0e9e73a42f9 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -284,7 +284,6 @@ media-libs/oneVPL-cpu # Historically split from dev-libs/icu, disabled by default upstream and not # recommended anymore. If need be, we can make it optional in icu itself. # Removal on 2025-06-16. Bug #956106. -dev-libs/icu-layoutex dev-libs/icu-le-hb # Alfred Wingate <[email protected]> (2025-05-17)
