Avoid calling libpng-config when png is not installed; add prefix support; keyword ~amd64-linux/~x86-linux

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 25 insertions, 10 deletions

diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index 3eaec0b6d519..792c97c18aa3 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,11 @@
 # 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.52 2010/01/19 02:45:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.53 2010/01/23 09:35:08 abcd Exp $
+
+  23 Jan 2010; Jonathan Callen <abcd@gentoo.org>
+  pilot-link-0.12.3-r2.ebuild:
+  Avoid calling libpng-config when png is not installed; add prefix support;
+  keyword ~amd64-linux/~x86-linux
 
   19 Jan 2010; Jeroen Roovers <jer@gentoo.org> pilot-link-0.12.3-r1.ebuild:
   Stable for HPPA too.
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index df807c35323b..52e6dd4c3bb4 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-gcc43.patch 315 RMD160 10883a1fc53afeeef25a98bd8a432f22c698eb94 SHA1 e61d5305141eea75cc8664a18a1f1daa615be7f9 SHA256 8672a1ddc8ef21d3b359d0148bbb3796929329f3dccfb33877313aa629ce08c1
 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
@@ -27,7 +30,14 @@ DIST pilot-link-0.12.3.tar.bz2 960812 RMD160 938f367a38572d456b37e62ab0d309139b5
 EBUILD pilot-link-0.11.8-r1.ebuild 2352 RMD160 6cf5e7c22d9170a9a73c3cdbeb44bea821f77e1e SHA1 822b82a957cba0502db6c5b128ee61cb718e0059 SHA256 4421ac75d75d013f726c5d3e84e202cf129c1e59204ccd50fc3b45ae5f0f0acc
 EBUILD pilot-link-0.11.8.ebuild 1915 RMD160 675605c1533dbae7fa0717374f03e7660d3c8cd5 SHA1 013e6c03cf25bcdc2dd6411d251a414746219a8d SHA256 94c8849b2a388f1726c10834bfcbf62f160eaed29c044437884ac54a5f3b7638
 EBUILD pilot-link-0.12.3-r1.ebuild 3550 RMD160 eb47d2a6cf6a2b2027a3ac39f9dbcb2f823ca78e SHA1 23550810db07c8008ddec4f70340c95059c3d1c9 SHA256 ad258a75d07e55091ec079566dcf55c4c61b3976b9c0d09923269651eade74f0
-EBUILD pilot-link-0.12.3-r2.ebuild 3660 RMD160 3b4cb79f9c0f11acfd2555af7955c7093bb8299b SHA1 a13efc5b6f7a7c746014435e85d1397d295b00eb SHA256 b2b48501e404de499c3ed6d5d609a02d6316d6ee20d9e2ea79ff466557556b67
+EBUILD pilot-link-0.12.3-r2.ebuild 3681 RMD160 8b998320def648218f964a76a79b1dc5c292b7fb SHA1 ce6720954d1e996d79098f06c8d72da755cd2ba7 SHA256 c5a190f1bf2fbaf3372a4c9eaf3d13e11b06aadb592ae2cd172218aa85eed25b
 EBUILD pilot-link-0.12.3.ebuild 3488 RMD160 749c9a8c89fed3b86d675a271f2bc7e2371c491b SHA1 18d568c46ee9c5f13752d88fedbf0fe6debe95c6 SHA256 868b94f2a225b328916df04ebb8cd2fc5dfb0c95e5fa45f1e18a5114477435df
-MISC ChangeLog 12072 RMD160 5015490d78e8913463e95291d62701f111b5cb3f SHA1 d86cdf196ffb5192aa4dfd812539791ca7cba873 SHA256 d06bb4a4266847ee1cabb93fa351714da44a5481e6e9c8982b482e5dffe7e15c
+MISC ChangeLog 12265 RMD160 6bf2480600aaa0df96128c230722fe6055489dd3 SHA1 6e14a26aef0f912d20931ed7539e8d598db5033e SHA256 33bc7d32ff9c2f488a8ac1c77096cc49f3499945dfc4bad5df9392e306dfcb7f
 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktawt8ACgkQOypDUo0oQOo8cACgtMyCmXzgsuCVzTjfEI1yVrb2
+aR4AoJDw+zYmp/aoghblkIrvNMhPufZo
+=SoVO
+-----END PGP SIGNATURE-----
diff --git a/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild
index 562d48b4b813..aafbe620bd2e 100644
--- a/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-r2.ebuild,v 1.5 2009/07/01 09:42:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild,v 1.6 2010/01/23 09:35:08 abcd Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ 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"
+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"
 
@@ -65,9 +65,10 @@ src_prepare() {
 }
 
 src_configure() {
+	use prefix || EPREFIX=
 	# tcl/tk support is disabled as per upstream request.
 	econf \
-		--includedir=/usr/include/libpisock \
+		--includedir="${EPREFIX}"/usr/include/libpisock \
 		--enable-conduits \
 		--with-tcl=no \
 		--without-included-popt \
@@ -75,13 +76,12 @@ src_configure() {
 		$(use_enable threads) \
 		$(use_enable usb libusb) \
 		$(use_enable debug) \
-		$(use_with png libpng $(libpng-config --prefix)) \
+		$(use_with png libpng "${EPREFIX}"/usr) \
 		$(use_with bluetooth bluez) \
 		$(use_with readline) \
 		$(use_with perl) \
 		$(use_with java) \
-		$(use_with python) \
-		|| die "econf failed"
+		$(use_with python)
 }
 
 src_compile() {