gentoo resync : 17.02.2018

6 files changed, 16 insertions, 143 deletions

diff --git a/dev-java/trove/Manifest b/dev-java/trove/Manifest
index 036fb06a009b..3032f81592ce 100644
--- a/dev-java/trove/Manifest
+++ b/dev-java/trove/Manifest
@@ -1,8 +1,3 @@
-AUX trove-3.0.2-java.io.tmpdir.patch 809 BLAKE2B a3c6a8bc4d9d6e16f067e5b87af6d21a1c8328dfd13c2ba90e96b0d2a2a055b6639071723efb3b5e6595f6a9e4984a6f617120e9b9c47812e13cec32770374b8 SHA512 cf174935aaa56be3aad9bf65b7973fae08f4c614f26ba761f14573d2df6ce8bc116ef651402cdaae34df903c36d3d7c254ee9c39415dbd10f8679798896530a5
-DIST trove-2.1.0.tar.gz 2438529 BLAKE2B b4563b1bd388c40dade302f193a84aeb4c2052ce45304a058533a65ceaffab1b4d1c480ff67a3c3bd21f2bebd39e9045d9d818c5066b1896b29f16d7dd182003 SHA512 a0c3d71fa5bade59efcca7a65cacb90138a48d4346886a7a6e0c30f2736ef91afd532484efa73cb5b788449391433810bf6d51acac35bf28a4ceca9787d13429
 DIST trove-3.0.2.tar.gz 5880161 BLAKE2B a3dbb6a967ad9a519bd04abbbbf9e6af483360991956ff79532462a9ad471d409744017a3b24e4a09d2377243406e5d7cd542b452da8f59a1a97b454a2f60a8c SHA512 27460a66bad6f206eaeae02453c94333456db5a9c566246d495fb4184d42de6033b66d1bf74060f799cf4298d531afeb9597b92da4e2963b43dd4ef072ee750b
-EBUILD trove-2.1.0.ebuild 766 BLAKE2B 99684b3cbc0d21ec4655e999f8029d340ddfbf9cb33d1e76efdc047d5549774151c7e71f52b677033e366b25c1db7caa44be358240cf16bbe627f4b49a994c6a SHA512 2e38f205358597445ea8e5a9648f46de170400ff083a0cc241504a38fe33c1629ebfe0d8d0434919caaba45b21f112746692ce16961e9a99f4631b38bc3932e7
-EBUILD trove-3.0.2-r1.ebuild 871 BLAKE2B ec6d76311eec5d966071924b8fc5b35b5fc2de81879899f71ba092ae0d7b162a327311a390c751021e6f581a4a0e9cda39ddf269019857b6705828b3192f6411 SHA512 2f77697a09c76fb2181f0bbfa7ef480a81c2968af4132562be424abd1fbe23b2761a32aa1a1c169f0f8a8252dd035c1ff345712e2ba1004a12f5f392bd519602
-EBUILD trove-3.0.2-r2.ebuild 799 BLAKE2B f99d1c405686655612961e19338bca41ce81a3b9855f43f408bf52514861e3cb093bff8c0121cf97b63e1c23866c390506adcaf8c7fec1fe16b4744545417ba1 SHA512 aa83f2088a03331e413cc571e6654257a599072347dc125831a78966b4539ba45b61456ec6be3ba6c1e4562f0d4a624f2f75db93591e7878971ef3c139e8eb20
-EBUILD trove-3.0.2.ebuild 758 BLAKE2B aec1887cfe840ba2f496987d8b60c006ffca7bdd3cd2502fa1092eeac070cfa2a46b1fde22048a3aed0827664b17b3d770142d21516a5c91c265c1668b943c01 SHA512 ed2fff18a76cca9930ef9f06c0d667959645d7ba74c27340ecf4edfa57c48fbc46eeda271f8dd01230358f74a66a45abd4c7b791f06c0f6f645d43440fbf2325
+EBUILD trove-3.0.2-r3.ebuild 816 BLAKE2B ae12dfcb6783629e600349417933dc3ff9dbdf6d77c98d62ee7acba89d4e79a2109dac6dca5e82636bbe0f28c9684a03a605dcf9678cf301c8c7c0073b7c9a23 SHA512 ea9d16c26390c80596cbc6b018fd0d12f1991635a7ebd941073d9a089bdca270aecf270f0eb2871e507ebf7bf500e68605d7438a89f0c5b6b14908f8d2ba18d7
 MISC metadata.xml 313 BLAKE2B 033a387e2850f70d371e4362736a66f796d8aa33ab9c46dc4d49a919533c0d9f6cf55588a58ae3d9a413cec5c98daaa65530e095dad86154d467a1749cd02b59 SHA512 8d83dca7ca9717cd91fab6805a9ec4fdab65161643d583cfe2134fbcbaea07ceb236773e88365b137a6e2fb5215c821f54955dd641d0037025b826d29ec0d2de
