EAPI bump, minor qa, added patch to fix bug #421863

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

5 files changed, 103 insertions, 12 deletions

diff --git a/dev-java/javolution/ChangeLog b/dev-java/javolution/ChangeLog
index 0fcf55bb1b3a..10b16d4e27ab 100644
--- a/dev-java/javolution/ChangeLog
+++ b/dev-java/javolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/javolution
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/ChangeLog,v 1.18 2014/09/07 08:57:30 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/ChangeLog,v 1.19 2014/09/07 09:19:13 ercpe Exp $
+
+*javolution-4.0.2-r1 (07 Sep 2014)
+
+  07 Sep 2014; Johann Schmitz <ercpe@gentoo.org> +files/4.0.2-fix-java7.patch,
+  +javolution-4.0.2-r1.ebuild, javolution-4.0.2.ebuild:
+  EAPI bump, minor qa, added patch to fix bug #421863
 
 *javolution-2.2.4-r2 (07 Sep 2014)
 
diff --git a/dev-java/javolution/Manifest b/dev-java/javolution/Manifest
index eaca91402342..15904fc32d30 100644
--- a/dev-java/javolution/Manifest
+++ b/dev-java/javolution/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 4.0.2-fix-java7.patch 1066 SHA256 1b83a135bad7dd07555a542706a6d5823cea79fdec603bedefb7cae4c4c3bdad SHA512 11a9e64002486a52ef4aa35ab0d4e5faf370b2d7e6e16534e2429ddc32ce6213075c9190c06e441fdfd15d0a330826c457cc5c26b2a24ce59540c31da8021e66 WHIRLPOOL 489aee1697f4c12ed878cb9160ed49434d95304b46a8b9baa70089d14e905eb36bdf9e9f003091f5d7eb7c80f7f4009a651bfb437d1bd30aec7e76dbaf2aadd9
 AUX javolution-6.0.0-javadoc-fix.patch 788 SHA256 72458e10402ecfce1c9331dc09f14eba3fea52c61859a63b632444eb191e401b SHA512 244d561628e7444c4ab22f8bf3a4241d67aba6dd6ce593f02647e3023c81b36e83322bb7adf40a277e63165246265870de8654e5bd826564e58af37f71fd1824 WHIRLPOOL 789deac9b53a9fa96c11e0c20020ee4c77d14ca6ed578d5dcbfc1c3a87e32d2d1f5f9e25ef976160659468c9ef2c5259f031b0fb2007717decc7fb13cb8d35e2
 DIST javolution-2.2.4-src.zip 391698 SHA256 72f117ec3e7d8772c67bb5114596e75edcb0ffb00a3824ed7a2b9516e11e3078 SHA512 9cdc9a97667fa3b112b01b6d8275ae09b4e6d7fbcc7587d4c347072883ba3cc7a4c7e308778a6e4a1bdcaf4d093b081b35f0776d4a9d589d15677bbe02516912 WHIRLPOOL ede988cb048156d65804f78ba65e6152a86dbd2d58e165fdbdc907fa4c2fb30c2c306c1d216760444ca6d23fb7d666492d64ca8c2c5f01feede7497a3386e890
 DIST javolution-4.0.2-src.zip 556097 SHA256 fb5256c28b9f1de67e9be2ee3df16ff989f8f7bc4cd33946425f7e19370d4905 SHA512 562e0d364aa6b564341ce197941aaaf51e286712e6b71459ac12eccffbdf1d440f1910826cebf088176562b5dccb865f5d0e652a519814e1357094e253ee2efd WHIRLPOOL 7061f9debc2efe986e7f6d5615c11c5dab5809b3b3fe75daa466577b8d29194ccd71403739a2fe4bca7cdf049c8078577bf6aace555a2e018a023cb3d81ead53
