Adding metadata

7 files changed, 75 insertions, 222 deletions

diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index 4393862d1a37..6788adb48ee3 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -1,2 +1 @@
-DIST metainf-services-1.6.tar.gz 5282 BLAKE2B e5d0231bb90e72200780eef67a631146d10281f4a29e61a09c0cabd5a00205974f351445a7cfd88146862c3d84ad5340e2e259f469374a3d4942a4c33744b5fb SHA512 237f37b8eaa384dfd7df6d0a31fa7e5d086c6923c5eb2435317701402b14ba472839d0e49b9ce9da25c265d6e128679f7d637d41439756242ae591d3b15e1108
 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
diff --git a/dev-java/metainf-services/files/metainf-services-1.6-build.xml b/dev-java/metainf-services/files/metainf-services-1.6-build.xml
deleted file mode 100644
index 98e53f439d22..000000000000
--- a/dev-java/metainf-services/files/metainf-services-1.6-build.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 7/13/13 1:12 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="metainf-services-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="metainf-services-1.6"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath"/>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="false" 
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases"/>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-  </target>
-
-</project>
diff --git a/dev-java/metainf-services/metainf-services-1.6.ebuild b/dev-java/metainf-services/metainf-services-1.6.ebuild
deleted file mode 100644
index bb7d68cfe2f2..000000000000
--- a/dev-java/metainf-services/metainf-services-1.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Generates META-INF/services files automatically"
-HOMEPAGE="http://metainf-services.kohsuke.org/"
-SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}-${P}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-}
diff --git a/dev-java/metainf-services/metainf-services-1.7.ebuild b/dev-java/metainf-services/metainf-services-1.7.ebuild
index a10038783c8f..bb7d68cfe2f2 100644
--- a/dev-java/metainf-services/metainf-services-1.7.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch b/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
new file mode 100644
index 000000000000..994fd42ad5e6
--- /dev/null
+++ b/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
@@ -0,0 +1,72 @@
+From 3ea94a870b6e139399abbf932da1dfa2f9bd37e3 Mon Sep 17 00:00:00 2001
+From: parrt <parrt@cs.usfca.edu>
+Date: Thu, 8 Nov 2018 11:40:24 -0800
+Subject: [PATCH] make tests work with java 10 and 6, 7, 8
+
+---
+ .../stringtemplate/v4/test/TestRenderers.java | 24 +++++++++++++++----
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/test/org/stringtemplate/v4/test/TestRenderers.java b/test/org/stringtemplate/v4/test/TestRenderers.java
+index bc5406f7..7b7536e0 100644
+--- a/test/org/stringtemplate/v4/test/TestRenderers.java
++++ b/test/org/stringtemplate/v4/test/TestRenderers.java
+@@ -48,6 +48,8 @@
+ 
+ public class TestRenderers extends BaseTest {
+ 
++	String javaVersion = System.getProperty("java.version");
++
+ 	// Make sure to use the US Locale during the tests
+ 	private Locale origLocale;
+ 
+@@ -73,6 +75,9 @@ public void tearDown() {
+ 		ST st = group.getInstanceOf("dateThing");
+ 		st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+ 		String expecting = "datetime: 7/5/05, 12:00 AM";
++		if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++			expecting = "datetime: 7/5/05 12:00 AM";
++		}
+ 		String result = st.render();
+ 		assertEquals(expecting, result);
+ 	}
+@@ -99,7 +104,10 @@ public void tearDown() {
+         ST st = group.getInstanceOf("dateThing");
+         st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+         String expecting = " datetime: 7/5/05, 12:00 AM ";
+-        String result = st.render();
++	    if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++		    expecting = " datetime: 7/5/05 12:00 AM ";
++	    }
++	    String result = st.render();
+         assertEquals(expecting, result);
+     }
+ 
+@@ -116,9 +124,13 @@ public void tearDown() {
+         	TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
+         	st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+         	String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
+-        	String result = st.render();
++	        if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++		        expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
++	        }
++	        String result = st.render();
+         	assertEquals(expecting, result);
+-        } finally {
++        }
++        finally {
+            	// Restore original Timezone
+            	TimeZone.setDefault(origTimeZone);
+         }
+@@ -371,6 +383,10 @@ public void tearDown() {
+ 		cal.set(2012, Calendar.JUNE, 12);
+ 		st.add("date", cal);
+ 
+-		assertEquals("12 de junho de 2012", st.render(new Locale("pt")));
++		String expected = "12 de junho de 2012";
++		if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++			expected = "12 de Junho de 2012";
++		}
++		assertEquals(expected, st.render(new Locale("pt")));
+ 	}
+ }
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
index c2fba7061b02..72831a73fdbb 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
@@ -37,6 +37,7 @@ JAVA_SRC_DIR="src"
 PATCHES=(
 	# These tests are broken but are probably fixed in current master.
 	"${FILESDIR}/4.0.8-r1-test-fixes.patch"
+	"${FILESDIR}/${P}-fix-tests.patch"
 )
 
 src_unpack() {
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
index e168928a7d05..5c0b7b77c58f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"