EAPI 5 bump.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 73 insertions, 19 deletions

diff --git a/dev-java/backport-util-concurrent/ChangeLog b/dev-java/backport-util-concurrent/ChangeLog
index fe08e11718ec..19e954fc8f96 100644
--- a/dev-java/backport-util-concurrent/ChangeLog
+++ b/dev-java/backport-util-concurrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/backport-util-concurrent
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.33 2015/06/09 13:29:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.34 2015/07/24 09:42:58 monsieurp Exp $
+
+*backport-util-concurrent-3.1-r1 (24 Jul 2015)
+
+  24 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
+  +backport-util-concurrent-3.1-r1.ebuild:
+  EAPI 5 bump.
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index e5f0ca8be85c..4016cecd8573 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,28 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX backport-util-concurrent-3.0-notest.patch 491 SHA256 112918b1488255337fc42c1f5b8d71faefdc10c62a3061452f6d1b427cf0778f SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080 WHIRLPOOL 55fc40f1d32dfc41c0cd23bd3819b5cb6114435e4e0a2738ad51da331dda6d553f17fd42e1b3249e08a89e62e9cfb3bee482150c5f1ea9f9dff32a775c997085
 AUX backport-util-concurrent-3.0-test.patch 380 SHA256 dbd133bc068689d8b7dff508a48716e48fbb381f4089c07848003577c53933f6 SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe WHIRLPOOL 9c8c91b173ff21b9f8b7285baa3c74b6d32b633e61a548fcb1f88f81f91fd2b71e1f976e97574aed3dc2eaa126c1164012e20fda0d86e9ca1deb41e3c0ac64a6
 DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 SHA256 1abecd12d48174dbf6fb0f39623ac954c7f0309870f18cca25afc870aeae2512 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54 WHIRLPOOL fe8fdaa4942cf444f12867213bf6cc3897b2b79aebd818d41af677b8a9e69fa55466b93c74a50831345ddbe0c3413af2ede132c730dd0bbbcd9b2493e9697d79
+EBUILD backport-util-concurrent-3.1-r1.ebuild 1343 SHA256 853b3dd440b3f66fca96ba3d77d1f5a4f03e3abf0bc350a4c293cfa28eca7d35 SHA512 6b26b8fdb4ecb467b5a1485d21edc3988ce4b98fc07c8da2bc62a24bc9614cec7396f6bfbd7d34aa5b748c08759786c7d27a25d8855cdcb52b4001099f9e208d WHIRLPOOL af6dfd101af999018ec64a1018c661644018a0676bfb4268160d47f7192d7add6ece32090271dca033901de3d01781f1a3079089ec53e83f3a48bb6a108225a2
 EBUILD backport-util-concurrent-3.1.ebuild 1326 SHA256 5b83d2dadf36ef18f2c309b802cc9c1f64dc97b48f1e3c3f647cfb7aa3dae03d SHA512 ff95e661907f5bb77b7b3ffbdc47187a646a9278ee14eaafb553277a13a0a961aa8083b7de00d06440bb892ec45a3b5caf6945cd09dc497d1870b3144e073d94 WHIRLPOOL 686b1bfff46624cbb92f4c5ea551324fa157c37541db9994b3553a6607e00d4efa1b8d3464da337077ac58672d0ff86f1edcdb78f5d804975926c66e305ad438