diff --git a/dev-java/trove/files/trove-3.0.2-java.io.tmpdir.patch b/dev-java/trove/files/trove-3.0.2-java.io.tmpdir.patch
deleted file mode 100644
index d5f88a426814..000000000000
--- a/dev-java/trove/files/trove-3.0.2-java.io.tmpdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- build.xml.orig	2015-06-30 21:07:56.621000000 +0000
-+++ build.xml	2015-06-30 21:10:19.060000000 +0000
-@@ -99,6 +99,7 @@
-             <classpath>

-                 <pathelement path="${output.generator_classes}"/>

-             </classpath>

-+            <sysproperty key="java.io.tmpdir" value="${output.tmp}" />

-         </java>

-     </target>

-     

-@@ -339,6 +340,7 @@
-         <mkdir dir="${output.generated}/gnu"/>

-         <mkdir dir="${output.generated}/gnu/trove"/>

-         <mkdir dir="${output.lib}"/>

-+        <mkdir dir="${output.tmp}"/>

-         <mkdir dir="${dist.root}"/>

-     </target>

- 

-@@ -442,4 +444,4 @@
-             <format property="fullVersion" pattern="'build time' yyMMddHHmmss"/>

-         </tstamp>

-     </target>

--</project>
-\ No newline at end of file
-+</project>

diff --git a/dev-java/trove/trove-2.1.0.ebuild b/dev-java/trove/trove-2.1.0.ebuild
deleted file mode 100644
index 88a296a90443..000000000000
--- a/dev-java/trove/trove-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU Trove: High performance collections for Java"
-SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
-HOMEPAGE="http://trove4j.sourceforge.net"
-LICENSE="LGPL-2.1"
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-java_prepare() {
-	rm -v lib/*.jar
-	rm -fr javadocs/*
-}
-
-src_install() {
-	java-pkg_newjar output/lib/*.jar
-	dodoc *.txt ChangeLog AUTHORS || die
-	use doc && java-pkg_dojavadoc output/javadocs
-	use source && java-pkg_dosrc src/* output/gen_src/*
-}
diff --git a/dev-java/trove/trove-3.0.2-r1.ebuild b/dev-java/trove/trove-3.0.2-r1.ebuild
deleted file mode 100644
index 9c134d5f852f..000000000000
--- a/dev-java/trove/trove-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU Trove: High performance collections for Java"
-SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
-HOMEPAGE="http://trove4j.sourceforge.net"
-LICENSE="LGPL-2.1"
-IUSE=""
-SLOT="3"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-S="${WORKDIR}/${PV}"
-
-java_prepare() {
-	# See bug 553652
-	epatch "${FILESDIR}"/${P}-java.io.tmpdir.patch
-
-	rm -v lib/*.jar
-	rm -fr javadocs/*
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar output/lib/*.jar
-	dodoc *.txt || die
-	use doc && java-pkg_dojavadoc output/javadocs
-	use source && java-pkg_dosrc src/* output/gen_src/*
-}
diff --git a/dev-java/trove/trove-3.0.2-r2.ebuild b/dev-java/trove/trove-3.0.2-r3.ebuild
index 501b2f6b8f10..08317df94524 100644
--- a/dev-java/trove/trove-3.0.2-r2.ebuild
+++ b/dev-java/trove/trove-3.0.2-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
@@ -10,32 +10,31 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="GNU Trove: High performance collections for Java"
 SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
 HOMEPAGE="http://trove4j.sourceforge.net"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE=""
 
 RDEPEND="
 	>=virtual/jre-1.6"
 
 DEPEND="
-	app-arch/unzip
 	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${PV}"
 
 RESTRICT="test"
 
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	unzip -d "${P}" "${P}-src.jar" || die
-	cp -r "${P}"/* ./src || die
-	rm -rf "${P}" || die
-	find ./src \
-		-type f \
-		! -name "*.java" \
-		-exec rm -v {} \; || die
-	java-pkg_clean
+src_unpack() {
+	unpack ${A}
+	mv "${PV}/${P}-src.jar" . || die
+	rm -rf "${PV}" || die
+	mkdir "${P}" || die
+	unzip -d "${P}" -qq "${P}-src.jar" || die
+	export S="${WORKDIR}/${P}"
+}
+
+src_prepare() {
+	default
+	find . -type f ! -name "*.java" -exec rm -v {} \; || die
 }
diff --git a/dev-java/trove/trove-3.0.2.ebuild b/dev-java/trove/trove-3.0.2.ebuild
deleted file mode 100644
index 79fd976ca9be..000000000000
--- a/dev-java/trove/trove-3.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU Trove: High performance collections for Java"
-SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
-HOMEPAGE="http://trove4j.sourceforge.net"
-LICENSE="LGPL-2.1"
-IUSE=""
-SLOT="3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-S="${WORKDIR}/${PV}"
-
-java_prepare() {
-	rm -v lib/*.jar
-	rm -fr javadocs/*
-}
-
-src_install() {
-	java-pkg_newjar output/lib/*.jar
-	dodoc *.txt || die
-	use doc && java-pkg_dojavadoc output/javadocs
-	use source && java-pkg_dosrc src/* output/gen_src/*
-}