net-libs/nativebiginteger: Use eclass instead of workaround

svn path=/sunrise/; revision=6541

diff --git a/net-libs/nativebiginteger/ChangeLog b/net-libs/nativebiginteger/ChangeLog
index 6c37e789db0f303afd409e18b5489ed9d03fcd07..ed739c35ab7cdd416674e5b28aae35ed0057621a 100644 (file)
--- a/net-libs/nativebiginteger/ChangeLog
+++ b/net-libs/nativebiginteger/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jul 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  nativebiginteger-0.6.1.31.ebuild:
+  Use eclass instead of workaround
+
   21 Jul 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   nativebiginteger-0.6.1.31.ebuild:
   Add workaround for system-vm=jre

diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 5778a19d5f9b397729ab931288f619ffc0e2423b..d1ff18af630638932c377e53b1f8decaca1f1f15 100644 (file)
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile 1630 RMD160 bd7b0da52fb19bd77e6421955110988add37920d SHA1 adf654b466862dd9422126c47aac2941f27125f5 SHA256 faf56c00f18d2ccb8f893016474787f536f40cd33ce0065b6732443e76c8206a
 DIST nativebiginteger-0.6.1.31.tar.bz2 9176 RMD160 2a877fd07fa8ff2023a3496b753473769b85a255 SHA1 342d70cecb5fba311c99ee76ade9dfe0b55ae981 SHA256 ee506b2b4d7088ca4434c895025abebf8a306a0dc9e8b39136ec129e2527d186
-EBUILD nativebiginteger-0.6.1.31.ebuild 1445 RMD160 d4b092c21c9296a54c9e5101eca492c95aa3ad73 SHA1 6e05fe15e99d64788a109d050e92575248dd3aaf SHA256 ae439a46c5b2012ac199a3f1d5fbc9d045a0877fd1d5a22dbfeb5aac0788c968
-MISC ChangeLog 1099 RMD160 721ccba4f4453bda3055596fcc8aea3fb30a60b4 SHA1 3a7636d5878ad46b7b0af36d5404bcbb652d947d SHA256 9ee92b283a33edf3a4295821f26e17367eefbfe4beaeccc334a24ce0414cc6d6
+EBUILD nativebiginteger-0.6.1.31.ebuild 773 RMD160 1feddcd2b120353e22fcc39695fbe7bb0dc64599 SHA1 63c27735e701a418c8e10e297747fd2fa883d780 SHA256 860d264fb5bec9565be24ded670a681e5e5b82e910c578dc60e4d10bab744c9e
+MISC ChangeLog 1230 RMD160 0e6b6a10211294d75962c171dc00179d3263a054 SHA1 ffff0293b7eed5639ecdb94a1f3b953663503a10 SHA256 a585ee56c6fcb99396057df1d5bd59def808333345b41010f83dfb1aafd964f0
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-libs/nativebiginteger/nativebiginteger-0.6.1.31.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.6.1.31.ebuild
index 7166661682eb5c4cea87e7cc4e81eb1971e71ece..9e51f1327b516026d7cac3c1664f6cffa688e3b4 100644 (file)
--- a/net-libs/nativebiginteger/nativebiginteger-0.6.1.31.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-0.6.1.31.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs java-pkg-2
 
 DESCRIPTION="NativeBigInteger libs for Freenet taken from i2p"
 HOMEPAGE="http://www.i2p.net"
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/gmp
-       virtual/jdk
+       >=virtual/jdk-1.4
        !net-p2p/nativebiginteger"
 RDEPEND="dev-libs/gmp"
 
@@ -25,28 +25,8 @@ src_compile() {
        tc-export CC
        cp "${FILESDIR}"/Makefile .
 
-       #workaround, if current system-vm is a jre
-       if has_version =dev-java/sun-jdk-1.6*; then
-               einfo "Using sun-jdk-1.6"
-               GENTOO_VM="sun-jdk-1.6" make libjbigi || die
-       elif has_version =dev-java/sun-jdk-1.5*; then
-               einfo "Using sun-jdk-1.5"
-               GENTOO_VM="sun-jdk-1.5" make libjbigi || die
-       else
-               ewarn "Using system vm, make sure it is a JDK!!!"
-               make libjbigi || die
-       fi
-       use amd64 || filter-flags -fPIC
-       if has_version =dev-java/sun-jdk-1.6*; then
-               einfo "Using sun-jdk-1.6"
-               GENTOO_VM="sun-jdk-1.6" make libjcpuid || die
-       elif has_version =dev-java/sun-jdk-1.5*; then
-               einfo "Using sun-jdk-1.5"
-               GENTOO_VM="sun-jdk-1.5" make libjcpuid || die
-       else
-               ewarn "Using system vm, make sure it is a JDK!!!"
-               make libjcpuid || die
-       fi
+       make libjbigi || die
+       make libjcpuid || die
 }
 
 src_install() {