From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 dev-java/bytelist/Manifest               |   7 +-
 dev-java/bytelist/bytelist-1.0.10.ebuild |  49 -------
 dev-java/bytelist/bytelist-1.0.15.ebuild |  47 +++++++
 dev-java/bytelist/files/maven-build.xml  | 219 -------------------------------
 dev-java/bytelist/metadata.xml           |  13 +-
 5 files changed, 57 insertions(+), 278 deletions(-)
 delete mode 100644 dev-java/bytelist/bytelist-1.0.10.ebuild
 create mode 100644 dev-java/bytelist/bytelist-1.0.15.ebuild
 delete mode 100644 dev-java/bytelist/files/maven-build.xml

(limited to 'dev-java/bytelist')

diff --git a/dev-java/bytelist/Manifest b/dev-java/bytelist/Manifest
index 88b8cb054d67..a2befbcc641f 100644
--- a/dev-java/bytelist/Manifest
+++ b/dev-java/bytelist/Manifest
@@ -1,4 +1,3 @@
-AUX maven-build.xml 8736 BLAKE2B 6c80c5869c375da19bd15b37f8fc00a7b94d5dcb14396b3c7d42a4cbc1c6e81c3720fcfac38089ae29e492beb5aaa760d82d94d81a83149d0b8cb5e241f06ecc SHA512 1238cb1b7c53c4138f05feaa4bde6bb275d3553039940122d29df7b696945c7b021fe856b28e41c6c0fe4072b0e71280af1ba9b7f07ee8ac9941a049a44a3e86
-DIST bytelist-1.0.10.tar.gz 15619 BLAKE2B d715949e9d78201c2fbc97a6c055630b83db4989108f7fb5f68d09cc461b4bf8f30f7ffb0ad66166aa13f23a50a832e12d721ffa2a72206348db0f4070fad941 SHA512 fb522a43d5cac8a4804f64caa38fb9ab793a0f0688a69987f3be6f2245a4a2c9739a0d807f88be947c0bd7f908c069a2f8092cc4d5314c3fddb6541d9db70f7c
-EBUILD bytelist-1.0.10.ebuild 988 BLAKE2B 1fd8bafad0f950e3f53c39be7b12889304725c05350548e17ad1870f825e391d62cb4dfaa86b01706bc886031661074dcbe6808fc02f1056421c9a9e8847c834 SHA512 a3c74bbc0603a0fac3c821ae07ca5b75233914e5da67f3a0a4013e2d5a49bd6501e79b03e5325dd2e4214f82e737171668a35cd9525c5ea0811c7c79de9ba59e
-MISC metadata.xml 303 BLAKE2B eb9bfc2199bfcb29a93a127137edd0d330f868824bccf1c74830515f1f3c4f5d008d9ab6a7e5c4f9f87fed1ef7e954b7955d6c70e1e840b400428920080be362 SHA512 94ee8b7bd5d0b719b1f2afd8b3f61812bb73cd764b482bcaa73a3d60ee8080b44486697fd58dc601f23502893a0995e1a46dfb262e7c9793531765eceeb1051f
+DIST bytelist-1.0.15-sources.tar.gz 50512 BLAKE2B f17094ac4ef8ea68d48b05589b9fe3b8a90033dbc33992d0ebbcf70851c6877e20dcbe68f2e505e62301346653519833318d2c671bea9d6914d9f017610204f7 SHA512 1575a97229db7a7b99abd4fc74e713f79cd9bca4b7ffa13ba52607d84d5f7af8863c45dfd65dd32e12b03feb659808cf2f07ea494c87ca496061ab00280a40f4
+EBUILD bytelist-1.0.15.ebuild 1104 BLAKE2B 932da043af6890a52c6a293e3d9bb19474f98911732c434597482714e8a6ae873acff4a0addff30579d409e62024a5373b3fda9e3607479cd38ddca7faa05415 SHA512 c83e8d50b9497e19ca48e1657449285ac70ca5b7b44b317b9e3a44ca814af27d1a8302273770cbc7b5cbac0ec7a701ef936b5905daf697875f56672f5235f38a
+MISC metadata.xml 357 BLAKE2B 3dfcc0e03aebdda665a6abbaa40936d4a7a9facf3927bd8e617b9b149eb52f8852ded956d246cce1947c85f6fa9519578d8939ce0c86e198ec98141891a90ccc SHA512 f89cb3940ef64040717f8a89f30df71b1fe289f909c784db1505a3cdb49f3218db2ad2e420de5c01837b210b67bd0b4f2726e080d5ca3e1decaf7e0eb75f8196
diff --git a/dev-java/bytelist/bytelist-1.0.10.ebuild b/dev-java/bytelist/bytelist-1.0.10.ebuild
deleted file mode 100644
index eb1aa2d3d034..000000000000
--- a/dev-java/bytelist/bytelist-1.0.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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
-
-DESCRIPTION="JRuby support library"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://github.com/jruby/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEP="dev-java/jcodings:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? ( dev-java/ant-junit:0 )"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}"/jruby-${PN}-* "${WORKDIR}"/${P} || die
-}
-
-java_prepare() {
-	cp "${FILESDIR}"/maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="jcodings"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/bytelist/bytelist-1.0.15.ebuild b/dev-java/bytelist/bytelist-1.0.15.ebuild
new file mode 100644
index 000000000000..8800cb76ac02
--- /dev/null
+++ b/dev-java/bytelist/bytelist-1.0.15.ebuild
@@ -0,0 +1,47 @@
+# 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://github.com/jruby/bytelist/archive/refs/tags/bytelist-1.0.15.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild bytelist-1.0.15.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jruby.extras:bytelist:1.0.15"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Byte array based container"
+HOMEPAGE="https://github.com/jruby/bytelist"
+SRC_URI="https://github.com/jruby/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.jruby.jcodings:jcodings:1.0.18 -> >=dev-java/jcodings-1.0.11:1
+
+CDEPEND="
+	>=dev-java/jcodings-1.0.11:1
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_GENTOO_CLASSPATH="jcodings-1"
+JAVA_SRC_DIR="src"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="test"
diff --git a/dev-java/bytelist/files/maven-build.xml b/dev-java/bytelist/files/maven-build.xml
deleted file mode 100644
index ee880775a409..000000000000
--- a/dev-java/bytelist/files/maven-build.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="bytelist-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="bytelist"/>
-  <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"/>
-  <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="test"/>
-  <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>
-  <path id="build.test.classpath">
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- 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.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <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" 
-         manifest="MANIFEST.MF" 
-         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">
-  </target>
-
-</project>
diff --git a/dev-java/bytelist/metadata.xml b/dev-java/bytelist/metadata.xml
index 96cb48b87e21..2ff0b0026b27 100644
--- a/dev-java/bytelist/metadata.xml
+++ b/dev-java/bytelist/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jruby/bytelist</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jruby/bytelist</remote-id>
+		<bugs-to>https://github.com/jruby/bytelist/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
-- 
cgit v1.2.3