fix python/distutils eclass use, bug #207667

Package-Manager: portage-2.1.4.4

4 files changed, 64 insertions, 5 deletions

diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index 37000a7c4ed1..f832c557a9cb 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/pilot-link
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.38 2008/01/31 01:59:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.39 2008/02/24 22:03:16 eva Exp $
+
+  17 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/pilot-link-0.12.3-distutils.patch, pilot-link-0.12.3.ebuild:
+  fix python/distutils eclass use, bug #207667
 
   31 Jan 2008; Brent Baude <ranger@gentoo.org> pilot-link-0.12.3.ebuild:
   Marking pilot-link-0.12.3 ppc for bug 207634
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index b74d112caabb..025928a2758c 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pilot-link-0.11.8-java_compile_amd64.patch 579 RMD160 7dba17a59a303154acbd640e78f9028b54de0507 SHA1 6903a1624d566733c7336735b3ddbc92c8610e6f SHA256 e2e6ce08665b39c4f945eae58c2554ad9f2bdbf13c8f19cc3cbf01f8f319bf07
 AUX pilot-link-0.11.8-java_fPIC_fix.patch 580 RMD160 e6baf868f3474ee35f9de7f655c337d881e025e5 SHA1 85884951133dc58baccb3a9c0bb3e33f12b5ea73 SHA256 b6ebf250b977fa0dc33ed7c72bf9f0624a36b388cd0078159ff6c88f62c7df45
 AUX pilot-link-0.11.8-java_install_all.patch 562 RMD160 e9d7db2998f14a02ba95df1807ca43a25561492b SHA1 402be9f0e0956e6e51f42d1306bdde51e5084cb5 SHA256 c2b8dd22d337ce0411103101deccabd1d4421ae239234bd8aa410a97cf6d5a1a
@@ -14,6 +17,7 @@ AUX pilot-link-0.12.2-png.patch 2315 RMD160 4b8eccad718d85941b0ec85cac52f8fca70d
 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.3-distutils.patch 448 RMD160 aa89793bdea302d80ea8602bd8e60c5a809b5871 SHA1 ddb701d5e47614f8c1353a6eaa63fb2b7badbf75 SHA256 35b1cc89a0f88a70f5708b78656ae4730d4ddc5548aed07e0382056ade09d8e1
 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-png.patch 2166 RMD160 77fbe6b8923b37c7427d396e6b70a5fab702a1ea SHA1 05656782504d716f8bae485ef2dae3ad09f1ab15 SHA256 8f4781f1c88f374b03de28a2952eacdc0efd2d3f8d244b93b1c13cdf7293da42
@@ -23,6 +27,13 @@ DIST pilot-link-0.12.3.tar.bz2 960812 RMD160 938f367a38572d456b37e62ab0d309139b5
 EBUILD pilot-link-0.11.8-r1.ebuild 2300 RMD160 d37e39d4986f78c7a14f5473c428c3a1537832ef SHA1 b68beb86c6afc81fb8a4a2a1dc24da376b4482b2 SHA256 488353fd08d00801370fdf331c624ef24f6a8617f2f54483ed4e32a961b73dc0
 EBUILD pilot-link-0.11.8.ebuild 1867 RMD160 31cf7b8def2b60392d80771f37ba26303e70734c SHA1 45a218ced9da9a023abb312daa4db6a8e3a3c1c1 SHA256 287da11ee65fc77931322152801fc67ac0c38df5626cfb2d538620bd98fad459
 EBUILD pilot-link-0.12.2.ebuild 2632 RMD160 e203ecbd99e0207c256a9dbfcb9c3e28eb77142c SHA1 e136a177d7a2127105f51bd234bfd0e9168a4b4b SHA256 87152d234ac44bb8d0542eed0d1243c5d755ad3feb4bb5aa897ee158c595fad0
-EBUILD pilot-link-0.12.3.ebuild 2749 RMD160 d497436e4b13e0162a1ba33c9783045f61ec53a8 SHA1 58568b7e6bbd8245ad6c805373e7c085dec6f6d2 SHA256 b10195f360fcd0c25ff6e484f79008de8859daee136944f78fd0c603e2bbfbc8
-MISC ChangeLog 9705 RMD160 c994eb8573178c5373b1c6c877f2d86f94c0dbfc SHA1 8382cf13212da7edb0ce97453be1fde0f861dbb1 SHA256 291872f7d2aaee892712fdddd7ca6cb1fcb8222d0935eb785db6379e7cf7cd49
+EBUILD pilot-link-0.12.3.ebuild 3264 RMD160 a1695c5c597f68c180109298e18a82a2cb3d0130 SHA1 5bd8e1379a976083ec73d0056c5422b374fd3f81 SHA256 018a5f132fb8e92f31b2a4092b54aa7b7f431503515f8bef3e7a64691830bceb
+MISC ChangeLog 9874 RMD160 04f994bebaad4631fc465c5cc35a4deaa6e80df8 SHA1 f7be1105a257dceee63e159aa80c10e97d514ea2 SHA256 c9d9d481301456ffae41c85bda7034614d5beee85925f648aef3d2e9604c7097
 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHwemu1fmVwcYIWAYRAguZAJ4kHUu8G4dpJnh8FKFWddptHBpCtwCfWalB
+dWB7kXhhn+xc6sFNi9Mbx1I=
+=sANN
+-----END PGP SIGNATURE-----
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-distutils.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-distutils.patch
new file mode 100644
index 000000000000..db229f855278
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.3-distutils.patch
@@ -0,0 +1,19 @@
+--- bindings/Makefile.am.old	2008-02-24 22:47:19.000000000 +0100
++++ bindings/Makefile.am	2008-02-24 22:47:40.000000000 +0100
+@@ -25,16 +25,10 @@
+ 	-cd $(srcdir)/Python && $(PYTHON) setup.py clean 
+ 	-cd $(srcdir)/Python && rm -rf build
+ 
+-if WITH_PYTHON
+-PYTHON_ALL = python-build
+-PYTHON_INSTALL = python-install
+-PYTHON_CLEAN = python-clean
+-else
+ PYTHON_ALL = 
+ PYTHON_INSTALL = 
+ PYTHON_MCLEAN = 
+ PYTHON_CLEAN = 
+-endif
+ 
+ #
+ # Perl Building
diff --git a/app-pda/pilot-link/pilot-link-0.12.3.ebuild b/app-pda/pilot-link/pilot-link-0.12.3.ebuild
index 2f79c487bb37..35873cdce260 100644
--- a/app-pda/pilot-link/pilot-link-0.12.3.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 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.ebuild,v 1.7 2008/01/31 01:59:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.3.ebuild,v 1.8 2008/02/24 22:03:16 eva Exp $
 
-inherit perl-module java-pkg-opt-2 eutils autotools
+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/"
@@ -49,6 +49,10 @@ src_unpack() {
 	# 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"
 
@@ -81,6 +85,11 @@ src_compile() {
 		perl-module_src_prep
 		perl-module_src_compile
 	fi
+
+	if use python; then
+		cd "${S}/bindings/Python"
+		distutils_src_compile
+	fi
 }
 
 src_install() {
@@ -98,4 +107,20 @@ src_install() {
 		cd "${S}/bindings/Perl"
 		perl-module_src_install
 	fi
+
+	if use python; then
+		cd "${S}/bindings/Python"
+		distutils_src_install
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+	fi
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
 }