@@ -8,18 +9,19 @@ DIST javolution-6.0.0-build.xml.tar.xz 2696 SHA256 2730a3cb2186de011bd1d5349ae15
 DIST javolution-6.0.0.tar.xz 1308148 SHA256 0af6f9725d0e50ec323a79c8b726ee01a070d860980c080270a853739e41434a SHA512 86a7a19b13b74cca6ab4871e725a1143d6a1401cc7265390ee66b83f8a9b48f7879b8ccc2d7a3d660e523b64e3779eaf372519ee98268f1bf55df1d7b5a7f034 WHIRLPOOL b4bf337dff963b766a2aa0ad8a3a0c37e9569c14c1fe7acd66bff180c68e40294decb06a6d85add09eab486cb967c89c3224cc467d013fde15e180a823890e8c
 EBUILD javolution-2.2.4-r1.ebuild 902 SHA256 5ab8d390b8f28ad0d4da609ceb29e3f14679c2dbb4f4f02754988d2a71a8d568 SHA512 a801f06934c58d46ade72c3d6f64cf18a343772bdca7a07bbc50790279128727ea9bb281f1203d54fdb05913922251cc599b7cd8ed29856987aecfefc7f407ea WHIRLPOOL 09351ff7144be8ad9f1674a81bba559281fd1d33bf0bf69d5b7d8e771ced8dbf61061120d9d1e8517aa2cc4514185b2551846b0792130ad4fbf31ade170ffb0a
 EBUILD javolution-2.2.4-r2.ebuild 877 SHA256 e6b8fb27b77ae4d433985c53fad7e9e9789545aa0f045acff24fceb28a5c3efb SHA512 80336c669b3fd296fc7a0208fb5d29a828725a2ac84a41eb48e8a0f587b06261e226d87b675e06d1a1720e80b7798d98c19e1443c45a1fff2b825c9bba48f1c7 WHIRLPOOL aca0e172c0ec8c8b6eefc96dedaa1fe4a64a608908e15044dd92b3ff43c09854336b49e9ddbc2855830d0b75d5d70758876181fb830138ea5e6357c6cd62eeb3
-EBUILD javolution-4.0.2.ebuild 909 SHA256 5590cfb0d1496ef8442af803bbef12d032cc32fc7a7b5d79505ed02044569d97 SHA512 5b716ca4c8198d1771896fd1638d79b736155aa21af59f7fbe4365edbabde1e66a2bd7f100d07c9c5ded464ef9c138ed88a7f4ffab080019fc9a437ed5ce0764 WHIRLPOOL bc187977f8a1c354612c32904f9892bbf52303b1ee0650fdc48c35d64380815faec58f6d0b767de6793ee9d938fef5a54ca9ac4667f9e44bb8a1270d82ce2b45
+EBUILD javolution-4.0.2-r1.ebuild 989 SHA256 84e228512e0fde5c8091fac7f4e6a765a7be9f8675df08996e9dc48727247850 SHA512 71cb0d7d18250368865856b68c3fd9629c15cb301fd6e586176059153cc30093c1332f7d2927a7f692db051a8501f0ec7f521cd05e0dc50c391f20dfcf4bd5df WHIRLPOOL 23706e4151e3cac77f686b435374bcdaa0ed4b0a529340bbf5d7900762d269b492ae590efaa542d9cfe394cef76e697d0572c4e4ca7bd5e71aa3b727c15af922
+EBUILD javolution-4.0.2.ebuild 906 SHA256 ba0c4f43991f751821c33f9356cae89835170f7a301ee604cd8182e8c0642edf SHA512 bfb0a024697b0b6e9ccdb4767bfc2e0a245e9a83975e64a662a8a1183d8d952c25da31c6e176d26f9db7e7f4036fb3050fba26f3b94eb733b91dc2cc21fa6f48 WHIRLPOOL ac073e6f7947e62051b8038ad8c90f0d3786520a0dc88d23aac903fbdfe82ff4679a933aca158165a69b9246006dfb55d2acad4b2998d8f60c4d2ecf10ca3a00
 EBUILD javolution-6.0.0.ebuild 1474 SHA256 797627f843db6cda8782e4e2554577ae92c68e8b11954c4179f9a57cbd35895f SHA512 53d10113a73bbdbcabb2c54db28fb0bd87d21aa9e2efe403572f0ccc847178606ca9e3bcdda828d854bbb6c2f5c8ffbf7fbddeb60d41435299a08b5177cb87f5 WHIRLPOOL 545c944b25959e307ba113c1021d33ee5d3d3db732e332547ea6966cc0576bcaa2c9e5f5547c0edafd69046e0ed9a85d9364f3dfd70fef4f983af420c4991067
