gentoo resync : 14.07.2018

9 files changed, 0 insertions, 403 deletions

diff --git a/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch b/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch
deleted file mode 100644
index c92e18741ae1..000000000000
--- a/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d4ef7a75e6d0e50f6417825d851ad9e5ed757985 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 10 Mar 2015 23:47:00 +0000
-Subject: [PATCH 1/2] Support bcel 6.0 RC3 instead of a random snapshot
-
----
- .../src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java | 2 +-
- findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java   | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java b/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
-index 52468c9..d7cbd0e 100644
---- a/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
-+++ b/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
-@@ -50,7 +50,7 @@ import edu.umd.cs.findbugs.bcel.generic.NULL2Z;
-  * @see Frame
-  * @see DataflowAnalysis
-  */
--public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> implements VisitorSupportsInvokeDynamic {
-+public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> extends EmptyVisitor {
-     private FrameType frame;
- 
-     private Location location;
-diff --git a/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java b/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
-index 5d62092..a36abac 100644
---- a/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
-+++ b/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
-@@ -56,7 +56,7 @@ import org.apache.bcel.classfile.StackMap;
- import org.apache.bcel.classfile.StackMapEntry;
- import org.apache.bcel.classfile.Synthetic;
- import org.apache.bcel.classfile.Unknown;
--import org.apache.bcel.classfile.Visitor;
-+import org.apache.bcel.classfile.EmptyVisitor;
- 
- /**
-  * Fixedup of from org.apache.bcel.classfile.Visitor
-@@ -64,7 +64,7 @@ import org.apache.bcel.classfile.Visitor;
-  * @author <A HREF="http://www.cs.umd.edu/~pugh">William Pugh</A>
-  * @version 980818
-  */
--public abstract class BetterVisitor implements Visitor {
-+public abstract class BetterVisitor extends EmptyVisitor {
- 
-     /**
-      * clone() is overridden to change access control from protected to public.
--- 
-2.0.4
-
diff --git a/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch b/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch
deleted file mode 100644
index 67938e4e371c..000000000000
--- a/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c956ffd82e5b88be74dca187dc80afcf6559a78f Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Wed, 11 Mar 2015 21:41:36 +0000
-Subject: [PATCH 2/2] Don't bundle anything in the annotations jar
-
----
- findbugs/build.xml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/findbugs/build.xml b/findbugs/build.xml
-index 698b91f..3eac5d6 100644
---- a/findbugs/build.xml
-+++ b/findbugs/build.xml
-@@ -298,8 +298,6 @@
-             <fileset dir="${src.dir}">
-                 <include name="**/annotations/*.java"/>
-             </fileset>
--            <zipfileset src="${jar.dir}/jcip-annotations.jar" excludes="META-INF/**,**/*.html"/>
--            <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/>
-         </jar>
-     </target>
- 
--- 
-2.0.4
-
diff --git a/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch b/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch
deleted file mode 100644
index ce4e186f0aca..000000000000
--- a/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From af7e19734c9bbd21d2f1bf8a66b5ca1c131eeacd Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 13 Mar 2015 00:20:20 +0000
-Subject: [PATCH 3/3] JDK 1.8 works fine for me
-
----
- findbugs/build.xml | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/findbugs/build.xml b/findbugs/build.xml
-index 3eac5d6..48c8f2b 100644
---- a/findbugs/build.xml
-+++ b/findbugs/build.xml
-@@ -122,13 +122,6 @@
-                 </javac>
-     </target>
-     <target name="classes" depends="init">
--        <echo>Requires JDK 7.x (not 8!), using: ${ant.java.version}</echo>
--        <fail message="Requires JDK 7.x (not 8!), using: ${ant.java.version}">
--             <condition>
--                 <equals arg1="1.8" arg2="${ant.java.version}"/>
--             </condition>
--         </fail>
--
-         <!-- Compile Java source files. -->
-         <echo level="info" message="compiling findbugs"/>
-         <javac
--- 
-2.0.4
-
diff --git a/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch b/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch
deleted file mode 100644
index 670f497e507b..000000000000
--- a/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c73984b12bb3c80a67d993a30c894ee05613d422 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 13 Mar 2015 13:59:22 +0000
-Subject: [PATCH 4/4] Don't clean before generating docs
-
----
- findbugs/build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/findbugs/build.xml b/findbugs/build.xml
-index 48c8f2b..d0cbc04 100644
---- a/findbugs/build.xml
-+++ b/findbugs/build.xml
-@@ -652,7 +652,7 @@
-     </target>
- 
- 
--    <target name="checkdocs" depends="clean">
-+    <target name="checkdocs">
-         <!-- FIXME: check whether docs are up to date -->
-     </target>
- 
--- 
-2.0.4
-
diff --git a/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch b/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch
deleted file mode 100644
index acdff2ce96d2..000000000000
--- a/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cbf9d81dba1ef0a42f79391c87845d7875a13993 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Mon, 18 May 2015 20:41:58 +0100
-Subject: [PATCH 5/5] Don't require git to build
-
----
- findbugs/build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/findbugs/build.xml b/findbugs/build.xml
-index d0cbc04..42c6d09 100644
---- a/findbugs/build.xml
-+++ b/findbugs/build.xml
-@@ -636,7 +636,7 @@
-     </target>
- 
- 
--    <target name="version" depends="classes,-get-git-revision" >
-+    <target name="version" depends="classes" >
-         <echo>${gitrnum}</echo>
-         <java classpathref="tools.classpath"
-               output="${version.props.file}"
--- 
-2.3.3
-
diff --git a/dev-util/findbugs/files/launchers/fb b/dev-util/findbugs/files/launchers/fb
deleted file mode 100644
index 79d44a41681d..000000000000
--- a/dev-util/findbugs/files/launchers/fb
+++ /dev/null
@@ -1,75 +0,0 @@
-escape_arg() {
-	echo "$1" | sed -e "s,\\([\\\"'         ]\\),\\\\\\1,g"
-}
-
-# Set defaults
-fb_mainclass="edu.umd.cs.findbugs.workflow.FB"
-user_jvmargs=''
-ea_arg=''
-debug_arg=''
-conservespace_arg=''
-user_props=''
-
-# Handle command line arguments.
-while [ $# -gt 0 ]; do
-	case $1 in
-	-textui)
-		fb_mainclass="edu.umd.cs.findbugs.FindBugs2"
-		;;
-
-	-jvmArgs)
-		shift
-		user_jvmargs="$1"
-		;;
-		
-	-ea)
-		ea_arg='-ea'
-		;;
-
-	-maxHeap)
-		shift
-		fb_maxheap="-Xmx$1m"
-		;;
-
-	-debug)
-		debug_arg="-Dfindbugs.debug=true"
-		;;
-
-	-conserveSpace)
-		conservespace_arg="-Dfindbugs.conserveSpace=true"
-		;;
-
-	-property)
-		shift
-		user_props="-D$1 $user_props"
-		;;
-	
-	-D*=*)
-		user_props="$1 $user_props"
-		;;
-
-	-version)
-		fb_mainclass=edu.umd.cs.findbugs.Version
-		fb_appargs="-release"
-		while [ $# -gt 0 ]; do
-			shift
-		done
-		;;
-
-	-help)
-		fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
-		;;
-
-	# All unrecognized arguments will be accumulated and
-	# passed to the application.
-	*)
-		fb_appargs="$fb_appargs `escape_arg "$1"`"
-		;;
-	esac
-
-	shift
-done
-
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_jvmargs="$fb_maxheap $user_jvmargs $debug_arg $conservespace_arg $user_props $ea_arg"
-gjl_pkg_args="$fb_appargs"
diff --git a/dev-util/findbugs/files/launchers/fbwrap b/dev-util/findbugs/files/launchers/fbwrap
deleted file mode 100644
index 7d208611c13c..000000000000
--- a/dev-util/findbugs/files/launchers/fbwrap
+++ /dev/null
@@ -1,3 +0,0 @@
-fb_mainclass="$1"
-unset fb_jvmargs
-shift
diff --git a/dev-util/findbugs/files/launchers/findbugs b/dev-util/findbugs/files/launchers/findbugs
deleted file mode 100644
index e557ce516212..000000000000
--- a/dev-util/findbugs/files/launchers/findbugs
+++ /dev/null
@@ -1,83 +0,0 @@
-escape_arg() {
-	echo "$1" | sed -e "s,\\([\\\"'         ]\\),\\\\\\1,g"
-}
-
-# Set defaults
-fb_mainclass="edu.umd.cs.findbugs.LaunchAppropriateUI"
-user_jvmargs=''
-ea_arg=''
-debug_arg=''
-conservespace_arg=''
-user_props=''
-
-# Handle command line arguments.
-while [ $# -gt 0 ]; do
-	case $1 in
-	-gui)
-		# this is the default
-		;;
-
-	-gui1)
-		user_props="-Dfindbugs.launchUI=1 $user_props"
-		;;
-
-	-textui)
-		fb_mainclass="edu.umd.cs.findbugs.FindBugs2"
-		;;
-
-	-jvmArgs)
-		shift
-		user_jvmargs="$1"
-		;;
-		
-	-ea)
-		ea_arg='-ea'
-		;;
-
-	-maxHeap)
-		shift
-		fb_maxheap="-Xmx$1m"
-		;;
-
-	-debug)
-		debug_arg="-Dfindbugs.debug=true"
-		;;
-
-	-conserveSpace)
-		conservespace_arg="-Dfindbugs.conserveSpace=true"
-		;;
-
-	-property)
-		shift
-		user_props="-D$1 $user_props"
-		;;
-	
-	-D*=*)
-		user_props="$1 $user_props"
-		;;
-
-	-version)
-		fb_mainclass=edu.umd.cs.findbugs.Version
-		fb_appargs="-release"
-		while [ $# -gt 0 ]; do
-			shift
-		done
-		;;
-
-	-help)
-		fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
-		;;
-
-	# All unrecognized arguments will be accumulated and
-	# passed to the application.
-	*)
-		fb_appargs="$fb_appargs `escape_arg "$1"`"
-		;;
-	esac
-
-	shift
-done
-
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_jvmargs="$fb_maxheap $user_jvmargs $debug_arg $conservespace_arg $user_props $ea_arg"
-gjl_pkg_args="$fb_appargs"
diff --git a/dev-util/findbugs/files/launchers/findbugs2 b/dev-util/findbugs/files/launchers/findbugs2
deleted file mode 100644
index d87ea82c0907..000000000000
--- a/dev-util/findbugs/files/launchers/findbugs2
+++ /dev/null
@@ -1,89 +0,0 @@
-# Default UI is GUI2
-fb_launchui="2"
-
-#
-# Stuff we're going to pass to the JVM as JVM arguments.
-#
-jvm_debug=""
-jvm_maxheap="-Xmx768m"
-jvm_ea=""
-jvm_conservespace=""
-jvm_user_props=""
-
-#
-# Process command line args until we hit one we don't recognize.
-#
-finishedArgs=false
-while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; do
-
-	arg=$1
-
-	case $arg in
-		-textui)
-			shift
-			fb_launchui="0"
-			;;
-
-		-gui)
-			shift
-			fb_launchui="2"
-			;;
-
-		-gui1)
-			shift
-			fb_launchui="1"
-			;;
-
-		-maxHeap)
-			shift
-			jvm_maxheap="-Xmx$1m"
-			shift
-			;;
-
-		-ea)
-			shift
-			jvm_ea="-ea"
-			;;
-
-		-debug)
-			shift
-			jvm_debug="-Dfindbugs.debug=true"
-			;;
-
-		-conserveSpace)
-			shift
-			jvm_conservespace="-Dfindbugs.conserveSpace=true"
-			;;
-
-		-property)
-			shift
-			jvm_user_props="-D$1 $jvm_user_props"
-			shift
-			;;
-	
-		-D*=*)
-			jvm_user_props="$1 $user_props"
-			shift
-			;;
-
-		-version)
-			shift
-			fb_launchui="version"
-			;;
-
-		-help)
-			shift
-			fb_launchui="help"
-			;;
-
-		# All arguments starting from the first unrecognized arguments
-		# are passed on to the Java app.
-		*)
-			finishedArgs=true
-			;;
-	esac
-
-done
-
-fb_mainclass="edu.umd.cs.findbugs.LaunchAppropriateUI"
-fb_jvmargs="$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props -Dfindbugs.launchUI=$fb_launchui"