net-p2p/freenet: Simplify

svn path=/sunrise/; revision=6542

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 3a71e0f8cfae71e473320b06381b53ac6959cb57..a75df19b13833214378e9b076df15bbf148886f1 100644 (file)
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jul 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  freenet-0.7_p1154.ebuild:
+  Simplify
+
   20 Jul 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -freenet-0.7_p1153.ebuild, +freenet-0.7_p1154.ebuild, freenet-9999.ebuild:
   New upstream release + update live ebuild

diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 9f79c594ef74974876d373fd6fcda701fe4f1c38..a42806928a604c52329d34ec44d54d85de0cd39f 100644 (file)
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -5,7 +5,7 @@ AUX wrapper.conf.patch 691 RMD160 a4f534fb81d20972d80d16a579a5f493918149d1 SHA1
 DIST freenet-0.7_p1154.tar.bz2 2058160 RMD160 4c529cc366c463ccfbf3d902c939bbcaaca2965a SHA1 6578724f69bb24ce0121cb51bc01adddb82d4f56 SHA256 2d7791156acf3fa398c95a57d23a6f9820a4084a1ab5e1e70204b2292c282076
 DIST seednodes-20080721.fref 37077 RMD160 4b7aca1d3864a42f4bbece5cf7d9b410888feebe SHA1 93fa0bbae17e15cbf073ad9da9070de023c265f5 SHA256 37f075bc40611f0db15e3e5012aebbd6a14775f2a70e90ab7838b5f91fa42ac1
 DIST wrapper-20080330.conf 1667 RMD160 77c0e4d379521ce10da408dd35ec0ebb5c82f4a9 SHA1 7f8679579c47e2c0644d26c67c26d779bf6f8d75 SHA256 70a98acb43b43b00b45bda40de5745ba188d366dd69c5d97968aa4494b7441f0
-EBUILD freenet-0.7_p1154.ebuild 3209 RMD160 9e09c5379ae1191582b4180ee35a714474c43cc5 SHA1 f97851f681e6a0c5ea5809be4062ea112e0012a3 SHA256 0b2fed26f98ba9dbd3b304843dc2335eca7c35281116a7f0fa81ae52bc185b90
+EBUILD freenet-0.7_p1154.ebuild 2795 RMD160 ec696596bd45560a55e755c8b5c139d89fae0262 SHA1 1296a1398c649a68a8cd5924f9d2f29c4ad1b348 SHA256 182ced762454eccf63ef8dae68d28b2f366aff26b678454b0067e325763da9ef
 EBUILD freenet-9999.ebuild 3637 RMD160 c0be718bde123ecb0d3bb3184f48942a71352f95 SHA1 1badd482e6c3adbe75a1acbf3b7391f78f5caf95 SHA256 e7a9e22a2db6bfc9a92cb3fd46b8fad8c7561932c9c4fdc7f2cd72b255a38487
-MISC ChangeLog 10770 RMD160 87d80b5b3a954cf21f5b24f2db5f6aeeb7a81055 SHA1 a5287502fd3805434aa47e0e5829ce612f26383a SHA256 fa420fc6af4a079f61fb7df0212f24dcefb01b094ef36c058a8ee6ac9cff1c93
+MISC ChangeLog 10869 RMD160 aa2e666569a94fe7dbcc740e19b0d83625ef1495 SHA1 269413d59b71c627be2c9a8b6a9e898df0986699 SHA256 a588519e77d1fad5607672ec6cfc64ddfe5d83ad743614da449746bd74469eb2
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-p2p/freenet/freenet-0.7_p1154.ebuild b/net-p2p/freenet/freenet-0.7_p1154.ebuild
index fb76d67c84e2ef808b14be07b1d65525424167a9..3af85e9b55c4882e0e61e83dd96e7c5407a2cd05 100644 (file)
--- 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