summaryrefslogtreecommitdiff
path: root/dev-java/backport-util-concurrent
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-04-14 01:05:40 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-04-14 01:05:40 +0100
commit76cba73c47c8694e74377004634daca18f2d9c08 (patch)
tree468603ebdc189bcfae77696162761b3be936baea /dev-java/backport-util-concurrent
parent6957f5c65b02bba533954eabc0b62f5de36be206 (diff)
gentoo resync : 14.04.2018
Diffstat (limited to 'dev-java/backport-util-concurrent')
-rw-r--r--dev-java/backport-util-concurrent/Manifest3
-rw-r--r--dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild2
-rw-r--r--dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild54
3 files changed, 2 insertions, 57 deletions
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index b5d97cecbfc7..61b9417f9d03 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,6 +1,5 @@
AUX backport-util-concurrent-3.0-notest.patch 491 BLAKE2B ea587be0736cd1aa4fcbc4095c31dd321816cbefa0cec4d6f0c8969e24e9e96038b30db4baec0d386ba18828cafad0c2d084b48d69c7db77414dd5282f1197f0 SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080
AUX backport-util-concurrent-3.0-test.patch 380 BLAKE2B 5e1e437564035e652d6c41f8ab75b0589257e955aa06f2b83d8fb488ec7f2d7c4879fdc1556a47599231bf2ab1497243cdacfb7f64f5142bb4728265c296790a SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe
DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 BLAKE2B 49dd1065fb80d697dc917aeff1bf653a1c82bc24e3edf6d1eb272f3cee17130a6db20f562f40e7911a6382f8c545bdf37e1ce34b69a6a7ddf5a569e114a78e87 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54
-EBUILD backport-util-concurrent-3.1-r1.ebuild 1164 BLAKE2B c3dbe265ef0945c94561a24b1e676fdce5a2144a592fba126663b7592e5c7a4916919bc8e0461507aa0280fd067afd1d319359b1e9472d7b15c3a220be824b28 SHA512 8e1ee760dc6df96e614a6bf36d27707e220e60917854bec2768874c96c8c224d70ce496769260f90961c53e5e1da1b17afd726a55914b306992221abf1cc6001
-EBUILD backport-util-concurrent-3.1.ebuild 1156 BLAKE2B 61ec36be722938985d187523dbf08d42da6d97b028d8fca73d3bd08b002b963ad275980528b11d49185a12c2a2c01907a22427f876ee19392a74cb2e4e57c1d0 SHA512 09049db9cc11693d88f0cff4cc2371abcde1ed93c2678a981346cf89cdfd191eb8cd277d419c788e20eeead6ff2c5c8d2cba24a067a08844ff36e9cea787036e
+EBUILD backport-util-concurrent-3.1-r1.ebuild 1163 BLAKE2B 9f5bc96e8401dd8451d213c04942458c46b8fa3c0d2d944e27727b6bdb63801cc0011b9b495eddd9678536e8b9fe9b0ff13769d81adabd12b58831bdf5952855 SHA512 ad14c0f08d9eae8e5cf8ea1281705bab4d4b225c51c5ffc8c9fc49c1bebc6ac80a9da8ca765a7e5e49afe9a62225df5b3f86d8eb4b82bfa68f20341a01aa3e76
MISC metadata.xml 490 BLAKE2B 8c30e55ff1a4b70180d42e365d9eba3405a1591438e0fc801383b8a1ee65daf759b2544c1edb3b2a03cfe8f7932b5c4de8d12980c630fd5b625ad2f6a674c291 SHA512 81d2a6f504093869e765c56667feb53583a85c7cfe98bf12f571b2d4e202e5ab247e24b8a92ad5141654069d3a66179fbb28790781464dd43821ab55dee62eb9
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
index 3471e39f2aeb..0c7e2df0256c 100644
--- 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
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
deleted file mode 100644
index 2a1de217e8c5..000000000000
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-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 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6
- test? ( =dev-java/junit-3* )
- 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"
- rm -v *.jar || die
-
- use test && java-pkg_jar-from --build-only junit
-}
-
-EANT_BUILD_TARGET="javacompile archive"
-
-src_test() {
- eant 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/*
-}