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

(Portage version: 2.0.51.22-r1)

12 files changed, 28 insertions, 261 deletions

diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index ad1ebf8b8c58..237c34c37d68 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,15 @@
 # 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.19 2005/01/27 10:39:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.20 2005/07/08 10:10:49 liquidx Exp $
+
+  08 Jul 2005; Alastair Tse <liquidx@gentoo.org>
+  -files/pilot-link-0.11.8-fPIC.patch,
+  +files/pilot-link-0.11.8-java_fPIC_fix.patch,
+  files/pilot-link-0.11.8-java_install_amd64.patch, -files/perlpatch.diff,
+  -pilot-link-0.11.3.ebuild, -pilot-link-0.11.5-r2.ebuild,
+  -pilot-link-0.11.7-r1.ebuild, pilot-link-0.11.8-r1.ebuild:
+  another attempt at fixing java support for amd64. patches thanks to Philipp
+  Weinfurter (#87774)
 
   27 Jan 2005; Alastair Tse <liquidx@gentoo.org> pilot-link-0.11.8.ebuild:
   fix missing patch while doing housecleaning (#79682)
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}
diff --git a/app-pda/pilot-link/pilot-link-0.11.3.ebuild b/app-pda/pilot-link/pilot-link-0.11.3.ebuild
deleted file mode 100644
index 99137da10fee..000000000000
--- a/app-pda/pilot-link/pilot-link-0.11.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.3.ebuild,v 1.11 2005/01/01 15:46:37 eradicator Exp $
-
-DESCRIPTION="A suite of tools contains a series of conduits for moving
-information to and from your Palm device and your desktop or workstation
-system."
-
-SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
-HOMEPAGE="http://www.pilot-link.org/"
-DEPEND="virtual/libc"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="java perl tcltk"
-
-src_compile() {
-
-	local myconf
-
-	use perl || myconf="${myconf} --with-perl5=no"
-	use java || myconf="${myconf} --with-java=no"
-	use tcltk || myconf="${myconf} --with-tcl=no --with-itcl=no --with-tk=no"
-
-	econf \
-		--includedir=/usr/include/libpisock \
-		--with-perl5=no \
-		--with-python=no \
-		--with-java=no \
-		--with-tcl=no \
-		--with-itcl=no \
-		--with-tk=no || die
-
-	cd ${S}
-	emake || die
-
-
-}
-
-src_install() {
-
-	make \
-		DESTDIR=${D} \
-		install || die
-
-	mv ${D}/*.hxx ${D}/usr/include/libpisock/
-
-	dodoc ChangeLog README TODO NEWS AUTHORS
-
-}
diff --git a/app-pda/pilot-link/pilot-link-0.11.5-r2.ebuild b/app-pda/pilot-link/pilot-link-0.11.5-r2.ebuild
deleted file mode 100644
index 0f2c31a3358f..000000000000
--- a/app-pda/pilot-link/pilot-link-0.11.5-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.5-r2.ebuild,v 1.8 2005/01/01 15:46:37 eradicator Exp $
-
-inherit perl-module
-
-DESCRIPTION="suite of tools for moving data between a Palm device and a desktop"
-
-SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
-HOMEPAGE="http://www.pilot-link.org/"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc"
-IUSE="perl java tcltk python png readline"
-
-DEPEND="virtual/libc
-	sys-libs/ncurses
-	perl? ( dev-lang/perl )
-	java? ( virtual/jre )
-	tcltk? ( dev-lang/tcl dev-tcltk/itcl dev-lang/tk )
-	python? ( dev-lang/python )
-	png? ( media-libs/libpng )
-	readline? ( sys-libs/readline )"
-
-src_compile() {
-#	Fix up perl bindings to install the "Gentoo" way
-#	http://gnu-designs.com/bugs/view_bug_page.php?f_id=259
-	use perl && patch -p1 < ${FILESDIR}/perlpatch.diff
-
-	local myconf="--with-gnu-ld --includedir=/usr/include/libpisock"
-
-	use java \
-		&& myconf="${myconf} --with-java=yes" \
-		|| myconf="${myconf} --with-java=no"
-
-	use perl \
-		&& myconf="${myconf} --with-perl=yes" \
-		|| myconf="${myconf} --with-perl=no"
-
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-
-	use tcltk \
-		&& myconf="${myconf} --with-tcl=yes --with-itcl=yes --with-tk=yes" \
-		|| myconf="${myconf} --with-tcl=no --with-itcl=no --with-tk=no"
-
-	use png && myconf="${myconf} --with-libpng=/usr"
-
-	use readline \
-		&& myconf="${myconf} --with-readline=yes" \
-		|| myconf="${myconf} --with-readline=no"
-
-#	make configure script:
-#	  - look for ncurses rather than termcap
-#	    http://gnu-designs.com/bugs/view_bug_page.php?f_id=381
-#	  - link png check with more libraries
-#	    http://gnu-designs.com/bugs/view_bug_page.php?f_id=380
-	cp configure configure.old
-	sed -e 's:-ltermcap:-lncurses:' \
-	 -e 's:-lpng:-lpng -lz -lstdc++:' \
-		configure.old > configure
-
-#	fix pilot-debug.c
-#	http://gnu-designs.com/bugs/view_bug_page.php?f_id=129
-	cp src/pilot-debug.c src/pilot-debug.c.old
-	sed -e 's:TCL_MINOR_VERSION <4:TCL_MINOR_VERSION <3:' \
-		src/pilot-debug.c.old > src/pilot-debug.c
-
-	econf ${myconf} || die "econf failed"
-
-#	so python doesnt violate sandbox
-#	http://gnu-designs.com/bugs/view_bug_page.php?f_id=382
-	cp bindings/Makefile bindings/Makefile.old
-	sed -e 's:--prefix=$(prefix):--prefix=$(prefix) --root=$(DESTDIR):' \
-		bindings/Makefile.old > bindings/Makefile
-
-#	java fails w/emake
-	make || die
-
-	if use perl ; then
-		cd ${S}/bindings/Perl
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog README doc/README* doc/TODO NEWS AUTHORS
-
-	if use perl ; then
-		cd ${S}/bindings/Perl
-		perl-module_src_install
-	fi
-}
diff --git a/app-pda/pilot-link/pilot-link-0.11.7-r1.ebuild b/app-pda/pilot-link/pilot-link-0.11.7-r1.ebuild
deleted file mode 100644
index 44698c6beba9..000000000000
--- a/app-pda/pilot-link/pilot-link-0.11.7-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.7-r1.ebuild,v 1.8 2005/01/01 15:46:37 eradicator Exp $
-
-inherit perl-module
-
-DESCRIPTION="suite of tools for moving data between a Palm device and a desktop"
-SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
-HOMEPAGE="http://www.pilot-link.org/"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha"
-IUSE="perl java tcltk python png readline"
-
-DEPEND="virtual/libc
-	sys-libs/ncurses
-	perl? ( dev-lang/perl )
-	java? ( virtual/jre )
-	tcltk? ( dev-lang/tcl dev-tcltk/itcl dev-lang/tk )
-	python? ( dev-lang/python )
-	png? ( media-libs/libpng )
-	readline? ( sys-libs/readline )"
-
-src_compile() {
-	local myconf="--with-gnu-ld --includedir=/usr/include/libpisock"
-
-	use java \
-		&& myconf="${myconf} --with-java=yes" \
-		|| myconf="${myconf} --with-java=no"
-
-	use perl \
-		&& myconf="${myconf} --with-perl=yes" \
-		|| myconf="${myconf} --with-perl=no"
-
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-
-	use tcltk \
-		&& myconf="${myconf} --with-tcl=yes --with-itcl=yes --with-tk=yes" \
-		|| myconf="${myconf} --with-tcl=no --with-itcl=no --with-tk=no"
-
-	use png && myconf="${myconf} --with-libpng=/usr"
-
-	use readline \
-		&& myconf="${myconf} --with-readline=yes" \
-		|| myconf="${myconf} --with-readline=no"
-
-	econf ${myconf} || die
-	# java fails w/emake
-	make || die
-
-	if use perl ; then
-		cd ${S}/bindings/Perl
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog README doc/README* doc/TODO NEWS AUTHORS
-
-	if use perl ; then
-		cd ${S}/bindings/Perl
-		perl-module_src_install
-	fi
-}
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 10b67dfdc4dc..5a1dde4969d6 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.9 2005/05/20 21:45:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild,v 1.10 2005/07/08 10:10:49 liquidx Exp $
 
 inherit perl-module eutils
 
@@ -26,12 +26,13 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch ${FILESDIR}/${P}-java_fPIC_fix.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
@@ -69,8 +70,6 @@ src_compile() {
 		|| myconf="${myconf} --with-readline=no"
 
 	econf ${myconf} || die
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fPIC.patch
 	# java fails w/emake
 	make || die