diff options
Diffstat (limited to 'dev-java')
31 files changed, 66 insertions, 948 deletions
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild index 1ced096f0bd1..86eeb87ed9ba 100644 --- a/dev-java/ant-core/ant-core-1.10.9.ebuild +++ b/dev-java/ant-core/ant-core-1.10.9.ebuild @@ -10,7 +10,7 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP="true" JAVA_PKG_BSFIX_ALL="no" JAVA_PKG_IUSE="doc source" -inherit eutils java-pkg-2 java-ant-2 prefix +inherit java-pkg-2 java-ant-2 prefix MY_P="apache-ant-${PV}" diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild index ef8d904b79d8..17350b9fc443 100644 --- a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild +++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild @@ -11,7 +11,7 @@ WANT_SPLIT_ANT="true" # Don't rewrite examples, that's bad. JAVA_PKG_BSFIX_ALL="no" -inherit java-pkg-2 java-ant-2 eutils +inherit java-pkg-2 java-ant-2 MY_PN="apache-ivy" MY_P="${MY_PN}-${PV}" diff --git a/dev-java/antlr/antlr-3.5.2-r1.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild index 922af348137f..0c83334bc403 100644 --- a/dev-java/antlr/antlr-3.5.2-r1.ebuild +++ b/dev-java/antlr/antlr-3.5.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit eutils java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple DESCRIPTION="A parser generator for many languages" HOMEPAGE="https://www.antlr3.org/" diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild index 4149fbc8454c..13e8e42b1526 100644 --- a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild +++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 JAVA_PKG_IUSE="doc source" -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="OO database written in Java" HOMEPAGE="http://www.cdegroot.com/software/db/" diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest index 11b65e0d5ac0..aa1f5801fc5b 100644 --- a/dev-java/commons-lang/Manifest +++ b/dev-java/commons-lang/Manifest @@ -1,7 +1,7 @@ DIST commons-lang-2.0-src.tar.gz 440989 BLAKE2B d71d73504c740138bdb9c1e190e0f4e846fb08a35d8ee2430ac2e24b0094e83cfc8cab9eaa44230c0d7fd26ec768bf7b448f04e123467acc20d49af6efe3008b SHA512 aecbbdd8eb2712981dcd8615bac2ec69e3ea7ae137407287d2a9b3eeaddb48e5367bc9c5cb8d232429ac6091548dac8af67e0593366365c04fcfe39984c3e549 DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87 DIST commons-lang-3.11.tar.gz 1054329 BLAKE2B 7d198e2e7f09f3711909a168cbef405d06aff7482d8ab87059aa11584e82d950ea32f1c1a4d0c9c6c54729396e6b5ee6165a7689b3c38081af31b7a3dad23657 SHA512 ebcb13e47c24e6984835d9d6904fe33077aa3ba781cd61db109fa7005517e4e74cf086c4789a1d65cf3d6c4924b32337c98827a75f91aab908d8e8b9d3b92087 +DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57 DIST commons-lang-3.4-sources.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5 DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b017376227747669bf949725cdc3817a7f14766e121db099e027fc3c322eeb3f68c41786be9a8d500172cfd3c104c7f SHA512 fb627605154c1b3d4561c27ad931bfcac43303ce98ffca8fca538ce6368506cdd2b80de7f22a93ca628e86804923940dd9909bb884c77ca196b654521febc60a DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560 -DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667 diff --git a/dev-java/commons-lang/commons-lang-3.11.ebuild b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild index 40673eadae99..e3845dbe1aa2 100644 --- a/dev-java/commons-lang/commons-lang-3.11.ebuild +++ b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Commons components to manipulate core java classes" HOMEPAGE="https://commons.apache.org/lang" SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="3.11" +SLOT="3.6" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" CDEPEND=" diff --git a/dev-java/commons-lang/commons-lang-3.12.0.ebuild b/dev-java/commons-lang/commons-lang-3.12.0.ebuild new file mode 100644 index 000000000000..a3ff872376f8 --- /dev/null +++ b/dev-java/commons-lang/commons-lang-3.12.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirror.checkdomain.de/apache//commons/lang/source/commons-lang3-3.12.0-src.tar.gz --slot 3.6 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" --ebuild commons-lang-3.12.0.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.apache.commons:commons-lang3:3.12.0" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Commons components to manipulate core java classes" +HOMEPAGE="https://commons.apache.org/proper/commons-lang/" +SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz" +LICENSE="Apache-2.0" +SLOT="3.6" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +DEPEND=" + >=virtual/jdk-1.8:* +" + +RDEPEND=" + >=virtual/jre-1.8:* +" + +S="${WORKDIR}/${PN}3-${PV}-src" + +JAVA_ENCODING="ISO-8859-1" + +JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/commons-lang/commons-lang-3.3.2.ebuild b/dev-java/commons-lang/commons-lang-3.3.2.ebuild deleted file mode 100644 index 477194ec9605..000000000000 --- a/dev-java/commons-lang/commons-lang-3.3.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}3-${PV}" - -DESCRIPTION="Commons components to manipulate core java classes" -HOMEPAGE="http://commons.apache.org/lang/" -SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz" - -DEPEND=">=virtual/jdk-1.6 - !ppc? ( - !ppc64? ( - test? ( - dev-java/ant-junit4 - dev-java/commons-io:1 - dev-java/easymock:3.2 - ) - ) - )" - -RDEPEND=">=virtual/jre-1.6" - -LICENSE="Apache-2.0" -SLOT="3.3" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" -RESTRICT+=" ppc? ( test ) ppc64? ( test )" - -S="${WORKDIR}/${MY_P}-src" - -JAVA_ANT_ENCODING="ISO-8859-1" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2,commons-io-1,junit-4" -JAVA_ANT_REWRITE_CLASSPATH="yes" - -src_install() { - java-pkg_newjar target/${MY_P}.jar ${PN}.jar - - dodoc RELEASE-NOTES.txt NOTICE.txt - - use doc && java-pkg_dojavadoc target/apidocs - use source && java-pkg_dosrc src/main/java/* -} - -src_test() { - LC_ALL=C java-pkg-2_src_test -} diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild index b71050b603dd..efb519edd970 100644 --- a/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild +++ b/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 JAVA_PKG_IUSE="doc source" -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="GNU implementation of the JavaBeans Activation Framework" HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html" diff --git a/dev-java/java-dep-check/files/Main-0.3.java b/dev-java/java-dep-check/files/Main-0.3.java deleted file mode 100644 index e1f02a024eef..000000000000 --- a/dev-java/java-dep-check/files/Main-0.3.java +++ /dev/null @@ -1,335 +0,0 @@ -/* - * Main.java The main application class. - * - * Created on May 1, 2007, 6:32 PM - * - * Copyright (C) 2007,2008 Petteri Räty <betelgeuse@gentoo.org> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package javadepchecker; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; -import org.objectweb.asm.AnnotationVisitor; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.FieldVisitor; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Type; -import org.objectweb.asm.commons.EmptyVisitor; - -/** - * - * @author betelgeuse - * @author serkan - */ -public final class Main extends EmptyVisitor { - - static private String image = ""; - private Set<String> deps = new HashSet<String>(); - private Set<String> current = new HashSet<String>(); - - /** Creates a new instance of Main */ - public Main() { - } - - private static Collection<String> getPackageJars(String pkg) { - ArrayList<String> jars = new ArrayList<String>(); - try { - Process p = Runtime.getRuntime().exec("java-config -p " + pkg); - p.waitFor(); - BufferedReader in; - in = new BufferedReader(new InputStreamReader(p.getInputStream())); - String output = in.readLine(); - if (output!=null/* package somehow missing*/ && !output.trim().equals("")) { - for (String jar : output.split(":")) { - jars.add(jar); - } - } - } catch (InterruptedException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } catch (IOException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } - return jars; - } - - public void processJar(JarFile jar) throws IOException { - for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) { - JarEntry entry = e.nextElement(); - String name = entry.getName(); - if (!entry.isDirectory() && name.endsWith(".class")) { - this.current.add(name); - InputStream stream = jar.getInputStream(entry); - new ClassReader(stream).accept(this, 0); - } - } - } - - private static boolean depNeeded(String pkg, Collection<String> deps) throws IOException { - Collection<String> jars = getPackageJars(pkg); - // We have a virtual with VM provider here - if (jars.size() == 0) { - return true; - } - for (String jarName : jars) { - JarFile jar = new JarFile(jarName); - for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) { - String name = e.nextElement().getName(); - if (deps.contains(name)) { - return true; - } - } - } - return false; - } - - private static boolean depsFound(Collection<String> pkgs, Collection<String> deps) throws IOException { - boolean found = true; - Collection<String> jars = new ArrayList<String>(); - String[] bootClassPathJars = System.getProperty("sun.boot.class.path").split(":"); - // Do we need "java-config -r" here? - for (String jar : bootClassPathJars) { - File jarFile = new File(jar); - if (jarFile.exists()) { - jars.add(jar); - } - } - for (Iterator<String> pkg = pkgs.iterator(); pkg.hasNext();) { - jars.addAll(getPackageJars(pkg.next())); - } - - if (jars.size() == 0) { - return false; - } - ArrayList<String> jarClasses = new ArrayList<String>(); - for (String jarName : jars) { - JarFile jar = new JarFile(jarName); - for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) { - jarClasses.add(e.nextElement().getName()); - } - } - for (String dep : deps) { - if (!jarClasses.contains(dep)) { - if (found) { - System.out.println("Class files not found via DEPEND in package.env"); - } - System.out.println("\t" + dep); - found = false; - } - } - return found; - } - - private static boolean checkPkg(File env) { - boolean needed = true; - boolean found = true; - HashSet<String> pkgs = new HashSet<String>(); - Collection<String> deps = null; - - BufferedReader in = null; - try { - Pattern dep_re = Pattern.compile("^DEPEND=\"([^\"]*)\"$"); - Pattern cp_re = Pattern.compile("^CLASSPATH=\"([^\"]*)\"$"); - - String line; - in = new BufferedReader(new FileReader(env)); - while ((line = in.readLine()) != null) { - Matcher m = dep_re.matcher(line); - if (m.matches()) { - String atoms = m.group(1); - for (String atom : atoms.split(":")) { - String pkg = atom; - if (atom.contains("@")) { - pkg = atom.split("@")[1]; - } - pkgs.add(pkg); - } - continue; - } - m = cp_re.matcher(line); - if (m.matches()) { - Main classParser = new Main(); - for (String jar : m.group(1).split(":")) { - if (jar.endsWith(".jar")) { - classParser.processJar(new JarFile(image + jar)); - } - } - deps = classParser.getDeps(); - } - } - - for (String pkg : pkgs) { - if (!depNeeded(pkg, deps)) { - if (needed) { - System.out.println("Possibly unneeded dependencies found"); - } - System.out.println("\t" + pkg); - needed = false; - } - } - found = depsFound(pkgs, deps); - - } catch (IOException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } finally { - try { - in.close(); - } catch (IOException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } - } - return needed && found; - } - - /** - * @param args the command line arguments - */ - public static void main(String[] args) throws IOException { - int exit = 0; - try { - CommandLineParser parser = new PosixParser(); - Options options = new Options(); - options.addOption("h", "help", false, "print help"); - options.addOption("i", "image", true, "image directory"); - options.addOption("v", "verbose", false, "print verbose output"); - CommandLine line = parser.parse(options, args); - String[] files = line.getArgs(); - if (line.hasOption("h") || files.length == 0) { - HelpFormatter h = new HelpFormatter(); - h.printHelp("java-dep-check [-i <image>] <package.env>+", options); - } else { - image = line.getOptionValue("i", ""); - - for (String arg : files) { - if (line.hasOption('v')) { - System.out.println("Checking " + arg); - } - if (!checkPkg(new File(arg))) { - exit = 1; - } - } - } - } catch (ParseException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } - System.exit(exit); - } - - private void addDep(String dep) { - deps.add(dep + ".class"); - } - - private void addDep(Type dep) { - if (dep.getSort() == Type.ARRAY) { - addDep(dep.getElementType()); - } - if (dep.getSort() == Type.OBJECT) { - addDep(dep.getInternalName()); - } - } - - private Collection<String> getDeps() { - ArrayList<String> result = new ArrayList<String>(); - for (String s : deps) { - if (!current.contains(s)) { - result.add(s); - } - } - return result; - } - - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { - if(superName != null) { - addDep(superName); - } - for (String iface : interfaces) { - addDep(iface); - } - } - - @Override - public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { - addDep(Type.getType(desc)); - return null; - } - - @Override - public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - for (Type param : Type.getArgumentTypes(desc)) { - addDep(param); - } - - if (exceptions != null) { - for (String exception : exceptions) { - addDep(exception); - } - } - addDep(Type.getReturnType(desc)); - return new EmptyVisitor() { - @Override - public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index) { - addDep(Type.getType(desc)); - } - - @Override - public void visitFieldInsn(int opcode, String owner, String name, String desc) { - addDep(Type.getObjectType(owner)); - addDep(Type.getType(desc)); - } - - @Override - public void visitMethodInsn(int opcode, String owner, String name, String desc) { - addDep(Type.getObjectType(owner)); - } - - @Override - public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) { - return Main.this.visitAnnotation(desc, visible); - } - }; - } - - @Override - public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - addDep(Type.getType(desc)); - return null; - } -} diff --git a/dev-java/java-dep-check/files/Main-0.4.java b/dev-java/java-dep-check/files/Main-0.4.java deleted file mode 100644 index ea877e92fce8..000000000000 --- a/dev-java/java-dep-check/files/Main-0.4.java +++ /dev/null @@ -1,436 +0,0 @@ -/** - * This file is part of javadepchecker - * - * Copyright (C) 2016 Gentoo Foundation - * - * javadepchecker is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package javadepchecker; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Set; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.Properties; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; - -import org.objectweb.asm.AnnotationVisitor; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.FieldVisitor; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; - -/** - * Main Class of javadepchecker - * Gentoo Java Utility to scan class files for unneeded dependencies and - * ophaned class files - * - * @author Petteri Räty <betelgeuse@gentoo.org> - * @author Serkan Kaba <serkan@gentoo.org> - * @author William L. Thomson Jr., <wlt@o-sinc.com> - */ -public final class Main extends ClassVisitor { - - static private String image = ""; - private Set<String> mDeps = new HashSet<>(); - private Set<String> mCurrent = new HashSet<>(); - - /** - * Empty Constructor, sets ASM op code version - */ - public Main() { - super(Opcodes.ASM5); - } - - /** - * Get jar names from the Gentoo package and store in a collection - * - * @param pkg Gentoo package name - * @return a collection of jar names - */ - private static Collection<String> getPackageJars(String pkg) { - ArrayList<String> jars = new ArrayList<>(); - try { - Process p = Runtime.getRuntime().exec("java-config -p " + pkg); - p.waitFor(); - BufferedReader in; - in = new BufferedReader(new InputStreamReader(p.getInputStream())); - String output = in.readLine(); - if (output!=null/* package somehow missing*/ && - !output.trim().isEmpty()) { - jars.addAll(Arrays.asList(output.split(":"))); - } - } catch (InterruptedException | IOException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } - return jars; - } - - /** - * Scan jar for classes to be processed by ASM - * - * @param jar jar file to be processed - * @throws IOException - */ - public void processJar(JarFile jar) throws IOException { - Collections.list(jar.entries()) - .stream() - .filter((JarEntry entry) -> (!entry.isDirectory() && entry.getName().endsWith("class"))) - .forEach((JarEntry entry) -> { - InputStream is = null; - try { - Main.this.mCurrent.add(entry.getName()); - is = jar.getInputStream(entry); - new ClassReader(is).accept(Main.this, 0); - } catch (IOException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } finally { - try { - if(is!=null) - is.close(); - } catch (IOException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } - } - }); - } - - /** - * Check if a dependency is needed by a given package - * - * @param pkg Gentoo package name - * @param deps collection of dependencies for the package - * @return boolean if the dependency is needed or not - * @throws IOException - */ - private static boolean depNeeded(String pkg, - Collection<String> deps) throws IOException { - Collection<String> jars = getPackageJars(pkg); - - // We have a virtual with VM provider here - if (jars.isEmpty()) { - return true; - } - for (String jarName : jars) { - JarFile jar = new JarFile(jarName); - for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements();) { - String name = e.nextElement().getName(); - if (deps.contains(name)) { - return true; - } - } - } - return false; - } - - /** - * Check for orphaned class files not owned by any package in dependencies - * - * @param pkg Gentoo package name - * @param deps collection of dependencies for the package - * @return boolean if the dependency is found or not - * @throws IOException - */ - private static boolean depsFound(Collection<String> pkgs, - Collection<String> deps) throws IOException { - boolean found = true; - Collection<String> jars = new ArrayList<>(); - String[] bootClassPathJars = System.getProperty("sun.boot.class.path").split(":"); - // Do we need "java-config -r" here? - for (String jar : bootClassPathJars) { - File jarFile = new File(jar); - if (jarFile.exists()) { - jars.add(jar); - } - } - pkgs.forEach((String pkg) -> { - jars.addAll(getPackageJars(pkg)); - }); - - if (jars.isEmpty()) { - return false; - } - ArrayList<String> jarClasses = new ArrayList<>(); - jars.forEach((String jarName) -> { - try { - JarFile jar = new JarFile(jarName); - Collections.list(jar.entries()).forEach((JarEntry entry) -> { - jarClasses.add(entry.getName()); - }); - } catch (IOException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } - }); - for (String dep : deps) { - if (!jarClasses.contains(dep)) { - if (found) { - System.out.println("Class files not found via DEPEND in package.env"); - } - System.out.println("\t" + dep); - found = false; - } - } - return found; - } - - /** - * Core method, this one fires off all others and is the one called from - * Main. Check this package for unneeded dependencies and orphaned class - * files - * - * @param env - * @return - */ - private static boolean checkPkg(File env) { - boolean needed = true; - boolean found = true; - HashSet<String> pkgs = new HashSet<>(); - Collection<String> deps = null; - InputStream is = null; - - try { - // load package.env - Properties props = new Properties(); - is = new FileInputStream(env); - props.load(is); - - // load package deps, add to hashset if exist - String depend = props.getProperty("DEPEND"); - if(depend!=null && - !depend.isEmpty()) { - for (String atom : depend.replaceAll("\"","").split(":")) { - String pkg = atom; - if (atom.contains("@")) { - pkg = atom.split("@")[1]; - } - pkgs.add(pkg); - } - } - - // load package classpath - String classpath = props.getProperty("CLASSPATH"); - if(classpath!=null && - !classpath.isEmpty()) { - Main classParser = new Main(); - for (String jar : classpath.replaceAll("\"","").split(":")) { - if (jar.endsWith(".jar")) { - classParser.processJar(new JarFile(image + jar)); - } - } - deps = classParser.getDeps(); - } - - for (String pkg : pkgs) { - if (!depNeeded(pkg, deps)) { - if (needed) { - System.out.println("Possibly unneeded dependencies found"); - } - System.out.println("\t" + pkg); - needed = false; - } - } - found = depsFound(pkgs, deps); - - } catch (IOException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } finally { - try { - if(is!=null) - is.close(); - } catch (IOException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } - } - return needed && found; - } - - /** Main method, parse command line opts, invoke the package checker - * @param args the command line arguments - * @throws java.io.IOException - */ - public static void main(String[] args) throws IOException { - int exit = 0; - try { - CommandLineParser parser = new PosixParser(); - Options options = new Options(); - options.addOption("h", "help", false, "print help"); - options.addOption("i", "image", true, "image directory"); - options.addOption("v", "verbose", false, "print verbose output"); - CommandLine line = parser.parse(options, args); - String[] files = line.getArgs(); - if (line.hasOption("h") || files.length == 0) { - HelpFormatter h = new HelpFormatter(); - h.printHelp("java-dep-check [-i <image>] <package.env>+", options); - } else { - image = line.getOptionValue("i", ""); - - for (String arg : files) { - if (line.hasOption('v')) { - System.out.println("Checking " + arg); - } - if (!checkPkg(new File(arg))) { - exit = 1; - } - } - } - } catch (ParseException ex) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } - System.exit(exit); - } - - /** - * Add dependency to deps hashset - * - * @param dep dependent class name - */ - private void addDep(String dep) { - mDeps.add(dep + ".class"); - } - - /** - * Add dependency type to deps hashset - * - * @param dep dependent class name - */ - private void addDep(Type dep) { - if (dep.getSort() == Type.ARRAY) { - addDep(dep.getElementType()); - } - if (dep.getSort() == Type.OBJECT) { - addDep(dep.getInternalName()); - } - } - - /** - * Get deps not contained in the current hashset - * - * @return a collection of deps - */ - private Collection<String> getDeps() { - ArrayList<String> result = new ArrayList<>(); - mDeps.stream().filter((s) -> (!mCurrent.contains(s))).forEach((s) -> { - result.add(s); - }); - return result; - } - - @Override - public void visit(int version, - int access, - String name, - String signature, - String superName, - String[] interfaces) { - if(superName != null) { - addDep(superName); - } - for (String iface : interfaces) { - addDep(iface); - } - } - - @Override - public FieldVisitor visitField(int access, - String name, - String desc, - String signature, - Object value) { - addDep(Type.getType(desc)); - return null; - } - - @Override - public MethodVisitor visitMethod(int access, - String name, - String desc, - String signature, - String[] exceptions) { - for (Type param : Type.getArgumentTypes(desc)) { - addDep(param); - } - - if (exceptions != null) { - for (String exception : exceptions) { - addDep(exception); - } - } - addDep(Type.getReturnType(desc)); - return new MethodVisitor(Opcodes.ASM5) { - @Override - public void visitLocalVariable(String name, - String desc, - String signature, - Label start, - Label end, - int index) { - addDep(Type.getType(desc)); - } - - @Override - public void visitFieldInsn(int opcode, - String owner, - String name, - String desc) { - addDep(Type.getObjectType(owner)); - addDep(Type.getType(desc)); - } - - @Override - public void visitMethodInsn(int opcode, - String owner, - String name, - String desc, - boolean itf) { - addDep(Type.getObjectType(owner)); - } - - @Override - public AnnotationVisitor visitParameterAnnotation(int parameter, - String desc, - boolean visible) { - return Main.this.visitAnnotation(desc, visible); - } - }; - } - - @Override - public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - addDep(Type.getType(desc)); - return null; - } -} diff --git a/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild deleted file mode 100644 index 54d806570f99..000000000000 --- a/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java Dependency checker" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -COMMON_DEP=" - dev-java/commons-cli:1 - dev-java/asm:3" -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.5 - ${COMMON_DEP}" - -JAVA_GENTOO_CLASSPATH="asm-3,commons-cli-1" - -src_unpack() { - cp "${FILESDIR}/Main-${PV}.java" Main.java || die -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${PN} --main javadepchecker.Main -} diff --git a/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild deleted file mode 100644 index eb7e53a80eee..000000000000 --- a/dev-java/java-dep-check/java-dep-check-0.4-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2016-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java Dependency checker" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -COMMON_DEP=" - dev-java/commons-cli:1 - dev-java/asm:4" -RDEPEND=">=virtual/jre-1.8:* - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.8:* - ${COMMON_DEP}" - -JAVA_GENTOO_CLASSPATH="asm-4,commons-cli-1" - -src_unpack() { - cp "${FILESDIR}/Main-${PV}.java" Main.java || die -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${PN} --main javadepchecker.Main -} diff --git a/dev-java/java-dep-check/java-dep-check-0.4.ebuild b/dev-java/java-dep-check/java-dep-check-0.4.ebuild deleted file mode 100644 index b9acd52392e4..000000000000 --- a/dev-java/java-dep-check/java-dep-check-0.4.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java Dependency checker" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -COMMON_DEP=" - dev-java/commons-cli:1 - dev-java/asm:4" -RDEPEND=">=virtual/jre-1.8 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.8 - ${COMMON_DEP}" - -JAVA_GENTOO_CLASSPATH="asm-4,commons-cli-1" - -src_unpack() { - cp "${FILESDIR}/Main-${PV}.java" Main.java || die -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${PN} --main javadepchecker.Main -} diff --git a/dev-java/java-dep-check/java-dep-check-0.5.ebuild b/dev-java/java-dep-check/java-dep-check-0.5.ebuild index eb7e53a80eee..ef6057f4e111 100644 --- a/dev-java/java-dep-check/java-dep-check-0.5.ebuild +++ b/dev-java/java-dep-check/java-dep-check-0.5.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" COMMON_DEP=" dev-java/commons-cli:1 diff --git a/dev-java/jdbm/jdbm-0.12-r3.ebuild b/dev-java/jdbm/jdbm-0.12-r3.ebuild index f8fda9c48e8c..005753faa37b 100644 --- a/dev-java/jdbm/jdbm-0.12-r3.ebuild +++ b/dev-java/jdbm/jdbm-0.12-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 JAVA_PKG_IUSE="doc source" -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="Jdbm aims to be for Java what GDBM is for Perl, Python, C, ..." HOMEPAGE="https://sourceforge.net/projects/jdbm/" diff --git a/dev-java/jna/jna-4.2.2-r1.ebuild b/dev-java/jna/jna-4.2.2-r1.ebuild index 469cd1d2666e..6ae5356a0b03 100644 --- a/dev-java/jna/jna-4.2.2-r1.ebuild +++ b/dev-java/jna/jna-4.2.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 JAVA_PKG_IUSE="doc source" -inherit eutils java-pkg-2 java-ant-2 toolchain-funcs +inherit java-pkg-2 java-ant-2 toolchain-funcs DESCRIPTION="Java Native Access (JNA)" HOMEPAGE="https://github.com/twall/jna" diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild index 083085e8d325..2145bc2cde7a 100644 --- a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild +++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 JAVA_PKG_IUSE="doc source" -inherit eutils java-pkg-2 flag-o-matic toolchain-funcs +inherit java-pkg-2 flag-o-matic toolchain-funcs DESCRIPTION="A selection of libraries for Java" HOMEPAGE="http://www.matthew.ath.cx/projects/java/" diff --git a/dev-java/qdox/qdox-1.12.1-r2.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild index e0bbd55bedd5..39a712868027 100644 --- a/dev-java/qdox/qdox-1.12.1-r2.ebuild +++ b/dev-java/qdox/qdox-1.12.1-r2.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="Parser for extracting class/interface/method definitions" HOMEPAGE="https://github.com/codehaus/qdox" diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild index 7191e9414ff8..65292f4be54a 100644 --- a/dev-java/sbt/sbt-0.13.13.ebuild +++ b/dev-java/sbt/sbt-0.13.13.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" # repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot -inherit eutils java-pkg-2 # git-r3 +inherit java-pkg-2 # git-r3 L_PN="sbt-launch" L_P="${L_PN}-${PV}" diff --git a/dev-java/sbt/sbt-0.13.18.ebuild b/dev-java/sbt/sbt-0.13.18.ebuild index f6976d5d9d1a..c4f3a8c3e8bc 100644 --- a/dev-java/sbt/sbt-0.13.18.ebuild +++ b/dev-java/sbt/sbt-0.13.18.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -inherit eutils java-pkg-2 +inherit java-pkg-2 L_PN="sbt-launch" L_P="${L_PN}-${PV}" diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild index a029c5bc5084..13b1abd63b38 100644 --- a/dev-java/swt/swt-4.10.ebuild +++ b/dev-java/swt/swt-4.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi +inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi MY_PV="${PV/_rc/RC}" MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild index 0fe66e0cf512..0b2df8987699 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="source" -inherit eutils java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple MY_A="apache-${PN}-${PV}-src" MY_P="${MY_A/-servlet-api/}" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild index 3c323d527129..222dab67e501 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="source" -inherit eutils java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple MY_A="apache-${PN}-${PV}-src" MY_P="${MY_A/-servlet-api/}" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild index b0bb3dc1838e..d30225f7f48a 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit eutils java-pkg-2 java-ant-2 java-osgi +inherit java-pkg-2 java-ant-2 java-osgi MY_P="apache-${P/-servlet-api/}-src" DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild index 58e80d34a727..3a00b7cfd701 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 JAVA_PKG_IUSE="source" -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 MY_A="apache-${P}-src" MY_P="${MY_A/-servlet-api/}" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild index ea5e1f0781ef..c750d5ea6f6f 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild @@ -4,7 +4,7 @@ EAPI=7 JAVA_PKG_IUSE="source" -inherit eutils java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple MY_A="apache-${P}-src" MY_P="${MY_A/-servlet-api/}" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild index 78826ac93f9a..d5d3aa1096eb 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="source" -inherit eutils java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple MY_A="apache-${P}-src" MY_P="${MY_A/-servlet-api/}" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild index 9d54d656a065..eaffc40f4037 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="source" -inherit eutils java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple MY_A="apache-${P}-src" MY_P="${MY_A/-servlet-api/}" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild index befa33b38ca2..12de89cc6930 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="source" -inherit eutils java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple MY_A="apache-${PN}-${PV}-src" MY_P="${MY_A/-servlet-api/}" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild index 5b8c94f2e0c3..3a08dd8b4023 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="source" -inherit eutils java-pkg-2 java-pkg-simple +inherit java-pkg-2 java-pkg-simple MY_A="apache-${PN}-${PV}-src" MY_P="${MY_A/-servlet-api/}" |