From 9fce2d9787c37a690336f5e345a49d83ee60bc8a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 25 Jun 2023 01:28:26 +0100 Subject: gentoo auto-resync : 25:06:2023 - 01:28:26 --- sys-devel/gettext/Manifest | 3 +- .../files/gettext-0.22-disable-libintl.patch | 34 ++++ sys-devel/gettext/gettext-0.22-r1.ebuild | 183 +++++++++++++++++++++ sys-devel/gettext/gettext-0.22.ebuild | 182 -------------------- 4 files changed, 219 insertions(+), 183 deletions(-) create mode 100644 sys-devel/gettext/files/gettext-0.22-disable-libintl.patch create mode 100644 sys-devel/gettext/gettext-0.22-r1.ebuild delete mode 100644 sys-devel/gettext/gettext-0.22.ebuild (limited to 'sys-devel/gettext') diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index b0d468c77889..4fc42c450623 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -4,10 +4,11 @@ AUX gettext-0.21-CVE-2020-12825.patch 14074 BLAKE2B 67da10f81edf92004b8d1f4099c7 AUX gettext-0.21-musl-omit_setlocale_lock.patch 1598 BLAKE2B 6b27ad4db1fcaed8b88345f47f75eb36580eb848ed3e914f2625c8136d34c1a13cd67ca043b2d42ee352d1214b3db0e3684b1be470072640bfc7c6892b78e2cb SHA512 04bf3d840c3687255f8333ae6de1af1774b80611fbfd69a9eff0b49bed74510a0e6c40768e1c1e52853221c2ee19ccad78a211500f0b1c05763670a1dbebbf70 AUX gettext-0.21.1-java-autoconf.patch 2280 BLAKE2B 79605c0ea6c5a56be1a6d586210ed40d913e30fd56c955c49a796a78e2f7d068ccdfdeb2b13ee68458612a40e6a7130e4e8d30661136cee888e7319cecce6899 SHA512 60948e0e45ea8628d6041448d4152696e3026e9d8d7dd4441977a0f8496976fb16cb8578d549287ab9d1a783cc764c9d7c3041d1e47bf1c789b5ff9a34a66dc1 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956 +AUX gettext-0.22-disable-libintl.patch 1385 BLAKE2B 7d8b92f882f355ad077a69a6dccc12f4e4d8a38e78749611f2b3e3208c5113ff189d8a42f7bbb622c5dc4457acb597c7db1265fce7f23b0f0505f64de14b4ce1 SHA512 46e324fe80204a79bd4413ece1afc235204c4f31042958918c101f15f4c5c83afe209c90f002e1f6fc9b7fd263076b65f43133520383db53dd25d5c4c52c5fb6 DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0 DIST gettext-0.22.tar.xz 10008808 BLAKE2B e91c82eb793897bd7ed727503e9d6e72a47027adf51ca76cf5c936437c434e910508814b1d03b12694c5e87156018683cb2c8cc51637b121313ed41155bcd3e5 SHA512 c6368344aa4e0f6fd7c4a93023a5f7b377c7bb97b8ea688fd54f4c385c069d9ff27611d8763b1aed6328b6d3c4db7b34bd89bfbf6525ecaef11eb58434a4d4fa DIST gettext-0.22.tar.xz.sig 833 BLAKE2B d1718f02100abc2c7c67e5c6a49000baee5244030fcef33f099fac255562211332b0c7838d329e2cdd2c99c5b4e5d4bfed6da81cdddd86a4adf9f24f626c8704 SHA512 2d4f0ea68150aa9f7da315545bd782f0c74d581ec89f60ca5138d069cc6ef0296f85df6e05f0c7f030dc8660a8db32529d237497473f6cef7c72034adcc58a9b EBUILD gettext-0.21.1.ebuild 5199 BLAKE2B a0c375609a0a988debfe68d7101b04ce9a71abc3b949d57222e9642b80757b74e652017102bb736141d085bf7a160004c4e472ac1e0e4cb6c2d396172e700567 SHA512 934dbe90a60fe2559cbb4c3f42926b61184f77124442c143244d8bf3caac583f58cb097fce7b01c69761f97dc016214ef0d0ea6da5995f4fc2efcf2266d08efa -EBUILD gettext-0.22.ebuild 5074 BLAKE2B d6d7a243218de89262feea1c093ec6b4f694b94ff55d192d911f25389f0b04d237ee856c62888f2d94bb27f88dc08ed3c4dbf58ec5e0861b2c40d0c66c435070 SHA512 afba410ce68a082e71b0632429557059bb716b52967e01fd71af32f2d7b8cd5cf6bdd34e830238795d3094e35fb70041ad91a1bb93be8deffdb514fecbbbcaa4 +EBUILD gettext-0.22-r1.ebuild 5122 BLAKE2B 401e96ad15a0999844f8821fa4e2bdd33e377c8df1c51e3b8d237a28c205b16484493a74ba21486741bae05cfcb6c3baea5f7b52549e44c25135f3fb2447bcf1 SHA512 e5f77273f067757c41d34249f3979cecb44b7362562439f9aff5ddf54a2224693ed1a4ffadc9f9e64e4658a4fa209c5c8283b2b0f6d1abbe4356fada9df59f01 MISC metadata.xml 529 BLAKE2B 7043c2adba0d48824bf343847a587b7eb9ce0947b1985ee375f08a0af0fce3809e7a581001872b98ceb5305aeb410d4e2e72425e7906563593e168cfe60904f5 SHA512 06a0877db14a56e71a90ecc4eed1658e21703403c5739ed8e62202e5fe3958fccab5ffcc633975c7269402022f40653638cc41d1ae5b6427203dc8c28d6a502c diff --git a/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch new file mode 100644 index 000000000000..b242ead4b435 --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/564168 +https://bugs.gentoo.org/909041 + +Never build libintl since it's in dev-libs/libintl now. + +We can drop this if/when upstream fixes the configure flag handling: +https://savannah.gnu.org/bugs/?48233 + +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -22765,9 +22765,7 @@ + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ +- && test "$PACKAGE" != gettext-runtime \ +- && test "$PACKAGE" != gettext-tools \ +- && test "$PACKAGE" != libintl; }; then ++ }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -26129,9 +26129,7 @@ + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ +- && test "$PACKAGE" != gettext-runtime \ +- && test "$PACKAGE" != gettext-tools \ +- && test "$PACKAGE" != libintl; }; then ++ }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= diff --git a/sys-devel/gettext/gettext-0.22-r1.ebuild b/sys-devel/gettext/gettext-0.22-r1.ebuild new file mode 100644 index 000000000000..15b71238987e --- /dev/null +++ b/sys-devel/gettext/gettext-0.22-r1.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: Keep version bumps in sync with dev-libs/libintl. + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc +inherit java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs + +DESCRIPTION="GNU locale utilities" +HOMEPAGE="https://www.gnu.org/software/gettext/" + +if [[ ${PV} == *_rc* ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz" + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz.sig )" + S="${WORKDIR}/${P/_/-}" +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +# Only libasprintf is under the LGPL (and libintl is in a sep package), +# so put that license behind USE=cxx. +LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" +SLOT="0" +IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs xattr" + +# only runtime goes multilib +# Note: The version of libxml2 corresponds to the version bundled via gnulib. +# If the build detects too old of a system version, it will end up falling back +# to the bundled copy. #596918 +# Note: expat lacks a subslot because it is dynamically loaded at runtime. We +# would depend on older subslots if they were available (based on the ABIs that +# are explicitly handled), but expat doesn't currently use subslots. +DEPEND=" + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.3:= + dev-libs/expat + acl? ( virtual/acl ) + ncurses? ( sys-libs/ncurses:= ) + java? ( virtual/jdk:1.8 ) + xattr? ( sys-apps/attr ) +" +RDEPEND=" + ${DEPEND} + git? ( dev-vcs/git ) + java? ( virtual/jre:1.8 ) +" +BDEPEND=" + git? ( dev-vcs/git ) + verify-sig? ( sec-keys/openpgp-keys-gettext ) +" +PDEPEND="emacs? ( app-emacs/po-mode )" + +MULTILIB_WRAPPED_HEADERS=( + # only installed for native ABI + /usr/include/gettext-po.h + + /usr/include/autosprintf.h + /usr/include/textstyle.h + /usr/include/textstyle/stdbool.h + /usr/include/textstyle/version.h + /usr/include/textstyle/woe32dll.h +) + +PATCHES=( + "${FILESDIR}"/${PN}-0.22-disable-libintl.patch + "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch +) + +QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + java-pkg-opt-2_src_prepare + + default + + # gettext-0.21.1-java-autoconf.patch changes + # gettext-{runtime,tools}/configure.ac and the corresponding + # configure scripts. Avoid regenerating other autotools output. + #touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die + # Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac + #touch -c configure || die + + elibtoolize + + if use elibc_musl || use elibc_Darwin; then + eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch + fi +} + +multilib_src_configure() { + local myconf=( + # switches common to runtime and top-level + --cache-file="${BUILD_DIR}"/config.cache + #--docdir="\$(datarootdir)/doc/${PF}" + + # Emacs support is now in a separate package + --without-emacs + --without-lispdir + # glib depends on us so avoid circular deps + --with-included-glib + # libcroco depends on glib which ... ^^^ + --with-included-libcroco + # this will _disable_ libunistring (since it is not bundled), + # see bug #326477 + --with-included-libunistring + # Never build libintl since it's in dev-libs/libintl now. + --without-included-gettext + # Never build bundled copy of libxml2. + --without-included-libxml + + --disable-csharp + --without-cvs + + $(use_enable acl) + $(use_enable cxx c++) + $(use_enable cxx libasprintf) + $(use_with git) + $(multilib_native_use_enable java) + $(use_enable ncurses curses) + $(use_enable nls) + $(use_enable openmp) + $(use_enable static-libs static) + $(use_enable xattr attr) + ) + + local ECONF_SOURCE="${S}" + if ! multilib_is_native_abi ; then + # for non-native ABIs, we build runtime only + ECONF_SOURCE+=/gettext-runtime + fi + + econf "${myconf[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi ; then + dosym msgfmt /usr/bin/gmsgfmt # bug #43435 + dobin gettext-tools/misc/gettextize + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die + + if use java ; then + java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar + rm "${ED}"/usr/share/${PN}/*.jar || die + rm "${ED}"/usr/share/${PN}/*.class || die + if use doc ; then + java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2 + fi + fi + + dodoc AUTHORS ChangeLog NEWS README THANKS + + if use doc ; then + docinto html + dodoc "${ED}"/usr/share/doc/${PF}/*.html + else + rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} + fi + rm "${ED}"/usr/share/doc/${PF}/*.html || die +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst +} diff --git a/sys-devel/gettext/gettext-0.22.ebuild b/sys-devel/gettext/gettext-0.22.ebuild deleted file mode 100644 index 58592b47a9e6..000000000000 --- a/sys-devel/gettext/gettext-0.22.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Note: Keep version bumps in sync with dev-libs/libintl. - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc -inherit java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs - -DESCRIPTION="GNU locale utilities" -HOMEPAGE="https://www.gnu.org/software/gettext/" - -if [[ ${PV} == *_rc* ]] ; then - SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz" - SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz.sig )" - S="${WORKDIR}/${P/_/-}" -else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -# Only libasprintf is under the LGPL (and libintl is in a sep package), -# so put that license behind USE=cxx. -LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" -SLOT="0" -IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs xattr" - -# only runtime goes multilib -# Note: The version of libxml2 corresponds to the version bundled via gnulib. -# If the build detects too old of a system version, it will end up falling back -# to the bundled copy. #596918 -# Note: expat lacks a subslot because it is dynamically loaded at runtime. We -# would depend on older subslots if they were available (based on the ABIs that -# are explicitly handled), but expat doesn't currently use subslots. -DEPEND=" - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.3:= - dev-libs/expat - acl? ( virtual/acl ) - ncurses? ( sys-libs/ncurses:= ) - java? ( virtual/jdk:1.8 ) - xattr? ( sys-apps/attr ) -" -RDEPEND=" - ${DEPEND} - git? ( dev-vcs/git ) - java? ( virtual/jre:1.8 ) -" -BDEPEND=" - git? ( dev-vcs/git ) - verify-sig? ( sec-keys/openpgp-keys-gettext ) -" -PDEPEND="emacs? ( app-emacs/po-mode )" - -MULTILIB_WRAPPED_HEADERS=( - # only installed for native ABI - /usr/include/gettext-po.h - - /usr/include/autosprintf.h - /usr/include/textstyle.h - /usr/include/textstyle/stdbool.h - /usr/include/textstyle/version.h - /usr/include/textstyle/woe32dll.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch -) - -QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - java-pkg-opt-2_src_prepare - - default - - # gettext-0.21.1-java-autoconf.patch changes - # gettext-{runtime,tools}/configure.ac and the corresponding - # configure scripts. Avoid regenerating other autotools output. - #touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die - # Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac - #touch -c configure || die - - elibtoolize - - if use elibc_musl || use elibc_Darwin; then - eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch - fi -} - -multilib_src_configure() { - local myconf=( - # switches common to runtime and top-level - --cache-file="${BUILD_DIR}"/config.cache - #--docdir="\$(datarootdir)/doc/${PF}" - - # Emacs support is now in a separate package - --without-emacs - --without-lispdir - # glib depends on us so avoid circular deps - --with-included-glib - # libcroco depends on glib which ... ^^^ - --with-included-libcroco - # this will _disable_ libunistring (since it is not bundled), - # see bug #326477 - --with-included-libunistring - # Never build libintl since it's in dev-libs/libintl now. - --without-included-gettext - # Never build bundled copy of libxml2. - --without-included-libxml - - --disable-csharp - --without-cvs - - $(use_enable acl) - $(use_enable cxx c++) - $(use_enable cxx libasprintf) - $(use_with git) - $(multilib_native_use_enable java) - $(use_enable ncurses curses) - $(use_enable nls) - $(use_enable openmp) - $(use_enable static-libs static) - $(use_enable xattr attr) - ) - - local ECONF_SOURCE="${S}" - if ! multilib_is_native_abi ; then - # for non-native ABIs, we build runtime only - ECONF_SOURCE+=/gettext-runtime - fi - - econf "${myconf[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi ; then - dosym msgfmt /usr/bin/gmsgfmt # bug #43435 - dobin gettext-tools/misc/gettextize - fi -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die - - if use java ; then - java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar - rm "${ED}"/usr/share/${PN}/*.jar || die - rm "${ED}"/usr/share/${PN}/*.class || die - if use doc ; then - java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2 - fi - fi - - dodoc AUTHORS ChangeLog NEWS README THANKS - - if use doc ; then - docinto html - dodoc "${ED}"/usr/share/doc/${PF}/*.html - else - rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} - fi - rm "${ED}"/usr/share/doc/${PF}/*.html || die -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -} -- cgit v1.2.3