Version bump wrt #271473 with improved distutils.eclass usage wrt #311767.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 133 insertions, 145 deletions

diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index cbeb43a6c981..2efd9150d8af 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-pda/pilot-link
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.62 2010/07/10 18:41:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.63 2010/07/11 01:14:15 ssuominen Exp $
+
+*pilot-link-0.12.5 (11 Jul 2010)
+
+  11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +pilot-link-0.12.5.ebuild:
+  Version bump wrt #271473 with improved distutils.eclass usage wrt #311767.
 
   10 Jul 2010; Raúl Porcel <armin76@gentoo.org>
   pilot-link-0.12.3-r2.ebuild:
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch
index a49000490d5d..9396ba9f3f4d 100644
--- a/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch
+++ b/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch
@@ -1,6 +1,7 @@
-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-10-07 18:18:47.000000000 +0200
-+++ pilot-link-0.12.2/configure.ac	2007-10-07 18:18:35.000000000 +0200
+http://bugs.gentoo.org/194921
+
+--- configure.ac
++++ configure.ac
 @@ -757,11 +757,9 @@
  dnl *************************************
  dnl (already done) enable_werror=no
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-java-install.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-java-install.patch
index 65d99d0be99d..8cdd613aa441 100644
--- a/app-pda/pilot-link/files/pilot-link-0.12.3-java-install.patch
+++ b/app-pda/pilot-link/files/pilot-link-0.12.3-java-install.patch
@@ -1,6 +1,7 @@
-diff -Naur pilot-link-0.12.3.orig/bindings/Java/Makefile.am pilot-link-0.12.3/bindings/Java/Makefile.am
---- pilot-link-0.12.3.orig/bindings/Java/Makefile.am	2007-11-09 15:42:41.000000000 +0100
-+++ pilot-link-0.12.3/bindings/Java/Makefile.am	2007-12-19 21:08:01.000000000 +0100
+Use java eclass for install instead.
+
+--- bindings/Java/Makefile.am
++++ bindings/Java/Makefile.am
 @@ -81,20 +81,6 @@
  java_pisock: java_compile java_lib java_jar
  
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch
index 92cfaaabd1ab..0904377c2f0b 100644
--- a/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch
+++ b/app-pda/pilot-link/files/pilot-link-0.12.3-respect-javacflags.patch
@@ -1,6 +1,7 @@
-diff -Nur pilot-link-0.12.3/bindings/Java/Makefile.am pilot-link-0.12.3_patched/bindings/Java/Makefile.am
---- pilot-link-0.12.3/bindings/Java/Makefile.am	2007-11-09 16:42:41.000000000 +0200
-+++ pilot-link-0.12.3_patched/bindings/Java/Makefile.am	2009-04-26 08:03:30.000000000 +0300
+http://bugs.gentoo.org/267445
+
+--- bindings/Java/Makefile.am
++++ bindings/Java/Makefile.am
 @@ -70,7 +70,7 @@
  $(java_classes): java_compile
  
