Correct compilation against python on prefix

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

4 files changed, 15 insertions, 11 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index b49a0076442c..644ada2c68d7 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.50 2011/01/13 20:16:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.51 2011/01/17 12:46:51 jlec Exp $
+
+  17 Jan 2011; Justin Lecher <jlec@gentoo.org> ccpn-2.1.5_p110105.ebuild,
+  ccpn-2.1.5_p110113.ebuild:
+  Correct compilation against python on prefix
 
 *ccpn-2.1.5_p110113 (13 Jan 2011)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 62ce9c8e603a..27bbfcd86aa2 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -19,14 +19,14 @@ DIST ccpn-update-100806.patch.bz2 187965 RMD160 3297162fe3314aa405ee58737ce45cda
 DIST ccpn-update-110105.patch.bz2 47734 RMD160 0628b1bf5b5e7479abc587efb7a359e91c265b35 SHA1 b9271bb09fc676420b0c517a2a4e13d89ca0d02a SHA256 f107d9ccf6b699a63a95e5cf72950d9e23dcb8bcde17f64246f73694594912fa
 DIST ccpn-update-110113.patch.bz2 53812 RMD160 3d515870a7307de06a292a70adb88e1644ae92b0 SHA1 df05b65192d9e955e059139a12a80e8c32712561 SHA256 e4a87b0404cca92a633f649e81bd473e6d4362740bc8096bf15619a203fee48b
 EBUILD ccpn-2.1.3.1_p100806.ebuild 5190 RMD160 c1dd4e2443ab5cf8386627a9feba25be6e61b715 SHA1 0d9700191a04c6ed5f106e2712b010d499315827 SHA256 ed26ef362193f91d4726fd49a1c4b19c1f975c3847b0616ada2e64ce7a90ffa5
-EBUILD ccpn-2.1.5_p110105.ebuild 5753 RMD160 01bd53830ab36e5665508c31aa4e87b2c7f48f24 SHA1 e8dd3780ba22c4cfe16b5e533f91b16c32a4c73c SHA256 53212dbc19de5e3b03654c1498350dfe6ea6a11a20f379f2fe3aa97cf66e6a22
-EBUILD ccpn-2.1.5_p110113.ebuild 5753 RMD160 b565ba9b7259c8f531bd4643b7a051497a808def SHA1 889e006503849764c0b3044d8190ff41d813645a SHA256 780d36c243c40ea7b31b09bc828a803b103ecbca24ad01cce02588936df7b886
-MISC ChangeLog 8583 RMD160 15a3f9e8fe5dcd071f3c6758703877017ed0140f SHA1 70707cb4952c1a5954b797fdbad8da5d76f605c7 SHA256 c525aeb2a90ba5676a6fc37a2707817ef73161fc7e91eb0b473915ea8bae38c4
+EBUILD ccpn-2.1.5_p110105.ebuild 5764 RMD160 b22d590aaf7d11855d6229b9ff4c52759d5c5c67 SHA1 2cf7697157d9b2dd0d78421b4fde258454939824 SHA256 fdd4c9650e6f083de59a7285c6de5420abd02598194c8beb2c70e4ec20c34c36
+EBUILD ccpn-2.1.5_p110113.ebuild 5764 RMD160 6d62377609aca81ef5dd3af20902976a75aa0446 SHA1 9a8dc3975a0a822e9e7971dee0a1f692d140800e SHA256 32a0bdff0b2f71375ff4553170a4638d42d9b1aca6889b3b7c7cedcef3922e83
+MISC ChangeLog 8734 RMD160 6c1a98e4cebdf64dfa0cb26329ff1a23c4134ba3 SHA1 4f4d90442c01dd935297d69bb04b147027ba8be6 SHA256 5de65b0858e646b71a61a1ff96c94221258ba949f124d95aebd2223745b87fde
 MISC metadata.xml 317 RMD160 6e56ad407f163d80504468f6fedcfb35fc31db00 SHA1 30b72b0612b1f91712537d24e3a2407eec50e1dd SHA256 1fb093ab05124dcd078fc93a4aa6f787f5829066e100ed98da8ecf65cece63fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0vXYwACgkQgAnW8HDreRbuCgCgkLUoOhbQRPSpvJw093KpNLYN
-3LkAoKZeGUTM515N6Wfa6TyX/s6Ajr59
-=5Fpi
+iEYEARECAAYFAk00OkUACgkQgAnW8HDreRaVLQCdHVkRPwIPR533gL6inoqLFdGo
+olIAmwR2d17T4+uiKqrCZ/nzcIii01vo
+=eFVX
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110105.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110105.ebuild
index aaeb54348ec0..fd1b7a425796 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110105.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p110105.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110105.ebuild,v 1.1 2011/01/05 19:02:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110105.ebuild,v 1.2 2011/01/17 12:46:51 jlec Exp $
 
 EAPI="3"
 
@@ -96,7 +96,7 @@ src_prepare() {
 		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
 		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
 		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I$(python_get_includedir):g" \
+		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
 		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
 		c/environment_default.txt > c/environment.txt
 }
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110113.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110113.ebuild
index fb93cfbb133d..5104ba678e62 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110113.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p110113.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110113.ebuild,v 1.1 2011/01/13 20:16:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110113.ebuild,v 1.2 2011/01/17 12:46:51 jlec Exp $
 
 EAPI="3"
 
@@ -96,7 +96,7 @@ src_prepare() {
 		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
 		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
 		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I$(python_get_includedir):g" \
+		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
 		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
 		c/environment_default.txt > c/environment.txt
 }