Adding metadata

12 files changed, 30 insertions, 12 deletions

diff --git a/dev-java/commons-compress/metadata.xml b/dev-java/commons-compress/metadata.xml
index e25b5c52aab3..454e8675515b 100644
--- a/dev-java/commons-compress/metadata.xml
+++ b/dev-java/commons-compress/metadata.xml
@@ -5,6 +5,8 @@
   <email>java@gentoo.org</email>
   <name>Java</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:apache:commons-compress</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index 3071fb57ed97..d6f4708d800d 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -9,7 +9,9 @@
   <email>java@gentoo.org</email>
   <name>Java</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:redhat:icedtea</remote-id>
+ </upstream>
  <use>
   <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
  </use>
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index bcb96f43acf6..f5c0b9889ae0 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -20,7 +20,9 @@
  <longdescription>
 		The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software 	build tools along with additional tools such as a browser plugin and Web Start support via NetX.
 	</longdescription>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:redhat:icedtea</remote-id>
+ </upstream>
  <use>
   <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
   <flag name="cups">Link against the CUPS library at compile time, rather than using it dynamically at runtime.</flag>
diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
index 0306f5b66439..d7bddcf955e5 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild
@@ -23,8 +23,7 @@ RDEPEND=">=virtual/jre-1.8:*
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 	${CDEPEND}"
 
-DEPEND="dev-java/javacup:0
-	>=virtual/jdk-1.8:*
+DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/junit:4 )
 	${CDEPEND}"
 
@@ -34,8 +33,10 @@ S="${WORKDIR}/${P}"
 JAVA_SRC_DIR="src/main/java"
 
 src_prepare() {
+	eapply_user
+
 	# See below for details.
-	eapply_user "${FILESDIR}/icedtea-arm.patch"
+	eapply "${FILESDIR}/icedtea-arm.patch"
 
 	# We need the bundled jflex.jar.
 	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml
index e26ffb35d946..c56fd64827f1 100644
--- a/dev-java/junit/metadata.xml
+++ b/dev-java/junit/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="github">junit-team/junit4</remote-id>
   <remote-id type="sourceforge">junit</remote-id>
+  <remote-id type="cpe">cpe:/a:junit:junit4</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
index 81279d10763f..c8478138eaa4 100644
--- a/dev-java/jython/metadata.xml
+++ b/dev-java/jython/metadata.xml
@@ -7,6 +7,7 @@
  </maintainer>
  <upstream>
   <remote-id type="sourceforge">jython</remote-id>
+  <remote-id type="cpe">cpe:/a:jython_project:jython</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/metadata.xml b/dev-java/metadata.xml
index 878473a04601..110adbe2ca1d 100644
--- a/dev-java/metadata.xml
+++ b/dev-java/metadata.xml
@@ -41,4 +41,3 @@
 		z językiem programowania Java.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-java/slf4j-api/metadata.xml b/dev-java/slf4j-api/metadata.xml
index e25b5c52aab3..d543223683d7 100644
--- a/dev-java/slf4j-api/metadata.xml
+++ b/dev-java/slf4j-api/metadata.xml
@@ -5,6 +5,8 @@
   <email>java@gentoo.org</email>
   <name>Java</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:qos:slf4j-api</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/slf4j-ext/metadata.xml b/dev-java/slf4j-ext/metadata.xml
index e25b5c52aab3..d543223683d7 100644
--- a/dev-java/slf4j-ext/metadata.xml
+++ b/dev-java/slf4j-ext/metadata.xml
@@ -5,6 +5,8 @@
   <email>java@gentoo.org</email>
   <name>Java</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:qos:slf4j-api</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/slf4j-log4j12/metadata.xml b/dev-java/slf4j-log4j12/metadata.xml
index e25b5c52aab3..d543223683d7 100644
--- a/dev-java/slf4j-log4j12/metadata.xml
+++ b/dev-java/slf4j-log4j12/metadata.xml
@@ -5,6 +5,8 @@
   <email>java@gentoo.org</email>
   <name>Java</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:qos:slf4j-api</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/slf4j-nop/metadata.xml b/dev-java/slf4j-nop/metadata.xml
index e25b5c52aab3..d543223683d7 100644
--- a/dev-java/slf4j-nop/metadata.xml
+++ b/dev-java/slf4j-nop/metadata.xml
@@ -5,6 +5,8 @@
   <email>java@gentoo.org</email>
   <name>Java</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:qos:slf4j-api</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/slf4j-simple/metadata.xml b/dev-java/slf4j-simple/metadata.xml
index e25b5c52aab3..d543223683d7 100644
--- a/dev-java/slf4j-simple/metadata.xml
+++ b/dev-java/slf4j-simple/metadata.xml
@@ -5,6 +5,8 @@
   <email>java@gentoo.org</email>
   <name>Java</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:qos:slf4j-api</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file