diff --git a/app-pda/pilot-link/pilot-link-0.12.3-r1.ebuild b/app-pda/pilot-link/pilot-link-0.12.3-r1.ebuild
deleted file mode 100644
index 058c310943a4..000000000000
--- a/app-pda/pilot-link/pilot-link-0.12.3-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2010 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.3-r1.ebuild,v 1.9 2010/06/11 21:30:10 arfrever Exp $
-
-EAPI=2
-
-inherit perl-module java-pkg-opt-2 eutils autotools distutils
-
-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 hppa ia64 ppc ppc64 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? ( virtual/libusb:0 )
-	bluetooth? ( net-wireless/bluez )"
-
-DEPEND="${BOTH_DEPEND}
-	java? ( >=virtual/jdk-1.4 )"
-
-RDEPEND="${BOTH_DEPEND}
-	java? ( >=virtual/jre-1.4 )"
-
-PYTHON_MODNAME="pisock.py pisockextras.py"
-
-src_prepare() {
-	# Fixing some broken configure switches and automagic deps.
-	epatch "${FILESDIR}/${PN}-0.12.2-readline.patch"
-	epatch "${FILESDIR}/${PN}-0.12.2-threads.patch"
-	epatch "${FILESDIR}/${P}-png.patch"
-
-	# Upstream's check for Werror was wrong. Fixes bug 194921.
-	epatch "${FILESDIR}/${PN}-0.12.2-werror_194921.patch"
-
-	# We install the Java bindings using the eclass functions so we disable
-	# their installation here.
-	use java && epatch "${FILESDIR}/${P}-java-install.patch"
-
-	# We install the Python bindings using the eclass functions so we disable
-	# their makefile.am rules here
-	use python && epatch  "${FILESDIR}/${P}-distutils.patch"
-
-	# Upstream patch to fix 64-bit issues.
-	epatch "${FILESDIR}/${P}-int_types.patch"
-
-	# Fix Glibc open without mode error
-	epatch "${FILESDIR}/${P}-glibc-open.patch"
-
-	# libusb-compat requires you to check the return value of usb_open!
-	epatch "${FILESDIR}/${P}-libusb-compat-usb_open.patch"
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	# tcl/tk support is disabled as per upstream request.
-	econf \
-		--includedir=/usr/include/libpisock \
-		--enable-conduits \
-		--with-tcl=no \
-		--without-included-popt \
-		--disable-compile-werror \
-		$(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"
-}
-
-src_compile() {
-	# Unfortunately, parallel compilation is badly broken. cf. bug  202857.
-	emake -j1 || die "emake failed"
-
-	if use perl ; then
-		cd "${S}/bindings/Perl"
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-
-	if use python; then
-		cd "${S}/bindings/Python"
-		distutils_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
-
-	if use python; then
-		cd "${S}/bindings/Python"
-		distutils_src_install
-	fi
-}
-
-pkg_preinst() {
-	perl-module_pkg_preinst
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/app-pda/pilot-link/pilot-link-0.12.5.ebuild b/app-pda/pilot-link/pilot-link-0.12.5.ebuild
new file mode 100644
index 000000000000..0fded090bcd0
--- /dev/null
+++ b/app-pda/pilot-link/pilot-link-0.12.5.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2010 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.5.ebuild,v 1.1 2010/07/11 01:14:15 ssuominen Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit autotools distutils eutils perl-module java-pkg-opt-2
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="perl java python png readline threads bluetooth usb debug"
+
+COMMON_DEPEND="virtual/libiconv
+	>=sys-libs/ncurses-5.7
+	>=dev-libs/popt-1.15
+	perl? ( >=dev-lang/perl-5.8.8-r2 )
+	png? ( >=media-libs/libpng-1.4 )
+	readline? ( >=sys-libs/readline-6 )
+	usb? ( virtual/libusb:0 )
+	bluetooth? ( net-wireless/bluez )"
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.4 )"
+
+PYTHON_MODNAME="pisock.py pisockextras.py"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.12.3-java-install.patch \
+		"${FILESDIR}"/${PN}-0.12.3-respect-javacflags.patch \
+		"${FILESDIR}"/${PN}-0.12.2-werror_194921.patch \
+		"${FILESDIR}"/${PN}-0.12.2-threads.patch \
+		"${FILESDIR}"/${PN}-0.12.3-{libpng14,png}.patch \
+		"${FILESDIR}"/${PN}-0.12.3-distutils.patch \
+		"${FILESDIR}"/${PN}-0.12.3-libusb-compat-usb_open.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	# tcl/tk support is disabled as per upstream request.
+	econf \
+		--includedir="${EPREFIX}"/usr/include/libpisock \
+		--disable-dependency-tracking \
+		--enable-conduits \
+		$(use_enable threads) \
+		$(use_enable usb libusb) \
+		$(use_enable debug) \
+		$(use_with png libpng) \
+		$(use_with bluetooth bluez) \
+		$(use_with readline) \
+		$(use_with perl) \
+		$(use_with java) \
+		--without-tcl \
+		$(use_with python)
+}
+
+src_compile() {
+	emake || die
+
+	if use perl; then
+		cd "${S}"/bindings/Perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+
+	if use python; then
+		cd "${S}"/bindings/Python
+		distutils_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README doc/{README*,TODO}
+
+	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
+
+	if use python; then
+		cd "${S}"/bindings/Python
+		distutils_src_install
+	fi
+}
+
+pkg_preinst() {
+	perl-module_pkg_preinst
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}