net-p2p/NativeThread: Some changes advised by commander jakub ;)

svn path=/sunrise/; revision=5788

diff --git a/net-p2p/NativeThread/ChangeLog b/net-p2p/NativeThread/ChangeLog
index 1836172aaca78b0e9010542f65f65ad51da0e0be..6f5b6e6b874b3b645f93216287ec43552cc0b921 100644 (file)
--- a/net-p2p/NativeThread/ChangeLog
+++ b/net-p2p/NativeThread/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Mar 2008; (Tommy[D]) tommy100@gmx.de -NativeThread-20080224.ebuild,
+  +NativeThread-20080303.ebuild, files/Makefile.patch:
+  Some changes advised by commander jakub ;)
+
   26 Feb 2008; (Tommy[D]) tommy100@gmx.de +NativeThread-20080224.ebuild,
   +files/Makefile.patch, +metadata.xml:
   New lib for net-p2p/freenet (bug #128783), moved out of freenet to compile

diff --git a/net-p2p/NativeThread/Manifest b/net-p2p/NativeThread/Manifest
index 63034166b2e1b89b3cd83a6b7cea11281bf8361f..93c3866aa9cfc10b35d6fa9e2bd8acfc05d22f96 100644 (file)
--- a/net-p2p/NativeThread/Manifest
+++ b/net-p2p/NativeThread/Manifest
@@ -1,5 +1,5 @@
-AUX Makefile.patch 769 RMD160 aebad51745bbb626ac2f036be584fbc37ccb6abf SHA1 a0a66003816928b3f02a476a57aba68da9bdb48e SHA256 392483bde37e35660d76ea2f555e6334cfaa1a265a2e7448472381a2916ae542
-DIST NativeThread-20080224.tar.bz2 728 RMD160 2d428a54d7dcdf28b13386dd212cbe9ea7cc69cb SHA1 64f33c484cae3d647e59eeeb3bda13567659dc61 SHA256 c6fd7a65a01531ce30fa171ac64dd9df983a0afb7c40a9e696e50d3e747b01c5
-EBUILD NativeThread-20080224.ebuild 753 RMD160 2a671880d5db88a10271861dc22abd8a3fcee55a SHA1 fa4366f1e2918a845e65c59aceb12efcc9315e31 SHA256 bef44b069dd91366ad61bc8c7de413f603990c3cad3019e8eb90b60da9ee6100
-MISC ChangeLog 325 RMD160 9e867815601d8d769cb6836b802424fc8c569462 SHA1 e7a387cf66164b8be05d557a2c0dc4d71d17b1f5 SHA256 05204e271328d2c283c4290f6c0e45ef8bc7d1e530483269e2c58704efa980eb
+AUX Makefile.patch 649 RMD160 8c5c1afa60f9f84a7f3e63b8ec537b6d1dede84b SHA1 fa343bb80b905b790ca3487ea04015faa8214889 SHA256 d4bbeefbf44ef2b6e87f09a6d85ec38c3352435f990fa28be921a682d833df74
+DIST NativeThread-20080303.tar.bz2 2724 RMD160 fb4f3b2368830703a548d0d71c55149b88a8a5fe SHA1 38b171026108d1175e8ccc77cc22d76515d4f5e3 SHA256 ffd38d1027ae98d7158a70390e9efcb7c3ebc98611dfecfd7f7943716332a6da
+EBUILD NativeThread-20080303.ebuild 626 RMD160 d131af5b841b3862e856ad89da306f57d5a03d1a SHA1 97031e95e391f77645072055c9d3487e15d466f0 SHA256 52ad43c216c2302df3da270d3a12e4fcfa2b6c24413ce3ec463b80dc135b0d36
+MISC ChangeLog 499 RMD160 67e0df99267e7cc0e9553723aa5ca7a0ca9c449f SHA1 2ffada5ae1f61a2c46f0a5e5e11a60cf20073c4d SHA256 2412960e6df9de7311ef8f61c08a4b1514c7f2f9ca23046202cc4825a5c07537
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-p2p/NativeThread/NativeThread-20080224.ebuild b/net-p2p/NativeThread/NativeThread-20080303.ebuild
similarity index 72%
rename from net-p2p/NativeThread/NativeThread-20080224.ebuild
rename to net-p2p/NativeThread/NativeThread-20080303.ebuild
index df898bf3e311df8c922778460b2f73aa6cc34dde..a5b693b5b45d24454e3d54044bdf2b2ca63ec5fa 100644 (file)
--- a/net-p2p/NativeThread/NativeThread-20080224.ebuild
+++ b/net-p2p/NativeThread/NativeThread-20080303.ebuild
@@ -13,23 +13,21 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="net-p2p/freenet"
+DEPEND="net-p2p/freenet
+       virtual/jdk"
 
 append-flags -fPIC
-tc-getCC >/dev/null
-
-pkg_setup() {
-       cp ${ROOT}opt/freenet/freenet-cvs-snapshot.jar ${DISTDIR}/
-       chmod 644 ${DISTDIR}/freenet-cvs-snapshot.jar
-}
-
 
 src_unpack() {
        unpack ${A}
-       cp ${DISTDIR}/freenet-cvs-snapshot.jar .
        epatch "${FILESDIR}"/Makefile.patch
 }
 
+src_compile() {
+       tc-export CC
+       emake || die
+}
+
 src_install() {
        into /opt/freenet
        dolib.so libNativeThread.so

diff --git a/net-p2p/NativeThread/files/Makefile.patch b/net-p2p/NativeThread/files/Makefile.patch
index 97906b5700c6ae8e1c51149641e2303508f48b17..6bb32c61abe40ca4205a08c0c80a3a2d956319d1 100644 (file)
--- a/net-p2p/NativeThread/files/Makefile.patch
+++ b/net-p2p/NativeThread/files/Makefile.patch
@@ -1,26 +1,20 @@
---- Makefile   2008-02-24 17:25:07.000000000 +0100
-+++ Makefile.new       2008-02-24 17:25:23.000000000 +0100
-@@ -1,20 +1,14 @@
+--- Makefile   2008-03-03 13:59:06.000000000 +0100
++++ Makefile.new       2008-03-03 17:39:07.000000000 +0100
+@@ -1,13 +1,13 @@
 -CC = gcc
--INC = /path/to/java/include
+ INC = $(JAVA_HOME)/include
 -CFLAGS = -Wall -O3 -fPIC
-+INC = $(JAVA_HOME)/include
- LDFLAGS = -shared -Wl,-soname,libnative.so -I$(INC) -I$(INC)/linux
- LIBS= -lc
+-LDFLAGS = -shared -Wl,-soname,libnative.so -I$(INC) -I$(INC)/linux
++CFLAGS += -Wall
++LDFLAGS += -shared -Wl,-soname,libnative.so -I$(INC) -I$(INC)/linux
+ LIBS = -lc
  
  all: clean libNativeThread.so
  
--NativeThread.class:
+ NativeThread.class:
 -      javac java/NativeThread.java
--      mv java/NativeThread.class .
--
- libNativeThread.so: NativeThread.c NativeThread.h
-       $(CC) $(CFLAGS) -o libNativeThread.so $(LDFLAGS) NativeThread.c $(LIBS)
- 
--NativeThread.h: NativeThread.class
--      javah NativeThread
-+NativeThread.h:
-+      javah -o NativeThread.h -classpath freenet-cvs-snapshot.jar freenet.support.io.NativeThread
++      javac -classpath /opt/freenet/freenet-cvs-snapshot.jar java/NativeThread.java
++      mkdir -p freenet/support/io
+       mv java/NativeThread.class freenet/support/io/
  
- clean:
-       -rm -f *.class NativeThread.h libNativeThread*.so
+ libNativeThread.so: NativeThread.c NativeThread.h