* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-dep-check/files/, dev-java/java-dep-check/
@ 2021-04-16 7:15 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2021-04-16 7:15 UTC (permalink / raw
To: gentoo-commits
commit: 7fae774c87070b2e3c4a08545060ff459db0935c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 07:15:16 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 07:15:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fae774c
dev-java/java-dep-check: removed obsolete
Closes: https://bugs.gentoo.org/782769
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/java-dep-check/files/Main-0.3.java | 335 ----------------
dev-java/java-dep-check/files/Main-0.4.java | 436 ---------------------
.../java-dep-check/java-dep-check-0.3-r1.ebuild | 31 --
.../java-dep-check/java-dep-check-0.4-r1.ebuild | 32 --
dev-java/java-dep-check/java-dep-check-0.4.ebuild | 31 --
5 files changed, 865 deletions(-)
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 e1f02a024ee..00000000000
--- 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 ea877e92fce..00000000000
--- 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 54d806570f9..00000000000
--- 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 eb7e53a80ee..00000000000
--- 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 b9acd52392e..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-dep-check/files/, dev-java/java-dep-check/
@ 2023-03-20 7:26 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2023-03-20 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 5fd9be605a6e319abf6d54e10b4e781dd3cd0f68
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 07:26:16 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 07:26:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd9be60
dev-java/java-dep-check: fixed opcode version in the java file to be the same as the asm dep version
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/java-dep-check/files/Main-0.5.java | 2 +-
.../{java-dep-check-0.5-r1.ebuild => java-dep-check-0.5-r2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-dep-check/files/Main-0.5.java b/dev-java/java-dep-check/files/Main-0.5.java
index bcd6b4f2a9d6..b8a1e053e301 100644
--- a/dev-java/java-dep-check/files/Main-0.5.java
+++ b/dev-java/java-dep-check/files/Main-0.5.java
@@ -73,7 +73,7 @@ public final class Main extends ClassVisitor {
* Empty Constructor, sets ASM op code version
*/
public Main() {
- super(Opcodes.ASM5);
+ super(Opcodes.ASM9);
}
/**
diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild
similarity index 100%
rename from dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild
rename to dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-20 7:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-20 7:26 [gentoo-commits] repo/gentoo:master commit in: dev-java/java-dep-check/files/, dev-java/java-dep-check/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2021-04-16 7:15 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox