diff options
Diffstat (limited to 'sys-devel/gettext')
-rw-r--r-- | sys-devel/gettext/Manifest | 5 | ||||
-rw-r--r-- | sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch | 35 | ||||
-rw-r--r-- | sys-devel/gettext/gettext-0.21.1.ebuild | 29 |
3 files changed, 49 insertions, 20 deletions
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index d6f6c00caee1..fe7b94da207a 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -2,14 +2,13 @@ AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede5 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942 AUX gettext-0.21-CVE-2020-12825.patch 14074 BLAKE2B 67da10f81edf92004b8d1f4099c73c14b0e18471033eca17f63fffd05ee2a46d4cdd3bf165b6b7228f4dc9c475985ba69f7ba13e1a03eb84c7a8b74e003223e8 SHA512 92e9a6eeb1c9a697c1724785a9996da27ca2c08db69becb592eb1d42d9ec0e261591a5c6a2a04e010f8b6f5df7ef4cd94b2d0d4fcc0e98d2433519c1875be191 AUX gettext-0.21-musl-omit_setlocale_lock.patch 1598 BLAKE2B 6b27ad4db1fcaed8b88345f47f75eb36580eb848ed3e914f2625c8136d34c1a13cd67ca043b2d42ee352d1214b3db0e3684b1be470072640bfc7c6892b78e2cb SHA512 04bf3d840c3687255f8333ae6de1af1774b80611fbfd69a9eff0b49bed74510a0e6c40768e1c1e52853221c2ee19ccad78a211500f0b1c05763670a1dbebbf70 -AUX gettext-0.21.1-java-autoconf.patch 1590 BLAKE2B cbe575a7f76665ae0d547ddcc66a0f35b61ee0d2deec428f8303840d292769edebd07555cb57b69d507ff746305ec0ab6b8f97f6c8335fb14cf6e7285a9b701d SHA512 8b13d86e28ddd7c8416099f45677d2574dddd5906dee0c7bb71e18ef719122ed03381f57b944267b9edf0de2357d6f21f01769b009ad45bd89e0e4d2e873f863 +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 -DIST gettext-0.21.1-java-autoconf-regenerate.patch.xz 156632 BLAKE2B d1177ec194525019a3a95ae279983c652346549705cba429bb3ce62e73acab9d6c6d5ebcc100d00e1aa9598a54ac7bc4edb17fa416e5c8ad873caead8280f92e SHA512 d46e2a90000831857164e002c01b93094aa8b99a9fde0b21b9bed0747f35c239da70b0dd58227b9559f756fbf8f5a66bf84c8e2f44e7e53c68964cbe033c29b2 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.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703 EBUILD gettext-0.21-r3.ebuild 4676 BLAKE2B 44a27f8c9ca8b7093cbb6c53dfea6ad562da229c0c00ba2420a06cfa1e52e5fff178c1ac4ae1516f855e1aeef05b5aefc61add22f1ca3a12b6371090b07f41a9 SHA512 c11ef2bd673318196170021a272595a916b136524aa1ccc1450bdd66cec8a757d020a4cd8a4ed4ecbff5343ce482ded80485c80990b10d97749ce732c2f559fd EBUILD gettext-0.21-r4.ebuild 4885 BLAKE2B f59da97b1d94144305ed1783933510fd81a87e64ff2bb09ac5f2ece0dbf43123dcf70637c910c854b1946b232946acad6d012f7b2236f9a7e97e681fc96c322e SHA512 0b7d2469ef9733978bc42cd67cdc096e37cad952385309fbca8a9d32d5e5c5e528648aced7af144da5052b2c005be7a379165879bb8a93b9586b5b2d5b6f2862 -EBUILD gettext-0.21.1.ebuild 5180 BLAKE2B 913d564514c5b8667c50a46f291f0b0ee61407a0c3777211895ad57aee029d7c27d0d3a34225374a4201df266afefb9f425e2791b31f7869e8191fe0a89d4b44 SHA512 08a9332a93af7430991d3d2ee8cd959f49d8db86b824bc0cae8b406972ce480c1e63c0927ad4394e86d26487cd9c5505989302acb297a2ed07b365453294d3b6 +EBUILD gettext-0.21.1.ebuild 5164 BLAKE2B dbcc23d25da92e5aa5746efc6747f3ca9015f0751b1613b618684c29e9f269d4f21746cc5bc7749b3ef7734c3c18957ffb36263a8bf76681a723a8a7be0b69d0 SHA512 54cd2edf7560c6102b874ef5fd76b6a504195a25a478f153ebb06bfb311d752fbd6fb02164ea7b6f13dee2d92e2d79728c7b7ceb9c556baf06cbb97908c71446 MISC metadata.xml 708 BLAKE2B 851174e455d052a1c3a4e0a5dbfeac2feb10781a54fa0bfb52b3934ed88a3f8a2437a922f3ce5b56e21aa6aaec3488539e151362e3441344f97c246b79e2c2e2 SHA512 9dbd43e82384160c392bcfa94a271951a754c2cbf116cf61659642660e93b4a82a7636d600cc8a83b68fcd2d92669e4b5b009334039ff66c58b92baa24961aac diff --git a/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch b/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch index 4ba6f48efccd..a7471ac724c9 100644 --- a/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch +++ b/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch @@ -63,3 +63,38 @@ gt_JAVACOMP_DISABLED inline. JAR= BUILDJAVA=no ]) +diff --git a/gettext-runtime/configure b/gettext-runtime/configure +index 5e2d593..cf579ff 100755 +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -7070,7 +7070,11 @@ fi + + else $as_nop + +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= + JAR= + BUILDJAVA=no + +diff --git a/gettext-tools/configure b/gettext-tools/configure +index f897bc3..3af54cd 100755 +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -8718,8 +8718,11 @@ fi + + else $as_nop + +- gt_JAVAEXEC_DISABLED +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= + JAR= + BUILDJAVA=no + diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild index 2783e6d936d3..56ec58f12489 100644 --- a/sys-devel/gettext/gettext-0.21.1.ebuild +++ b/sys-devel/gettext/gettext-0.21.1.ebuild @@ -5,12 +5,8 @@ EAPI=8 -if [[ ${PV} != 0.21.1 ]] ; then - die "Restore elibtoolize in src_prepare and delete src_unpack." -fi - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc -inherit java-pkg-opt-2 multilib-minimal verify-sig +inherit java-pkg-opt-2 libtool multilib-minimal verify-sig DESCRIPTION="GNU locale utilities" HOMEPAGE="https://www.gnu.org/software/gettext/" @@ -20,9 +16,8 @@ if [[ ${PV} == *_rc* ]] ; then S="${WORKDIR}/${P/_/-}" else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-java-autoconf-regenerate.patch.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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi # Only libasprintf is under the LGPL (and libintl is in a sep package), # so put that license behind USE=cxx. @@ -71,7 +66,6 @@ PATCHES=( "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch "${FILESDIR}"/${P}-java-autoconf.patch - "${WORKDIR}"/${P}-java-autoconf-regenerate.patch ) QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so" @@ -80,19 +74,20 @@ pkg_setup() { java-pkg-opt-2_pkg_setup } -src_unpack() { - if use verify-sig ; then - verify-sig_verify_detached "${DISTDIR}"/gettext-0.21.1.tar.xz{,.sig} - fi - - default -} - src_prepare() { java-pkg-opt-2_src_prepare default - #elibtoolize + + # 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 use elibc_musl && eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch } |