gentoo resync : 14.07.2018

6 files changed, 168 insertions, 0 deletions

diff --git a/dev-java/javolution/Manifest b/dev-java/javolution/Manifest
new file mode 100644
index 000000000000..4db58e6ec72d
--- /dev/null
+++ b/dev-java/javolution/Manifest
@@ -0,0 +1,8 @@
+AUX 4.0.2-fix-java7.patch 1066 BLAKE2B 4ee9987e936138594bab0f033ce684e082271fc0cdb1abc0504cf86f25b2d18f34181ccdde5e45976def75a0b92b74cf9daa43060e30edc76304d266cb93a666 SHA512 11a9e64002486a52ef4aa35ab0d4e5faf370b2d7e6e16534e2429ddc32ce6213075c9190c06e441fdfd15d0a330826c457cc5c26b2a24ce59540c31da8021e66
+AUX javolution-6.0.0-javadoc-fix.patch 788 BLAKE2B 6b8407412e6825fba02b252568ab1c81b50988b185e1d53ca9018e6690f6f3c2976b41950488aa487909d0b085762e7a54877053650d5576ba3d918dde79a3fb SHA512 244d561628e7444c4ab22f8bf3a4241d67aba6dd6ce593f02647e3023c81b36e83322bb7adf40a277e63165246265870de8654e5bd826564e58af37f71fd1824
+DIST javolution-4.0.2-src.zip 556097 BLAKE2B 83f009a60e2b981d488b0b5f95572d3f88f724388b0d09eee10d7f1555379b2b51cf1d2f0f0af74d6944718b7e4b2f609f7866a747c19001edb2466611a6192a SHA512 562e0d364aa6b564341ce197941aaaf51e286712e6b71459ac12eccffbdf1d440f1910826cebf088176562b5dccb865f5d0e652a519814e1357094e253ee2efd
+DIST javolution-6.0.0-build.xml.tar.xz 2696 BLAKE2B 825899c903300dd7d031ab372c85f2824b796305dcf56ea9fc162d883a09f2feedc7498d13b6c803ad43d876dcf3dc457704cf834ff9d48411a67e0bec0a28f9 SHA512 5861e462f24817efec24a784625e240fd4e08117c7b11bf7145f8dae35bb90b0b9fc1e431895ef5d868a1f1d57d96967fd9f39a9b821b51875814f6e118dbdab
+DIST javolution-6.0.0.tar.xz 1308148 BLAKE2B 148bd28e7cd9a0fe16d657cb61fd870e92180f4ad64fb9b1a37fa953309a80c1f3b3b9edbe0c7defa2a3a73ba8d3cf200ee29737769cc31fe87300fbc40f2111 SHA512 86a7a19b13b74cca6ab4871e725a1143d6a1401cc7265390ee66b83f8a9b48f7879b8ccc2d7a3d660e523b64e3779eaf372519ee98268f1bf55df1d7b5a7f034
+EBUILD javolution-4.0.2-r1.ebuild 862 BLAKE2B ce8525edd225cfc331137a736f0629a7baa25a91ffcff2b61ae20c82fb64ca60a9e7cba2ff83562b6684a6747b0af34eacfd9adaa7e76c1697a370342b067f73 SHA512 57633a2a5818ec60a00697ccfae762beb908dceed175e7446fc194bf4e096493aec2e70daa8a7ef9f67f865bf471921736cc882f6d826fca81529d9b6ea7c808
+EBUILD javolution-6.0.0.ebuild 1359 BLAKE2B a03bb5a832d6381b6cea9c55bdbe00d7f4393bb3bb9967d2be57f1c6d9ff844c08cd671459986cd2c53a2adc32a9e55d1f8ea1b9f77246a738ba6f16247d1ac3 SHA512 9719d2ad63d57e897fae5692a08e67cc91da5a89a9e5dfbaf8b9a27dd6dfe07e186791bb4d88ae4ef5d59da58daf80e1a11d4b5da60e31e2d2c8872e97945a4b
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javolution/files/4.0.2-fix-java7.patch b/dev-java/javolution/files/4.0.2-fix-java7.patch
new file mode 100644
index 000000000000..19d2275b8e0c
--- /dev/null
+++ b/dev-java/javolution/files/4.0.2-fix-java7.patch
@@ -0,0 +1,38 @@
+diff --git a/javolution-4.0/src/javolution/io/Struct.java b/javolution-4.0/src/javolution/io/Struct.java
+index 5198030..3def806 100644
+--- a/javolution-4.0/src/javolution/io/Struct.java
++++ b/javolution-4.0/src/javolution/io/Struct.java
+@@ -134,7 +134,7 @@ public class Struct {
+ 	/**
+ 	 * Holds the outer struct if any.
+ 	 */
+-	private Struct _outer;
++	Struct _outer;
+ 
+ 	/**
+ 	 * Holds the byte buffer backing the struct (top struct).
+@@ -145,7 +145,7 @@ public class Struct {
+ 	 * Holds the offset of this struct relative to the outer struct or
+ 	 * to the byte buffer if there is no outer.
+ 	 */
+-	private int _outerOffset;
++	int _outerOffset;
+ 
+ 	/**
+ 	 * Holds the number of bits currently used (for size calculation).
+@@ -155,7 +155,7 @@ public class Struct {
+ 	/**
+ 	 * Holds this struct alignment (largest alignment of its members).
+ 	 */
+-	private int _alignment = 1;
++	int _alignment = 1;
+ 
+ 	/**
+ 	 * Holds the current bit index position (during construction).
+@@ -1607,4 +1607,4 @@ public class Struct {
+ 			}
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
diff --git a/dev-java/javolution/files/javolution-6.0.0-javadoc-fix.patch b/dev-java/javolution/files/javolution-6.0.0-javadoc-fix.patch
new file mode 100644
index 000000000000..24530ef6b251
--- /dev/null
+++ b/dev-java/javolution/files/javolution-6.0.0-javadoc-fix.patch
@@ -0,0 +1,13 @@
+--- a/core-java/maven-build.xml
++++ b/core-java/maven-build.xml
+@@ -180,9 +180,8 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="javadoc" description="Generates the Javadoc of the application">
+-    <javadoc sourcepath="/var/tmp/portage/dev-java/javolution-6.0.0/work/javolution-6.0.0/core-java/target/colorized" 
++    <javadoc sourcepath="/var/tmp/portage/dev-java/javolution-6.0.0/work/javolution-6.0.0/core-java/" 
+              destdir="${maven.reporting.outputDirectory}/apidocs" 
+-             overview="/var/tmp/portage/dev-java/javolution-6.0.0/work/javolution-6.0.0/core-java/target/colorized/javolution/doc-files/overview.html" 
+              access="protected" 
+              old="false" 
+              verbose="false" 
diff --git a/dev-java/javolution/javolution-4.0.2-r1.ebuild b/dev-java/javolution/javolution-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..80255b4d8561
--- /dev/null
+++ b/dev-java/javolution/javolution-4.0.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
+SRC_URI="http://javolution.org/${P}-src.zip"
+HOMEPAGE="http://javolution.org"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/javolution-${PV%.*}"
+
+EANT_BUILD_TARGET="clean _init_1.5 _compile jar"
+EANT_DOC_TARGET="doc"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}*.patch
+}
+
+src_test() {
+	java -jar "${PN}.jar" test || die "test failed"
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+
+	dodoc doc/coding_standard.txt
+	dohtml index.html
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc "${S}/src/${PN}"
+}
diff --git a/dev-java/javolution/javolution-6.0.0.ebuild b/dev-java/javolution/javolution-6.0.0.ebuild
new file mode 100644
index 000000000000..c289d27fec73
--- /dev/null
+++ b/dev-java/javolution/javolution-6.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Documentation generation is broken.
+JAVA_PKG_IUSE="source" # doc
+
+inherit java-pkg-2 java-ant-2 unpacker
+
+DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
+SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz
+	https://dev.gentoo.org/~tomwij/files/dist/${P}-build.xml.tar.xz"
+HOMEPAGE="http://javolution.org"
+
+LICENSE="BSD"
+SLOT="6"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/osgi-core-api:0
+	dev-java/osgi-compendium:0"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+EANT_BUILD_TARGET="package"
+JAVA_PKG_BSFIX_NAME="build.xml maven-build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="osgi-core-api,osgi-compendium"
+
+src_unpack() {
+	unpacker ${P}.tar.xz
+	cd "${S}" || die
+	unpacker ${P}-build.xml.tar.xz
+}
+
+java_prepare() {
+	# Remove bundled libraries.
+	find . -name '*.jar' -print -delete || die
+	find . -name '*.class' -print -delete || die
+
+	epatch "${FILESDIR}"/${P}-javadoc-fix.patch
+}
+
+src_install() {
+	java-pkg_newjar core-java/target/${PN}-core-java-${PV}.jar
+
+	dohtml index.html
+
+	# Documentation generation is broken.
+	#use doc && java-pkg_dojavadoc core-java/target/site/apidocs
+	use source && java-pkg_dosrc core-java/src/main/java/${PN}
+}
diff --git a/dev-java/javolution/metadata.xml b/dev-java/javolution/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/dev-java/javolution/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>