added/reorganised patches from ppc/amd64 on java bindings compilation (bug #66087)

Package-Manager: portage-2.0.51-r14

7 files changed, 61 insertions, 10 deletions

diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index 057a70089091..76026c633cd0 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-pda/pilot-link
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.17 2005/01/01 15:46:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.18 2005/01/26 14:23:40 liquidx Exp $
+
+  26 Jan 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/pilot-link-0.11.8-java_compile_amd64.patch,
+  +files/pilot-link-0.11.8-java_install_all.patch,
+  +files/pilot-link-0.11.8-java_install_amd64.patch,
+  +files/pilot-link-0.11.8-java_install_ppc.patch,
+  -files/pilot-link-0.11.8-javapath.patch,
+  -files/pilot-link-0.11.8-javappc.patch, pilot-link-0.11.8-r1.ebuild:
+  added/reorganised patches from ppc/amd64 on java bindings compilation (bug
+  #66087)
 
   27 Nov 2004; Simon Stelling <blubb@gentoo.org>
   +files/pilot-link-0.11.8-fPIC.patch, pilot-link-0.11.8-r1.ebuild:
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index 3eff26aa36b2..699793322912 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,17 +1,29 @@
-MD5 5f3580786b4dee01be3db367fe8c2653 ChangeLog 5449
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b8d703cf9ce10632dce9d49ab2a68cb4 ChangeLog 5905
 MD5 075fea99b82d61028585dc3e42f00466 metadata.xml 156
 MD5 fb9be3487ce754189ca1b324ae2f788b pilot-link-0.11.3.ebuild 1135
 MD5 1f4d9af8ae7ff1aa8a5564924a581a56 pilot-link-0.11.5-r2.ebuild 2803
 MD5 2504b52d2044a6684516a5e662360cfc pilot-link-0.11.7-r1.ebuild 1797
 MD5 92cbee3bbb10790e2eaa4fd0ccef2383 pilot-link-0.11.8.ebuild 1888
-MD5 6396f57d4455439f8de45cc9d8728b62 pilot-link-0.11.8-r1.ebuild 2094
+MD5 4341c105f427432d1d318517e0a856f3 pilot-link-0.11.8-r1.ebuild 2256
 MD5 4ed5cde53dbd9e15bb794538763b55eb files/digest-pilot-link-0.11.3 70
 MD5 6d5485ccfa72ceeae0193839586e7252 files/digest-pilot-link-0.11.5-r2 70
 MD5 6ba6541a846ca65d5b4985c0b3e63707 files/digest-pilot-link-0.11.7-r1 70
 MD5 c7eea8e9fc52ce118ca126979309da45 files/digest-pilot-link-0.11.8 70
 MD5 469bfe2e33b13b930be59dea48e25719 files/perlpatch.diff 702
-MD5 90560348093b5a7b47849896f35b4d54 files/pilot-link-0.11.8-javapath.patch 562
 MD5 c7eea8e9fc52ce118ca126979309da45 files/digest-pilot-link-0.11.8-r1 70
-MD5 73901859bb01a4c7aa0dbddf1d6e898a files/pilot-link-0.11.8-javappc.patch 560
 MD5 cc5d291e67e5ebc1caa5cc3c401f3ced files/pilot-link-0.11.8-netsync.patch 4371
 MD5 f30a8971ef7adddf2982f0362b4266c1 files/pilot-link-0.11.8-fPIC.patch 565
+MD5 90560348093b5a7b47849896f35b4d54 files/pilot-link-0.11.8-java_install_all.patch 562
+MD5 73901859bb01a4c7aa0dbddf1d6e898a files/pilot-link-0.11.8-java_install_ppc.patch 560
+MD5 bf74434daf1ebd09156aad1d90c93675 files/pilot-link-0.11.8-java_compile_amd64.patch 579
+MD5 5bb039a94f9888c99327b7e701cc1002 files/pilot-link-0.11.8-java_install_amd64.patch 395
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB96gKRkyva5PS18kRAjTEAJ4+ItRV5whWI3T7sVswWtJR9DzRygCfbyKx
+URY2ippASqPQ6dG/qs+w2co=
+=cUdd
+-----END PGP SIGNATURE-----
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-java_compile_amd64.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_compile_amd64.patch
new file mode 100644
index 000000000000..4e348be561e6
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.11.8-java_compile_amd64.patch
@@ -0,0 +1,11 @@
+--- pilot-link-0.11.8/bindings/Java/Makefile.am	2003-06-17 17:08:51.000000000 -0400
++++ pilot-link-0.11.8.new/bindings/Java/Makefile.am	2004-10-10 06:06:14.014193728 -0400
+@@ -38,7 +38,7 @@
+ 	$(JAVAC) -d . $(java_files)
+ 
+ java_lib: libjpisock.c
+-	$(CXX) $(INCLUDES) $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock -shared -o libjpisock.so $(srcdir)/libjpisock.c
++	$(CXX) $(CXXFLAGS) -fPIC $(INCLUDES) $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock -shared -o libjpisock.so $(srcdir)/libjpisock.c
+ 
+ java_jar: $(java_classes)
+ 	$(JAR) cvf pilot-link.jar $(java_classes)
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-javapath.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_all.patch
index ab45653b979e..ab45653b979e 100644
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-javapath.patch
+++ b/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_all.patch
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_amd64.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_amd64.patch
new file mode 100644
index 000000000000..9c7d710d3e32
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_amd64.patch
@@ -0,0 +1,11 @@
+--- pilot-link-0.11.8/bindings/Java/Makefile.am	2004-10-10 06:19:24.822972520 -0400
++++ pilot-link-0.11.8.new/bindings/Java/Makefile.am	2004-10-10 06:27:10.301209072 -0400
+@@ -46,7 +46,7 @@
+ java_pisock: java_compile java_lib java_jar
+ 
+ install: all
+-	cp libjpisock.so ${JAVABASE}/jre/lib/i386/
++	cp libjpisock.so ${JAVABASE}/jre/lib/amd64/
+ 
+ test: install
+ 	${JAVABASE}/bin/java test ${PORT}
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-javappc.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_ppc.patch
index 9014c542a5ff..9014c542a5ff 100644
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-javappc.patch
+++ b/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_ppc.patch
diff --git a/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild b/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild
index d51f91ceecb5..ef59844c6fc0 100644
--- a/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild,v 1.6 2005/01/01 15:46:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild,v 1.7 2005/01/26 14:23:40 liquidx Exp $
 
 inherit perl-module eutils
 
@@ -24,11 +24,18 @@ DEPEND="virtual/libc
 
 src_unpack() {
 	unpack ${A}
-	if use java && use ppc; then
-		epatch ${FILESDIR}/${P}-javappc.patch
-	else
-		epatch ${FILESDIR}/${P}-javapath.patch
+
+	if use java; then
+		if use ppc; then
+			epatch ${FILESDIR}/${P}-java_install_ppc.patch
+		elif use amd64; then
+			epatch ${FILESDIR}/${P}-java_install_amd64.patch
+			epatch ${FILESDIR}/${P}-java_compile_amd64.patch
+		else
+			epatch ${FILESDIR}/${P}-java_install_all.patch			
+		fi
 	fi
+
 	# bug #62873
 	cd ${S}/libpisock; epatch ${FILESDIR}/${P}-netsync.patch
 }