-MISC ChangeLog 2868 SHA256 b2603c21f083d3422978f87325b4a5f16cc17bc679a8c7ca1984fe995980b17a SHA512 f24da1082145bf7d53d60689cd3023523eb838f81aeed88f43a5e1a534428b9f37271c5ad4491bc093c8dc78a5c13821b7964befe2caf7f01ecf453daf4b0d9d WHIRLPOOL fcb311826fea2f52ba9704cb4dc75439375168ae6146abef03ba36778ed596182bf6517d070230fd13ec059deb626d543838de37639a19f0c1876fed89f3dbbb
+MISC ChangeLog 3094 SHA256 3b94d18930a5ffb69ebcb509aa6002374d997f7a1f4ed15a8f6cb875216e7b40 SHA512 bce068f34ea8de7423ee713482b116106c4fbfb54187db7f6e31b210895e64f55bb1e562939aa5b71203ab4230c5e9b175093c5079a211b1a060b738bccdb8c4 WHIRLPOOL 654176396e6d3f8740a18a9a92e1f3e5e4b7585346c0ff7fad509cd15ad7f15c3681ad7c4cbaafdcd0c36770ef509b84474698045372a703b36db76783a9540c
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUDB3/AAoJEKCEBkJ3xQHtUWEH/2JGgeEqsV7F/wTENVuhxbpa
-P3gs/4ugv9ZFjZojxliKrVvXTl80uh+nPmWSzNIhNOieAu/eB+HtFDmfjh1FReYc
-tsenPLSNqTr50PkMH3DcxnzRkIRBd64JuiB1JqTTZb+nt8/OAidWMFFzL2FTjwgF
-fXHheMk5UrD3Dvlyoaw0Gbf1xoTQY9akX6oml58Qn256vQEUvg7kStlo+EPX+IRq
-Ezdr0F1QoIK6Tq0XDxpHD7Bz089FYDkobWIhhl5m9/3lPqm9KuAk8WZAxN6jld4Y
-WnhxVm108FL5gZS6g+PJRHTdYyu1CHmT8By8uYs0/NZ9lGV01MM+b5dIkHW92/E=
-=PHuU
+iQEcBAEBCAAGBQJUDCNTAAoJEKCEBkJ3xQHt6I4IAIvozQqcE4W2epLu7cgyQWAT
+UmFYK1Mu/N50sfFokvPLPXOYboe/nw1zA+/ugHD/iRUiqcAhezXJZxD4TiOxIkDo
+ErtTxrvsft00LKeD1zYKiPCuZHIRRvwF8ghzJA2ds/83JkEfkSjE6cMHoOgwRqy6
+2bxFbr9AMTGh7pWEf6VGuxaUmxrAW6kwxVwC7ZVKD5Ay9704XrdukILoi4wvTGpH
+KoqcJgSdZcIQfHrZ2kUfFh4hPLVya5HWKDEUe7JHZc0ycBfg8FeqZjxoVwnFgAUh
+kxVLegbb5NCMNLiW82LblYpViAJIkoxUDTudLvDYybJBUs6I5f1mTowk4dr5d4o=
+=yV1y
 -----END PGP SIGNATURE-----
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/javolution-4.0.2-r1.ebuild b/dev-java/javolution/javolution-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..adad1def8bd1
--- /dev/null
+++ b/dev-java/javolution/javolution-4.0.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-4.0.2-r1.ebuild,v 1.1 2014/09/07 09:19:13 ercpe Exp $
+
+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 ~ppc ~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-4.0.2.ebuild b/dev-java/javolution/javolution-4.0.2.ebuild
index c76b86537a21..7a608be1febc 100644
--- a/dev-java/javolution/javolution-4.0.2.ebuild
+++ b/dev-java/javolution/javolution-4.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-4.0.2.ebuild,v 1.5 2008/03/30 22:05:30 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-4.0.2.ebuild,v 1.6 2014/09/07 09:19:13 ercpe Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2