another attempt at fixing java support for amd64. patches thanks to Philipp Weinfurter (#87774)

Package-Manager: portage-2.0.51.22-r1

7 files changed, 15 insertions, 37 deletions

diff --git a/app-pda/pilot-link/files/digest-pilot-link-0.11.3 b/app-pda/pilot-link/files/digest-pilot-link-0.11.3
deleted file mode 100644
index 6a9355cd86d8..000000000000
--- a/app-pda/pilot-link/files/digest-pilot-link-0.11.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff8bf656fa74fe9705c427c2aa8f69a0 pilot-link-0.11.3.tar.bz2 648867
diff --git a/app-pda/pilot-link/files/digest-pilot-link-0.11.5-r2 b/app-pda/pilot-link/files/digest-pilot-link-0.11.5-r2
deleted file mode 100644
index 9e6b741ec15a..000000000000
--- a/app-pda/pilot-link/files/digest-pilot-link-0.11.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7e9d73959d9e1d998837e93d03c58e7 pilot-link-0.11.5.tar.bz2 635370
diff --git a/app-pda/pilot-link/files/digest-pilot-link-0.11.7-r1 b/app-pda/pilot-link/files/digest-pilot-link-0.11.7-r1
deleted file mode 100644
index 00219f911363..000000000000
--- a/app-pda/pilot-link/files/digest-pilot-link-0.11.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d06c1101707125b1e385dbd3cd7ce91 pilot-link-0.11.7.tar.bz2 669470
diff --git a/app-pda/pilot-link/files/perlpatch.diff b/app-pda/pilot-link/files/perlpatch.diff
deleted file mode 100644
index 73ad52479b87..000000000000
--- a/app-pda/pilot-link/files/perlpatch.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naurp pilot-link-0.11.5.orig/bindings/Makefile.in pilot-link-0.11.5/bindings/Makefile.in
---- pilot-link-0.11.5.orig/bindings/Makefile.in	2002-09-28 15:19:45.000000000 -0400
-+++ pilot-link-0.11.5/bindings/Makefile.in	2002-11-17 11:41:24.000000000 -0500
-@@ -368,11 +368,11 @@ python-clean: Python/setup.py
- Perl/Makefile: Perl/Makefile.PL
- 	cd Perl && $(PERL) Makefile.PL INSTALLDIRS=vendor
- 
--perl-build: Perl/Makefile
--	cd Perl && $(MAKE) PREFIX=$(DESTDIR)$(prefix)
-+perl-build:
-+#	cd Perl && $(MAKE) PREFIX=$(DESTDIR)$(prefix)
- 
--perl-install: perl-build
--	cd Perl && $(MAKE) install 
-+perl-install:
-+#	cd Perl && $(MAKE) install 
- 
- perl-uninstall: Perl/Makefile
- 	cd Perl && $(MAKE) uninstall
diff --git a/app-pda/pilot-link/files/pilot-link-0.11.8-fPIC.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-fPIC.patch
deleted file mode 100644
index c5c0112226a6..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.11.8-fPIC.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pilot-link-0.11.8/bindings/Java/Makefile.in	2004-09-06 11:34:18.074966344 +0200
-+++ pilot-link-0.11.8/bindings/Java/Makefile.in	2004-09-06 11:57:42.772419872 +0200
-@@ -233,7 +233,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) $(INCLUDES) -fPIC $(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-java_fPIC_fix.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_fPIC_fix.patch
new file mode 100644
index 000000000000..99d3f42ea0a5
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.11.8-java_fPIC_fix.patch
@@ -0,0 +1,11 @@
+--- pilot-link-0.11.8/bindings/Java/Makefile.in	2005-06-30 13:15:07.000000000 +0200
++++ pilot-link-0.11.8-r2/bindings/Java/Makefile.in	2005-06-30 13:16:45.000000000 +0200
+@@ -233,7 +233,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-java_install_amd64.patch b/app-pda/pilot-link/files/pilot-link-0.11.8-java_install_amd64.patch
index 9c7d710d3e32..eff7a6f2b378 100644
--- 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
@@ -1,11 +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 @@
+--- pilot-link-0.11.8/bindings/Java/Makefile.in	2003-07-01 21:09:06.000000000 +0200
++++ pilot-link-0.11.8-r2/bindings/Java/Makefile.in	2005-06-30 13:10:55.000000000 +0200
+@@ -241,7 +241,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/
++	cp libjpisock.so $(DESTDIR)$(libdir)/
  
  test: install
  	${JAVABASE}/bin/java test ${PORT}