gentoo resync : 31.05.2021

4 files changed, 2 insertions, 224 deletions

diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index 548c3d0718f0..fc3b5b8ad9dc 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -1,7 +1,4 @@
-AUX metainf-services-1.6-build.xml 8356 BLAKE2B 1f73238ca0f06f0a9b31d756313a492333dae4098f93979978eaa369498994671cbeb3da185c3628a013bae0fe2537aa0b55dca14246e982b7a185cfed17a5bd SHA512 22ae17b70e0760553cdc6dd641a79533712c8512a4f43b81a97eadeb674037fc0e1019afe82d7d98dc6e5346c048343ffe7ce747ab81f51a52f555974545a012
 AUX metainf-services-1.7-build.xml 8356 BLAKE2B a9ee4ed2d959885fd2cb81a827f709152ce656f3864af8949ef47fc32fe9932dddac08cdc44887115444069b5852383177b17de162404c6d1c46a073558bcead SHA512 183ea6c131bc9d63172d34966950f6d7eca5aeb4b23e2b9fc4f6045ac2688cc8e2931ab7d1a986c36bedbc0521a7fc13263be3e5cebbf915b07d12c4e6aac5ec
-DIST metainf-services-1.6.tar.gz 5282 BLAKE2B e5d0231bb90e72200780eef67a631146d10281f4a29e61a09c0cabd5a00205974f351445a7cfd88146862c3d84ad5340e2e259f469374a3d4942a4c33744b5fb SHA512 237f37b8eaa384dfd7df6d0a31fa7e5d086c6923c5eb2435317701402b14ba472839d0e49b9ce9da25c265d6e128679f7d637d41439756242ae591d3b15e1108
 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
-EBUILD metainf-services-1.6.ebuild 567 BLAKE2B a1fddf4bd500d0a536839e8bf5bd0d59915b378ae6878b85872c71693b606e064dfb786f22d69c55131054e9a5d81eecdb2a4b1152fad6c95491bf06e8f4ee9b SHA512 ee6c26b10fa347d7ffcfb067a7f363f90032c462e7956a3289b16651f48b526b08e36350fce8fa9b8e6218ade065c4b7ca6bbfb857b97bbd4ea19c79e41d31ca
-EBUILD metainf-services-1.7.ebuild 569 BLAKE2B 50ecf097920c3ab248fd7f5b0d1e99bb26f18648cfd64eceaec2fa806b1d9ceb98529ca28292c336cbea8ba5c88447db6cd6c4228b2588908ebc549b2352fb16 SHA512 1fd05a9dbad8d60b06362be0876869751558268cd816409a5495592816b271ee256ec26e507ab60931192681a54a978380eb01534877111090bc69c27481f7e8
+EBUILD metainf-services-1.7.ebuild 567 BLAKE2B a1fddf4bd500d0a536839e8bf5bd0d59915b378ae6878b85872c71693b606e064dfb786f22d69c55131054e9a5d81eecdb2a4b1152fad6c95491bf06e8f4ee9b SHA512 ee6c26b10fa347d7ffcfb067a7f363f90032c462e7956a3289b16651f48b526b08e36350fce8fa9b8e6218ade065c4b7ca6bbfb857b97bbd4ea19c79e41d31ca
 MISC metadata.xml 335 BLAKE2B 6b80ceaeaef798225f8d929e5e86677482395de9bb24ad765759f68e7a788ade7de997d230a35aa92b97145ef7dd0c8d319a9c1c2597149e161adbcdab373947 SHA512 7dda5e5b222befb2e0a0040429d96d8e9bcc721a22576400b0ee16d827011dbbed85edd85383ed3b398564645d94da56ea48fc7aa3c8a65655334df74b8a6f5a
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"