Version bump to 0.12.2. Temporarily package.mask'ed to allow for further testing.

(Portage version: 2.1.3.7)

10 files changed, 381 insertions, 1 deletions

diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index c97d047c6ca1..e1654d2cd672 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-pda/pilot-link
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.27 2007/01/11 18:19:24 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.28 2007/08/25 19:17:04 philantrop Exp $
+
+*pilot-link-0.12.2 (25 Aug 2007)
+
+  25 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/pilot-link-0.12.2-bluez.patch,
+  +files/pilot-link-0.12.2-java-compile.patch,
+  +files/pilot-link-0.12.2-java-install.patch,
+  +files/pilot-link-0.12.2-m4.patch, +files/pilot-link-0.12.2-png.patch,
+  +files/pilot-link-0.12.2-readline.patch,
+  +files/pilot-link-0.12.2-threads.patch, +pilot-link-0.12.2.ebuild:
+  Version bump to 0.12.2. Temporarily package.mask'ed to allow for further
+  testing.
 
   11 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   pilot-link-0.11.8-r1.ebuild:
diff --git a/app-pda/pilot-link/files/digest-pilot-link-0.12.2 b/app-pda/pilot-link/files/digest-pilot-link-0.12.2
new file mode 100644
index 000000000000..a009738149ee
--- /dev/null
+++ b/app-pda/pilot-link/files/digest-pilot-link-0.12.2
@@ -0,0 +1,3 @@
+MD5 c1f4db8f32a2ee916fedb9a2dac8aa26 pilot-link-0.12.2.tar.bz2 964014
+RMD160 3ae19f16b28c33cccb19fa218cdad4353d479875 pilot-link-0.12.2.tar.bz2 964014
+SHA256 809df99a97aae215f93c1a0863644c0d3411462a5bac2d16d4d8941ce9c6d150 pilot-link-0.12.2.tar.bz2 964014
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-bluez.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-bluez.patch
new file mode 100644
index 000000000000..d6bb4da22db6
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.2-bluez.patch
@@ -0,0 +1,52 @@
+diff -Naur pilot-link-0.12.2.orig/configure.ac pilot-link-0.12.2/configure.ac
+--- pilot-link-0.12.2.orig/configure.ac	2007-02-09 22:50:17.000000000 +0100
++++ pilot-link-0.12.2/configure.ac	2007-08-25 18:49:58.000000000 +0200
+@@ -346,27 +346,32 @@
+ use_bluez=no
+ msg_bluez=no
+ 
+-PKG_CHECK_MODULES(BLUEZ, bluez, have_bluez=yes, AC_MSG_RESULT(no))
++AC_ARG_WITH([bluez], AS_HELP_STRING([--without-bluez], [Build without BlueZ bluetooth support (default: test)]))
+ 
+-AC_MSG_CHECKING([for BlueZ bluetooth support])
+-AC_ARG_WITH(bluez,
++if test "x$with_bluez" != "xno"; then
++	PKG_CHECK_MODULES(BLUEZ, bluez, have_bluez=yes, AC_MSG_RESULT(no))
++
++	AC_MSG_CHECKING([for BlueZ bluetooth support])
++	AC_ARG_WITH(bluez,
+                 AC_HELP_STRING([--with-bluez],
+-                        [Enable usage of BlueZ]),,
++                        [Enable usage of BlueZ]),[use_bluez="$withval"],
+                 use_bluez=auto)
+-if test "x$use_bluez" != "xno"; then
+-        if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then
+-                AC_MSG_ERROR([BlueZ explicitly requested but no support found])
+-        fi
+-        if test "x$have_bluez" = xyes; then
+-                AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support])
+-                AC_MSG_RESULT([enabled])
+-                msg_bluez="yes"
+-        else
+-                AC_MSG_RESULT([not found])
+-        fi
++	if test "x$use_bluez" != "xno"; then
++        	if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then
++                	AC_MSG_ERROR([BlueZ explicitly requested but no support found])
++        	fi
++		use_bluez="$have_bluez"
++        	if test "x$have_bluez" = xyes; then
++                	AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support])
++                	AC_MSG_RESULT([enabled])
++                	msg_bluez="yes"
++        	else
++                	AC_MSG_RESULT([not found])
++        	fi
++	fi
+ fi
+ 
+-AM_CONDITIONAL(WITH_BLUEZ, test x$have_bluez = "xyes")
++AM_CONDITIONAL(WITH_BLUEZ, test x$use_bluez != "xno")
+ 
+ 
+ dnl *********************************
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-java-compile.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-java-compile.patch
new file mode 100644
index 000000000000..8974a21c86f7
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.2-java-compile.patch
@@ -0,0 +1,35 @@
+diff --git a/bindings/Java/Makefile.am b/bindings/Java/Makefile.am
+index a2ead24..1500dcd 100644
+--- a/bindings/Java/Makefile.am
++++ b/bindings/Java/Makefile.am
+@@ -67,6 +67,8 @@ java_classes= \
+ 	datebooktst.class	\
+ 	adrtest.class
+ 
++$(java_classes): java_compile
++
+ java_compile: $(java_files)
+ 	$(JAVAC) -d . $(java_files)
+ 
+@@ -81,16 +83,16 @@ java_pisock: java_compile java_lib java_jar
+ install: all
+ 	ARCH=""; \
+ 	for a in i386 amd64 ppc; do \
+-		if [ -e ${JAVABASE}/jre/lib/${a} ]; then \
+-			 ARCH="${a}"; \
++		if [ -e ${JAVABASE}/jre/lib/$${a} ]; then \
++			 ARCH="$${a}"; \
+ 			 break; \
+ 		fi; \
+ 	done; \
+-	if [ -n "${ARCH}" ]; then \
++	if [ -n "$${ARCH}" ]; then \
+ 		echo "Unknown architecture. Copy lipijsock.so to ${JAVABASE}/jre/lib/ARCH/"; \
+ 	else \
+-		mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/${ARCH}" && \
+-		cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/${ARCH}"; \
++		mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}" && \
++		cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}"; \
+ 		echo "done."; \
+ 	fi
+  
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-java-install.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-java-install.patch
new file mode 100644
index 000000000000..5e50180cd309
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.2-java-install.patch
@@ -0,0 +1,26 @@
+diff -Naur pilot-link-0.12.2.orig/bindings/Java/Makefile.am pilot-link-0.12.2/bindings/Java/Makefile.am
+--- pilot-link-0.12.2.orig/bindings/Java/Makefile.am	2007-07-22 10:40:48.000000000 +0200
++++ pilot-link-0.12.2/bindings/Java/Makefile.am	2007-07-22 10:41:46.000000000 +0200
+@@ -81,21 +81,7 @@
+ java_pisock: java_compile java_lib java_jar
+ 
+ install: all
+-	ARCH=""; \
+-	for a in i386 amd64 ppc; do \
+-		if [ -e ${JAVABASE}/jre/lib/$${a} ]; then \
+-			 ARCH="$${a}"; \
+-			 break; \
+-		fi; \
+-	done; \
+-	if [ -n "$${ARCH}" ]; then \
+-		echo "Unknown architecture. Copy lipijsock.so to ${JAVABASE}/jre/lib/ARCH/"; \
+-	else \
+-		mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}" && \
+-		cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}"; \
+-		echo "done."; \
+-	fi
+- 
++
+ test: install
+ 	${JAVABASE}/bin/java test ${PORT}
+ 
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-m4.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-m4.patch
new file mode 100644
index 000000000000..e1941110df47
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.2-m4.patch
@@ -0,0 +1,10 @@
+diff --git a/pilot-link.m4.in b/pilot-link.m4.in
+index 129dfc3..a271c74 100644
+--- a/pilot-link.m4.in
++++ b/pilot-link.m4.in
+@@ -1,5 +1,3 @@
+-AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl
+-
+ AC_DEFUN([AC_PILOT_LINK_HOOK],
+ [
+ PILOT_LINK_VERS=0
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-png.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-png.patch
new file mode 100644
index 000000000000..766a3b84ea8c
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.2-png.patch
@@ -0,0 +1,85 @@
+diff -Naur pilot-link-0.12.2.orig/configure.ac pilot-link-0.12.2/configure.ac
+--- pilot-link-0.12.2.orig/configure.ac	2007-02-09 22:50:17.000000000 +0100
++++ pilot-link-0.12.2/configure.ac	2007-08-25 17:38:42.000000000 +0200
+@@ -220,47 +220,52 @@
+ dnl ******************************
+ dnl PNG Support
+ dnl ******************************
++msg_png=no
+ if test "x$enable_conduits" != "xno"; then
+ 	have_png=no
+ 
+ 	AC_ARG_WITH(libpng,
+ 		[  --with-libpng           Prefix where libpng is installed])
+ 
+-	case $with_libpng in
+-		/*)
+-		PNG_CFLAGS="-I$withval/include"
+-		PNG_LIBS="-L$withval/lib"
+-		;;
+-	esac
++	if test "x$with_libpng" != "xno"; then
++
++		case $with_libpng in
++			/*)
++			PNG_CFLAGS="-I$withval/include"
++			PNG_LIBS="-L$withval/lib"
++			;;
++		esac
++
++		save_CFLAGS="$CFLAGS"
++		save_CPPFLAGS="$CPPFLAGS"
++		save_LDFLAGS="$LDFLAGS"
++		CFLAGS="$CFLAGS $PNG_CFLAGS"
++		CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
++		LDFLAGS="$LDFLAGS $PNG_LIBS"
+ 
+-	save_CFLAGS="$CFLAGS"
+-	save_CPPFLAGS="$CPPFLAGS"
+-	save_LDFLAGS="$LDFLAGS"
+-	CFLAGS="$CFLAGS $PNG_CFLAGS"
+-	CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
+-	LDFLAGS="$LDFLAGS $PNG_LIBS"
+-
+-	AC_CHECK_LIB(png, main, [have_png=yes; PNG_LIBS="$PNG_LIBS -lpng"],[have_png=no],[-lm])
+-	if test "$have_png" = yes; then
+-		AC_CHECK_HEADER(png.h, , have_png=no)
++		AC_CHECK_LIB(png, main, [have_png=yes; PNG_LIBS="$PNG_LIBS -lpng"],[have_png=no],[-lm])
+ 		if test "$have_png" = yes; then
+-			AC_MSG_CHECKING(for png setjmp support)
+-			AC_EGREP_CPP(yes,
+-			[#include <png.h>
+-			#ifdef PNG_SETJMP_SUPPORTED
+-				yes
+-			#endif], , have_png=no)
+-			AC_MSG_RESULT($have_png)
++			AC_CHECK_HEADER(png.h, , have_png=no)
+ 			if test "$have_png" = yes; then
+-				AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support])
+-				have_png=yes
++				AC_MSG_CHECKING(for png setjmp support)
++				AC_EGREP_CPP(yes,
++				[#include <png.h>
++				#ifdef PNG_SETJMP_SUPPORTED
++					yes
++				#endif], , have_png=no)
++				AC_MSG_RESULT($have_png)
++				if test "$have_png" = yes; then
++					AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support])
++					have_png=yes
++					msg_png=yes
++				fi
+ 			fi
+ 		fi
+-	fi
+ 
+-	CFLAGS="$save_CFLAGS"
+-	CPPFLAGS="$save_CPPFLAGS"
+-	LDFLAGS="$save_LDFLAGS"
++		CFLAGS="$save_CFLAGS"
++		CPPFLAGS="$save_CPPFLAGS"
++		LDFLAGS="$save_LDFLAGS"
++	fi
+ else
+ 	have_png="none"
+ 	PNG_CFLAGS=
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-readline.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-readline.patch
new file mode 100644
index 000000000000..5bfe01c5d1fa
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.2-readline.patch
@@ -0,0 +1,43 @@
+diff -Naur pilot-link-0.12.2.orig/m4/vl_lib_readline.m4 pilot-link-0.12.2/m4/vl_lib_readline.m4
+--- pilot-link-0.12.2.orig/m4/vl_lib_readline.m4	2005-06-03 20:39:24.000000000 +0200
++++ pilot-link-0.12.2/m4/vl_lib_readline.m4	2007-08-25 15:23:58.000000000 +0200
+@@ -89,23 +89,23 @@
+       fi
+       LIBS="$ORIG_LIBS"
+     ])
+-  fi
+ 
+-  if test "$vl_cv_lib_readline" != "no"; then
+-    msg_readline="yes"
+-    RL_LIBS="$vl_cv_lib_readline"
+-    AC_DEFINE(HAVE_LIBREADLINE, 1,
+-              [Define if you have a readline compatible library])
+-    AC_CHECK_HEADERS(readline.h readline/readline.h)
+-    AC_CACHE_CHECK([whether readline supports history],
+-                   vl_cv_lib_readline_history, [
+-      vl_cv_lib_readline_history="no"
+-      AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history="yes")
+-    ])
+-    if test "$vl_cv_lib_readline_history" = "yes"; then
+-      AC_DEFINE(HAVE_READLINE_HISTORY, 1,
+-                [Define if your readline library has \`add_history'])
+-      AC_CHECK_HEADERS(history.h readline/history.h)
++    if test "$vl_cv_lib_readline" != "no"; then
++      msg_readline="yes"
++      RL_LIBS="$vl_cv_lib_readline"
++      AC_DEFINE(HAVE_LIBREADLINE, 1,
++                [Define if you have a readline compatible library])
++      AC_CHECK_HEADERS(readline.h readline/readline.h)
++      AC_CACHE_CHECK([whether readline supports history],
++                     vl_cv_lib_readline_history, [
++        vl_cv_lib_readline_history="no"
++        AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history="yes")
++      ])
++      if test "$vl_cv_lib_readline_history" = "yes"; then
++        AC_DEFINE(HAVE_READLINE_HISTORY, 1,
++                  [Define if your readline library has \`add_history'])
++        AC_CHECK_HEADERS(history.h readline/history.h)
++      fi
+     fi
+   fi
+   AC_SUBST(RL_LIBS)
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-threads.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-threads.patch
new file mode 100644
index 000000000000..edfedb2ae6a2
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.2-threads.patch
@@ -0,0 +1,17 @@
+diff -Naur pilot-link-0.12.2.orig/m4/threads.m4 pilot-link-0.12.2/m4/threads.m4
+--- pilot-link-0.12.2.orig/m4/threads.m4	2005-03-02 23:36:49.000000000 +0100
++++ pilot-link-0.12.2/m4/threads.m4	2007-08-25 20:36:36.000000000 +0200
+@@ -5,9 +5,10 @@
+ #
+ 
+ AC_DEFUN([PILOT_LINK_THREADS_SUPPORT], [
+-	use_threads=false
+-	AC_ARG_ENABLE(threads,[  --enable-threads        Add this to have built-in thread safety],use_threads=true)
+-	if $use_threads; then
++	use_threads=true
++	AC_ARG_ENABLE([threads], AS_HELP_STRING([--disable-threads], [Build without built-in thread safety (default: test)]))
++
++	if test "x$enable_threads" != "xno"; then
+ 		ACX_PTHREAD
+ 		if test x"$acx_pthread_ok" = xno; then
+ 			use_threads=false
diff --git a/app-pda/pilot-link/pilot-link-0.12.2.ebuild b/app-pda/pilot-link/pilot-link-0.12.2.ebuild
new file mode 100644
index 000000000000..a2287c9bd1da
--- /dev/null
+++ b/app-pda/pilot-link/pilot-link-0.12.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2007 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.12.2.ebuild,v 1.1 2007/08/25 19:17:04 philantrop Exp $
+
+inherit perl-module java-pkg-opt-2 eutils autotools
+
+DESCRIPTION="suite of tools for moving data between a Palm device and a desktop"
+HOMEPAGE="http://www.pilot-link.org/"
+SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+IUSE="perl java python png readline threads bluetooth usb debug"
+
+BOTH_DEPEND="virtual/libiconv
+	>=sys-libs/ncurses-5.6-r1
+	>=dev-libs/popt-1.10.7
+	perl? ( >=dev-lang/perl-5.8.8-r2 )
+	python? ( >=dev-lang/python-2.4.4-r4 )
+	png? ( >=media-libs/libpng-1.2.18-r1 )
+	readline? ( >=sys-libs/readline-5.2_p4 )
+	usb? ( >=dev-libs/libusb-0.1.12 )
+	bluetooth? ( >=net-wireless/bluez-libs-3.10 )"
+
+DEPEND="${BOTH_DEPEND}
+	java? ( >=virtual/jdk-1.4 )"
+
+RDEPEND="${BOTH_DEPEND}
+	java? ( >=virtual/jre-1.4 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix a syntax error.
+	epatch "${FILESDIR}/${P}-m4.patch"
+
+	# Patch away a *lot* of broken configure switches and automagic deps.
+	epatch "${FILESDIR}/${P}-bluez.patch"
+	epatch "${FILESDIR}/${P}-png.patch"
+	epatch "${FILESDIR}/${P}-readline.patch"
+	epatch "${FILESDIR}/${P}-threads.patch"
+
+	# Some Java fixes.
+	if use java ; then
+		epatch "${FILESDIR}/${P}-java-compile.patch"
+		epatch "${FILESDIR}/${P}-java-install.patch"
+	fi
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	# tcl/tk support is disabled as per upstream request.
+	econf \
+		--includedir=/usr/include/libpisock \
+		--enable-conduits \
+		--with-tcl=no \
+		--without-included-popt \
+		$(use_enable threads) \
+		$(use_enable usb libusb) \
+		$(use_enable debug) \
+		$(use_with png libpng $(libpng-config --prefix)) \
+		$(use_with bluetooth bluez) \
+		$(use_with readline) \
+		$(use_with perl) \
+		$(use_with java) \
+		$(use_with python) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+
+	if use perl ; then
+		cd "${S}/bindings/Perl"
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ChangeLog README doc/README* doc/TODO NEWS AUTHORS || die "installing docs failed"
+
+	if use java ; then
+		cd "${S}/bindings/Java"
+		java-pkg_newjar ${PN}.jar
+		java-pkg_doso libjpisock.so
+	fi
+
+	if use perl ; then
+		cd "${S}/bindings/Perl"
+		perl-module_src_install
+	fi
+}