Adding metadata

4 files changed, 35 insertions, 25 deletions

diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
index 5e1c153372fe..2659db65179d 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/slf4j-api/metadata.xml b/dev-java/slf4j-api/metadata.xml
index 386d48d3746f..fc147d3a4dd2 100644
--- a/dev-java/slf4j-api/metadata.xml
+++ b/dev-java/slf4j-api/metadata.xml
@@ -7,6 +7,8 @@
  </maintainer>
  <upstream>
   <remote-id type="cpe">cpe:/a:qos:slf4j</remote-id>
+  <bugs-to>http://www.slf4j.org/bug-reporting.html</bugs-to>
+  <doc>http://www.slf4j.org/docs.html</doc>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.30.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
index 6a7a281f5595..1bd87893b1d4 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.30.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
@@ -27,20 +27,18 @@ DEPEND="
 RDEPEND="
 	>=virtual/jre-1.8:*
 "
+BDEPEND="app-arch/zip"
 
-S="${WORKDIR}"
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
 
-JAVA_SRC_DIR="slf4j-v_${PV}/${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"slf4j-v_${PV}/${PN}/src/main/resources"
-)
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java"
+JAVA_TEST_SRC_DIR="src/test/java"
+
 JAVA_TEST_EXCLUDES=(
-	# This code should have never made it into slf4j-api.jar
-	"org.slf4j.NoBindingTest"	
-	# java.lang.InstantiationException
+	# java.lang.InstantiationException - not run by upstream anyway
 	"org.slf4j.helpers.MultithreadedInitializationTest"
 )
 
@@ -48,3 +46,10 @@ src_prepare() {
 	default
 	java-pkg_clean
 }
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# remove org/slf4j/impl/ from the jar file
+	zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
+}
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
index 4fabf53201d2..3313f9adff17 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.30.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild
@@ -20,12 +20,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
-# slf4j-v_1.7.30/slf4j-simple/src/test/java/org/slf4j/helpers/SimpleLoggerMultithreadedInitializationTest.java:37: error: cannot find symbol
-# public class SimpleLoggerMultithreadedInitializationTest extends MultithreadedInitializationTest {
-#                                                                  ^
-#   symbol: class MultithreadedInitializationTest
-RESTRICT="test"
-
 # Common dependencies
 # POM: slf4j-v_${PV}/${PN}/pom.xml
 # org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
@@ -49,23 +43,32 @@ DEPEND="
 
 RDEPEND="
 	>=virtual/jre-1.8:*
-	${CDEPEND}"
+	${CDEPEND}
+"
 
-S="${WORKDIR}"
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
 
 JAVA_GENTOO_CLASSPATH="slf4j-api"
-JAVA_SRC_DIR="slf4j-v_${PV}/${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"slf4j-v_${PV}/${PN}/src/main/resources"
-)
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
-JAVA_TEST_SRC_DIR="slf4j-v_${PV}/${PN}/src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"slf4j-v_${PV}/${PN}/src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# java.lang.InstantiationException
+	"org.slf4j.helpers.MultithreadedInitializationTest"
+
+	# java.lang.AssertionError: 1284 < 1263+16
+	"org.slf4j.helpers.SimpleLoggerMultithreadedInitializationTest"
 )
 
 src_prepare() {
 	default
 	java-pkg_clean
+	cp "../slf4j-api/src/test/java/org/slf4j/helpers/MultithreadedInitializationTest.java" \
+		"${JAVA_TEST_SRC_DIR}/org/slf4j/helpers/" || die
+	cp "../slf4j-api/src/test/java/org/slf4j/LoggerAccessingThread.java" \
+		"${JAVA_TEST_SRC_DIR}/org/slf4j/" || die
 }