commit: 838acb806aa85a43ac6d0cc681e7f245bfee7377 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Jul 1 14:51:54 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Jul 1 14:52:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=838acb80
sys-devel/gettext: revert java workarounds and depend on JDK 1.8 Closes: https://bugs.gentoo.org/855284 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../{gettext-0.21-r2.ebuild => gettext-0.21-r3.ebuild} | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/sys-devel/gettext/gettext-0.21-r2.ebuild b/sys-devel/gettext/gettext-0.21-r3.ebuild similarity index 91% rename from sys-devel/gettext/gettext-0.21-r2.ebuild rename to sys-devel/gettext/gettext-0.21-r3.ebuild index d810059fc2c2..0dc67c518d43 100644 --- a/sys-devel/gettext/gettext-0.21-r2.ebuild +++ b/sys-devel/gettext/gettext-0.21-r3.ebuild @@ -38,11 +38,11 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) - java? ( >=virtual/jdk-1.8:* )" + java? ( virtual/jdk:1.8 )" RDEPEND="${DEPEND} !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) - java? ( >=virtual/jre-1.8:* )" + java? ( virtual/jre:1.8 )" BDEPEND=" !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) @@ -78,11 +78,6 @@ src_prepare() { java-pkg-opt-2_src_prepare default elibtoolize - if use java; then - # Update the target version for libintl - sed -i -e "s/target_version=1.6/target_version=$(java-pkg_get-target)/" \ - gettext-runtime/configure || die - fi } multilib_src_configure() { @@ -124,11 +119,6 @@ multilib_src_configure() { ECONF_SOURCE+=/gettext-runtime fi - # Ensure javacomp.sh uses our desired source and target versions. - # https://bugs.gentoo.org/855134 - local -x JAVAC="${JAVAC} ${JAVACFLAGS}" - export JAVA_VERBOSE=1 - econf "${myconf[@]}" }
