From bfbf45fdc3c626dac26201e3284c6d77814aacdb Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 8 Oct 2015 21:43:56 +0100 Subject: [PATCH] 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 d6477b931e02b..679a03610b6a0 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 }