commit: 376d0074d9c51afc8fa6009b9a73bd46cbfe0281 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Thu Feb 17 10:16:40 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Thu Feb 17 10:21:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376d0074
dev-java/ecj-gcj: treeclean Closes: https://bugs.gentoo.org/497316 Closes: https://bugs.gentoo.org/424081 Closes: https://bugs.gentoo.org/389763 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-java/ecj-gcj/Manifest | 1 - dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild | 93 ----------------------------------- dev-java/ecj-gcj/files/ecj-gcj.in | 23 --------- dev-java/ecj-gcj/metadata.xml | 11 ----- profiles/package.mask | 6 --- 5 files changed, 134 deletions(-) diff --git a/dev-java/ecj-gcj/Manifest b/dev-java/ecj-gcj/Manifest deleted file mode 100644 index 739acba16b78..000000000000 --- a/dev-java/ecj-gcj/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 diff --git a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild deleted file mode 100644 index 9f3ec5665c73..000000000000 --- a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit java-pkg-2 prefix toolchain-funcs - -MY_PN="ecj" -DMF="R-${PV}-201502041700" - -DESCRIPTION="Subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk" -HOMEPAGE="http://www.eclipse.org/"; -SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"; - -LICENSE="EPL-1.0" -SLOT="4.4" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+native" - -RDEPEND="sys-devel/gcc:*[gcj] - app-eselect/eselect-java" -DEPEND="${RDEPEND} - app-arch/unzip - !dev-java/eclipse-ecj:3.5[gcj]" - -JAVA_PKG_WANT_SOURCE=1.6 -JAVA_PKG_WANT_TARGET=1.6 - -MY_PS="${MY_PN}-${SLOT}" -S="${WORKDIR}" - -java_prepare() { - # We don't need the ant adapter here - rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die - rm -r org/eclipse/jdt/internal/antadapter || die - - # upstream build.xml excludes this - rm META-INF/eclipse.inf || die - - # these java6 specific classes cannot compile with gcj - rm -r org/eclipse/jdt/internal/compiler/{apt,tool}/ || die -} - -src_compile() { - local gccbin=$(gcc-config -B) - local gcj="${gccbin}/gcj" - - find org/ -name "*.java" > sources.lst || die - - einfo "bootstrapping ${MY_PN} with gcj ..." - "${gcj}" -w -C -fsource=${JAVA_PKG_WANT_SOURCE} -d bootstrap @sources.lst || die - - einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..." - "${gccbin}/gij" -cp bootstrap:. org.eclipse.jdt.internal.compiler.batch.Main -nowarn $(java-pkg_javac-args) @sources.lst || die - find org/ META-INF/ -type f ! -name "*.java" -exec "${gccbin}/gjar" cf ${MY_PN}.jar {} + || die - - if use native; then - einfo "building native ${MY_PS} library, patience needed ..." - "${gcj}" ${CFLAGS} ${LDFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \ - -o ${MY_PS}.so ${MY_PN}.jar || die - fi -} - -src_install() { - java-pkg_dojar ${MY_PN}.jar - - sed -e "s|@SLOT@|${SLOT}|" \ - "${FILESDIR}/${PN}.in" \ - > "${T}"/${PN}-${SLOT} || die - eprefixify "${T}/${PN}-${SLOT}" - dobin "${T}/${PN}-${SLOT}" - - use native && dolib.so ${MY_PS}.so -} - -pkg_postinst() { - if use native; then - local dbtool="$(gcc-config -B)/gcj-dbtool" - - "${dbtool}" -a $("${dbtool}" -p) \ - "${EROOT}usr/share/${PN}-${SLOT}/lib/ecj.jar" \ - "${EROOT}usr/$(get_libdir)/${MY_PN}-${SLOT}.so" - fi - - einfo "To select between slots of ECJ..." - einfo " # eselect ecj" - - eselect ecj update ${PN}-${SLOT} -} - -pkg_postrm() { - eselect ecj update -} diff --git a/dev-java/ecj-gcj/files/ecj-gcj.in b/dev-java/ecj-gcj/files/ecj-gcj.in deleted file mode 100644 index 4f838d5de240..000000000000 --- a/dev-java/ecj-gcj/files/ecj-gcj.in +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# /usr/bin/gij was installed by gcj-jdk in the past and is now handled by -# gcc-config, fall back to gcc-config to locate the binary should the -# symlink/wrapper-binary not yet exists. -GIJ_BIN="@GENTOO_PORTAGE_EPREFIX@/usr/bin/gij" -if [[ ! -f ${GIJ_BIN} ]]; then - GIJ_BIN="$(gcc-config -B)/gij" -fi -if [[ ! -f ${GIJ_BIN} ]]; then - echo "gij not found! check that gcc is compiled with gcj flag" - exit 1 -fi -# calling java-config would be an unnecessary slowdown here - -# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter -# this breaks e.g. bootstrap of ant-core -ecj_cp="@GENTOO_PORTAGE_EPREFIX@/usr/share/ecj-gcj-@SLOT@/lib/ecj.jar" -if [[ -n "${CLASSPATH}" ]]; then - ecj_cp="${ecj_cp}:${CLASSPATH}" -fi - -${GIJ_BIN} -classpath "${ecj_cp}" org.eclipse.jdt.internal.compiler.batch.Main "${@}" diff --git a/dev-java/ecj-gcj/metadata.xml b/dev-java/ecj-gcj/metadata.xml deleted file mode 100644 index 9437e2146b86..000000000000 --- a/dev-java/ecj-gcj/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>j...@gentoo.org</email> - <name>Java</name> -</maintainer> -<use> - <flag name="native">Build a native binary along with the jar. Provides faster execution time, but needs about 1G memory and some patience to compile.</flag> -</use> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index d066b4474c69..5a18446158bd 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -184,12 +184,6 @@ dev-java/nanoxml dev-java/osgi-obr dev-java/tomcat-jstl-spec -# Jakov Smolić <jsmo...@gentoo.org> (2022-01-19) -# The following list of packages is still using EAPI 5 -# and has no reverse dependencies. -# Removal on 2022-02-18. -dev-java/ecj-gcj - # James Beddek <tel...@posteo.de> (2022-01-19) # FFmpeg 5.0 ABI/API changes break many packages. # Masking for tracker/tinderbox.
