[gentoo-commits] proj/java:master commit in: dev-java/ini4j/

[gentoo-commits] proj/java:master commit in: dev-java/ini4j/

[James Le Cuirot]

commit:     b7eb77cc5a8fc5d0974d3916cf94e608da33def9
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Aug  7 19:34:19 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 11:05:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=b7eb77cc

[dev-java/ini4j] Drop tests, blocker for jdk-1.5--

Package-Manager: portage-2.2.20

 dev-java/ini4j/Manifest                            |  2 +-
 .../{ini4j-0.2.6.ebuild => ini4j-0.2.6-r1.ebuild}  | 29 +++++++---------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/dev-java/ini4j/Manifest b/dev-java/ini4j/Manifest
index bc15f0a..6ce66d0 100644
--- a/dev-java/ini4j/Manifest
+++ b/dev-java/ini4j/Manifest
@@ -1 +1 @@
-DIST ini4j-src-0.2.6.zip 80856 SHA256 7f7ec905868845283333129dff306259c0ef2f32f3d4ba00d3fbd5c8becb8bf2
+DIST ini4j-src-0.2.6.zip 80856 SHA256 7f7ec905868845283333129dff306259c0ef2f32f3d4ba00d3fbd5c8becb8bf2 SHA512 d4101ee1cbe057ce724e6c215d74ed94e27615b089fe87f61fddddd25fec3665c3ed5f1b6b115546119a6bc6d82cd02ac6ef3ff0f7cfdf57af78571c018b32a4 WHIRLPOOL 4babffcf0a82439061bec9892b5fa45ae9d6186b10f93bb820d9a630b6e07e88fb372aa8a826710ba103d44de100c3adb707c0a1f8f4e34eb1247c03b4fd2131

diff --git a/dev-java/ini4j/ini4j-0.2.6.ebuild b/dev-java/ini4j/ini4j-0.2.6-r1.ebuild
similarity index 66%
rename from dev-java/ini4j/ini4j-0.2.6.ebuild
rename to dev-java/ini4j/ini4j-0.2.6-r1.ebuild
index ae8a6cb..ef713a4 100644
--- a/dev-java/ini4j/ini4j-0.2.6.ebuild
+++ b/dev-java/ini4j/ini4j-0.2.6-r1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-nodeps"
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -18,41 +18,30 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
-COMMON_DEP="dev-java/servletapi:2.4"
+COMMON_DEP="java-virtuals/servlet-api:2.4"
 
 RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
 # Preferences api is broken in 1.6 if a later xalan version is in cp
 # http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6519088
 DEPEND="
- 	!test? ( >=virtual/jdk-1.5 )
-	test? (
-		=virtual/jdk-1.5*
-		dev-java/ant-junit
-		dev-java/ant-nodeps
-	)
+	>=virtual/jdk-1.5
 	app-arch/unzip
 	${COMMON_DEP}"
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+java_prepare() {
 	epatch "${FILESDIR}/disable-retroweaver.patch"
 	# Needs Jetty
-	rm -v src/test/org/ini4j/IniPreferencesFactoryListenerTest.java || die
+	rm -rf src/test/* || die
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_BUILD_TARGET="build"
-EANT_GENTOO_CLASSPATH="servletapi-2.4"
+EANT_GENTOO_CLASSPATH="servlet-api-2.4"
 # So that we don't need junit
-EANT_EXTRA_ARGS="-Dbuild.src.test=nbproject -Dbuild.src.sample=nbproject"
-
-src_test() {
-	ANT_TASKS="ant-junit,ant-nodeps" eant test
-}
+EANT_EXTRA_ARGS="-Dbuild.src.sample=nbproject"
 
 src_install() {
 	dodoc ReleaseNotes.txt ChangeLog.txt || die