-MISC ChangeLog 5420 SHA256 bdc9a2afbd8ca7b5b62340433d68d7b3a81df90f2c19c41f2b87a1ebd3d1ed27 SHA512 ab81a3c198a4ee947ade85fa6708381549237ea45ecc5f7aa81776ea5ef09bad7d5c0ebd89b9945b326e6f3be4c73c19d25664b4155e7fb8a676b6f794956f5e WHIRLPOOL 6578b30296a79e2d02f3ce17355bd6f311bdd2594829381b8c68b02d98bf1a69ebccfa994a6b8355603b6e134a3ddae35cd8d016a9690719039aa29e45d21ea0
+MISC ChangeLog 5586 SHA256 07655c2384a4a61fd80bdb852fd8fd1cc96f6d0b903ea6c20fafdd300815fa62 SHA512 24f383e54e6b908586faf6938000861b6a734a44e1126bf248a7e2498c21fff4e47d57867e7a5460643b4b802823c39906528a015b4e7e973a0a357ca5b10727 WHIRLPOOL c1ab6c5f1dc58c1cc983f8364b372b5579d1fa87a5b5fd38a2c3d18492998968f78645de9b9d62ba6a5b1634224601dee1db1379c86b442dee39cd97920ad2ff
 MISC metadata.xml 412 SHA256 70659cbc0c1d74997aba0c65bd4433ad24dc998bdf9588940d15c01ddc9cd785 SHA512 b909c38e7042333480f824b87b7722dc1bf4e3e6a1c3ae0872803efc11f529f659820f39a2a48c5635878bcc1e9d9dfe6dec5283782c41d318bcdd44592f7d8e WHIRLPOOL b4dd428245a63aad5e8ef18f7cd4af34c7f4d5aa2d67cc323ab1856aa083b241e87aeb32a4b0d527c9b610372117a7c44114ffff4202ab54d76ce7231e3e8c31
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdupLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi04YP/2WvAxvcRW+s4lR3jANQbKO8
-7M8PcqqBh15vWm/3XE4PnHTFYPKiXL136JXQWZFeOTh5EbLbxqYnRwC2BmmKr5O3
-agvFnv78S4MldG2hhlony1BTMukoC4b8uQE7lKFkSkAOW94JtrTaiBSnYwJ/9X0C
-YkAG9BZx4JqUfDDMMEWAnMr6kZGMyg1ur7WrAgIe1xrOxv0djtS22UoV/GyeFlck
-cYxTHSxe22YrnaKJYphnZokt3Ss8BbzV77SoqqY6Nt6oIvegZpaGvxdHYlIoBLkX
-mjy70olO0SaB/y59gr6c/QI0hc7hOsTH9lbbMWNK+Q058RQvMAaR03b4oCuDWKdT
-1WkPnrQeHGWjVt+r7TQy6ptazkQf+rLkGBINrAhob4pEqpmx6UaZ/avMouy0zOVw
-OLK32D5ymRB044P8gnoRrNOt4TTUxITgHMC5K5EH+dcgC57eF6JwfZnUdP9PSqTG
-+Qd1V0sYjQEbECDmoCsXq6LN52FGqzbVBT/hR7DFE2W8W3b8KX5SXITb/8Rc1TQv
-g6ibImOw/78NcIHc/xNwVh64dw9nJCIwMeag06ha6ITAzMShiaMau32NSqddl5bJ
-uW7HQk9K2HDBEyAQer1Ckijy7e8G8RT+4jBLb3rfSohh4u4kZCOVUzDXZyDPSwji
-0VX+vBtrfXFhDNw1v63i
-=V6C0
+iQEcBAEBCAAGBQJVshbvAAoJEJGRpfGTSRu42FkH/2B3ZSyGlN5GbXNFe9faqmfa
+/WLZJCydDib9cfekMlz26oysmIz4vIj+YT57mo+KgkI8p6v/0c18I5LoAKUr9alR
+1AOtnNn0ssDfOeWuo9mkJcKWIN1yji/uXslBy1YHK9t3GXgCx33hXW8lkle4lkri
+/Ff/X6v9fS6EQEptJ+nWVyXPvpZ50yW2DsyAg7Ul+neutJNiEbJq3sLv1dBSScu2
+tIm3+WZLdR6tBW1lGLjODMq/4x9YTV4TyWZD9BT/wUbX7Qv/CJxD1PACTFPOJQgA
+cux4uOzLrfCIhsX5YeVhEMf2QtSHlVseJ1a8Xwj22/RJ8oQuWIikweiQbf0wC1w=
+=IozL
 -----END PGP SIGNATURE-----
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
new file mode 100644
index 000000000000..9018aed91a9b
--- /dev/null
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild,v 1.1 2015/07/24 09:42:58 monsieurp Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+SF_PN="backport-jsr166"
+MY_P="${PN}-Java60-${PV}"
+
+DESCRIPTION="A portability wrapper for java.util.concurrent API (jsr166) 6.0"
+HOMEPAGE="http://${SF_PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/junit:0
+		)
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}-src"
+
+java_prepare() {
+	if use test; then
+		# make test not depend on make
+		epatch "${FILESDIR}/${PN}-3.0-test.patch"
+	else
+		# don't compile test classes
+		epatch "${FILESDIR}/${PN}-3.0-notest.patch"
+	fi
+
+	cd "${S}/external" || die
+	rm -v *.jar || die
+
+	use test && java-pkg_jar-from --build-only junit
+}
+
+EANT_BUILD_TARGET="javacompile archive"
+EANT_TEST_TARGET="test"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	dohtml README.html || die
+
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/*
+}