summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-p2p/freenet/freenet-0.7_p1154.ebuild')
-rw-r--r--net-p2p/freenet/freenet-0.7_p1154.ebuild18
1 files changed, 2 insertions, 16 deletions
diff --git a/net-p2p/freenet/freenet-0.7_p1154.ebuild b/net-p2p/freenet/freenet-0.7_p1154.ebuild
index fb76d67c8..3af85e9b5 100644
--- a/net-p2p/freenet/freenet-0.7_p1154.ebuild
+++ b/net-p2p/freenet/freenet-0.7_p1154.ebuild
@@ -21,7 +21,7 @@ IUSE=""
CDEPEND="dev-java/db-je:3.2
dev-java/fec
dev-java/java-service-wrapper"
-DEPEND=">=dev-java/sun-jdk-1.5
+DEPEND=">=virtual/jdk-1.5
dev-java/ant-core
${CDEPEND}"
RDEPEND=">=virtual/jre-1.5
@@ -34,6 +34,7 @@ S="${WORKDIR}/${PN}"
EANT_BUILD_TARGET="dist"
pkg_setup() {
+ java-pkg-2_pkg_setup
enewgroup freenet
enewuser freenet -1 -1 /opt/freenet freenet
}
@@ -52,21 +53,6 @@ src_unpack() {
java-pkg_jar-from fec
}
-src_compile() {
- #workaround for installed blackdown-jdk-1.4
- #freenet does not compile with it
- if has_version =dev-java/sun-jdk-1.6*; then
- einfo "Using sun-jdk-1.6"
- GENTOO_VM="sun-jdk-1.6" java-pkg-2_src_compile
- elif has_version =dev-java/sun-jdk-1.5*; then
- einfo "Using sun-jdk-1.5"
- GENTOO_VM="sun-jdk-1.5" java-pkg-2_src_compile
- else
- einfo "Using system vm"
- java-pkg-2_src_compile #try the actual version
- fi
-}
-
src_install() {
mv lib/freenet-cvs-snapshot.jar freenet.jar
java-pkg_dojar freenet.jar