[gentoo-commits] repo/gentoo:master commit in: dev-java/ehcache/

[James Le Cuirot]

commit:     bfbf45fdc3c626dac26201e3284c6d77814aacdb
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 20:43:56 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 20:44:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfbf45fd

dev-java/ehcache: Set sane source/target flags

Fixes bug #562598.

Package-Manager: portage-2.2.20.1

 dev-java/ehcache/ehcache-1.2.4-r4.ebuild | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild 
b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
index d6477b9..679a036 100644
--- a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
@@ -27,15 +27,10 @@ DEPEND=">=virtual/jdk-1.6
        app-arch/unzip"
 
 S="${WORKDIR}/${P}"
-
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-JAVA_SRC_DIR="src"
-
 JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging,servlet-api-2.5"
 
 java_prepare() {
-       unzip -d src ${P}-sources.jar || die
-       rm -rf src/net/sf/ehcache/hibernate || die
-       rm *.jar || die
+       unpack ./${P}-sources.jar
+       rm -vr net/sf/ehcache/hibernate || die
+       java-pkg_clean
 }