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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 139 insertions, 150 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/Manifest b/app-pda/pilot-link/Manifest
index 982100ef11d8..c17da55d9661 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -14,19 +14,20 @@ AUX pilot-link-0.12.2-m4.patch 249 RMD160 4ccd77fc9ab445e459a45bc542f9b06a88e4ae
 AUX pilot-link-0.12.2-png.patch 2315 RMD160 4b8eccad718d85941b0ec85cac52f8fca70d351b SHA1 6fe7a4b498b7dcdd24e2f0e87e9f0febf24d098c SHA256 603170b9c4fee59bc380c8ea5923bae3621562976ce74345b1eb80ec7d7aeea7
 AUX pilot-link-0.12.2-readline.patch 1833 RMD160 f611873187e425064e1a26ce213e53a4ee194e5b SHA1 cf4094d418d3e4114156b0b73d13fafc56c2d551 SHA256 54e01146ed97e5c020454fae5bb8284f3127eaf10d7deb79b638880fddf28478
 AUX pilot-link-0.12.2-threads.patch 711 RMD160 ec02e4300777b100ab51af6605028dee4b709db7 SHA1 3649f4955f18b2cf7e29651e3cb9140048601794 SHA256 985b15bdd25ee3a167048be62ddd43fe1d74482d6cb7802ffe04454d967ae293
-AUX pilot-link-0.12.2-werror_194921.patch 810 RMD160 4268bebfc8a40c45ed70d571cbfb220abbb8bc9b SHA1 e0a8dfe2abbd6749e6774dff246ea2a8011aff89 SHA256 7e5e472e0c62fcaf5fe883928bd83402c848ac81ac50e61a571e6f64e7f21503
+AUX pilot-link-0.12.2-werror_194921.patch 650 RMD160 6e84faaed978d767feaa06c19d1175ae66877b82 SHA1 300af74de9e24f7fa2e5be756965db15a417af13 SHA256 fcc9e92083f6620d8ef70e419b3d6236eca1b85b5a592faef361706062d6fac0
 AUX pilot-link-0.12.3-distutils.patch 448 RMD160 aa89793bdea302d80ea8602bd8e60c5a809b5871 SHA1 ddb701d5e47614f8c1353a6eaa63fb2b7badbf75 SHA256 35b1cc89a0f88a70f5708b78656ae4730d4ddc5548aed07e0382056ade09d8e1
 AUX pilot-link-0.12.3-glibc-open.patch 603 RMD160 dfbff4fe19f702f88f66e10be0c75dfbb16ad3f4 SHA1 aa7b1282f6497a1016c99420a3f6b0a035087da4 SHA256 f413b77319dde9e8a75d705317b3f0f656c5c0dc0f5c2439c066028960b095c4
 AUX pilot-link-0.12.3-int_types.patch 547 RMD160 28381f51c8d200fc65bcc9382cf06e7b1277991c SHA1 85385f31dab548e5d4549f0ee7983bdf3bc75f50 SHA256 903efdb98552f44ac0006f58b11631111b8634e1084d3122f15131af8b4c09bf
-AUX pilot-link-0.12.3-java-install.patch 823 RMD160 e6999723dd9a71f95f56d704ba6a1f4f1de2e77c SHA1 4bb887091f18c44b3b344d309d673ef56f4096dd SHA256 60f6c9cd3a03adcef22e598f6d497f3095c1e702ac1d4fcac91e84affbc2fe8f
+AUX pilot-link-0.12.3-java-install.patch 644 RMD160 9857b4ddbe8af4c515ed801727a7fb7ec59cb15f SHA1 f5479329af9d33134a91377ccfdc900e975c8161 SHA256 2db616976442b702b2cd3637e410084e112c8952bc5da06915f58252d0cef39e
 AUX pilot-link-0.12.3-libpng14.patch 2316 RMD160 2616da76adf2b2a5132b7ce898ad72825efd9fa8 SHA1 da6cc70e99b9cff1d021bb5d299c677d71a63ee0 SHA256 8a92aeb401c32c3e7c6eb4cd96c735bddc7ae38e2f06280f3b62e0405b133d1a
 AUX pilot-link-0.12.3-libusb-compat-usb_open.patch 715 RMD160 7932c65dfa046d9ebc10f08f8b87c04d55bb2685 SHA1 b0fce59c2b2c7f7eab6855854562aec554680780 SHA256 e60ce64f1501692b3397b7f1e83a8b6f2927fc68e8f74d52f2cc726003f879c5
 AUX pilot-link-0.12.3-png.patch 2166 RMD160 77fbe6b8923b37c7427d396e6b70a5fab702a1ea SHA1 05656782504d716f8bae485ef2dae3ad09f1ab15 SHA256 8f4781f1c88f374b03de28a2952eacdc0efd2d3f8d244b93b1c13cdf7293da42
