commit: 4b5c1b4c0551e6a435d78d12ae3f557efb2fa4e2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 23:56:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 23:56:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5c1b4c
sys-devel/gettext: unkeyword 0.21.1
While the version is fine, maintainer mode seems to insist
on being invoked, despite a variety of things I've tried.
Unkeyword for now until can poke at it more.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/gettext/Manifest | 1 -
.../files/gettext-0.21.1-java-autoconf.patch | 35 ++++++++++++++++++++++
sys-devel/gettext/gettext-0.21.1.ebuild | 18 ++---------
3 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index d394ca6c126b..b0e7dcae84f3 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,4 +1,3 @@
-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
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..e44d56879378 100644
--- a/sys-devel/gettext/gettext-0.21.1.ebuild
+++ b/sys-devel/gettext/gettext-0.21.1.ebuild
@@ -5,10 +5,6 @@
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
@@ -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,11 @@ 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
+ elibtoolize
use elibc_musl && eapply
"${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch
}