-AUX pilot-link-0.12.3-respect-javacflags.patch 589 RMD160 7d6f01c53d4741ac914cc1faf99d91e69c49d1ac SHA1 33f91b8333e9525ca67eb6e95ba91f64528affc6 SHA256 6b21cbbb2bde72ca176b0c97531a67fdecb200d7fd35d9eb5c7a67eb731f2386
+AUX pilot-link-0.12.3-respect-javacflags.patch 398 RMD160 a01572601491221b986832f7334d483a13cddd98 SHA1 ddb5b66d36c2a54d906d9bf4bdb6811d241b4b06 SHA256 0760edd9a77bf98bb4155542cec41bff8f130e3b63d11805c4323ff8f13ef464
 DIST pilot-link-0.11.8.tar.bz2 649034 RMD160 c51c069810edff6c2e38e4c81f2daa959c902ad4 SHA1 645d4bc49dd4dc4793d13b6e04dd61f24c2bf717 SHA256 952a97df5d13d926f0d5ce487e15268b1400fa0e7c43ea9303fba92818cce1cb
 DIST pilot-link-0.12.3.tar.bz2 960812 RMD160 938f367a38572d456b37e62ab0d309139b50403b SHA1 d459ec2626ee19367a5329e604e33b337ef37602 SHA256 f5ed3f1d70349ff5ef95e6d1aa5b2ea9ad4b4d720e7d83cacc1003a950d4c476
+DIST pilot-link-0.12.5.tar.bz2 1578735 RMD160 806c87b9849d37fc5f88b453fb0842504be71a76 SHA1 b822466333ba58bbb32d7cfe5c547f4e7a78bdee SHA256 d3f99ec04016b38995fb370265200254710318105c792c017d3aaccfb97a84b2
 EBUILD pilot-link-0.11.8-r1.ebuild 2352 RMD160 6cf5e7c22d9170a9a73c3cdbeb44bea821f77e1e SHA1 822b82a957cba0502db6c5b128ee61cb718e0059 SHA256 4421ac75d75d013f726c5d3e84e202cf129c1e59204ccd50fc3b45ae5f0f0acc
-EBUILD pilot-link-0.12.3-r1.ebuild 3487 RMD160 41a81edba9f4bbafb3fa5eb899ba17ff49a947be SHA1 ff7070da646560d06483233d4fbb57ca1f1ae563 SHA256 25a8e3296097735f99402b358272a366886d300f985bd3810baa550d6f562eb0
 EBUILD pilot-link-0.12.3-r2.ebuild 3646 RMD160 1c96900bd2e6aececc36bef74cbb4e1f4c7afddb SHA1 013ce9e6f948efbd04e98f8110749410982d9572 SHA256 86cfe77e89915e6bf40ddb73a89310e8c349d0b658d59e74826a60018cd1aa14
-MISC ChangeLog 13421 RMD160 c5fc2a56c9257b03a6006e881d87283f7cbc5714 SHA1 f651091d56574e1835d00590aca66b623cd7c0fb SHA256 d8a4f02eb600858bbefbfdb04e1be984684237ccb28ec8e7df4874ed90b836e2
+EBUILD pilot-link-0.12.5.ebuild 2774 RMD160 d90144a9d0fcba493ab29ecf19132ed42b33aae0 SHA1 58b4e76a2fec2bc7eacb726bfd7ff0a6dabd42f4 SHA256 b255d162417dfd4690619d62e8b2c0a0bafc2695ca8f71ab8f5b34bc5f09081b
+MISC ChangeLog 13618 RMD160 d8c0093242f3cb384b517655c5429eb14735570d SHA1 af7ed57f9bc651c35365206d138823354be1fc6e SHA256 104f84ab8286ce12d758fc740941db04caf49492191db75b63bf14c7e490034d
 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
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
+}