Fix bug #485452 - Use proper python version during package build

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

5 files changed, 28 insertions, 21 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index 8c0bd10b7a5e..7756119483ad 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-forensics/openscap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.26 2013/12/23 19:59:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.27 2013/12/26 16:52:27 swift Exp $
+
+  26 Dec 2013; Sven Vermeulen <swift@gentoo.org> openscap-0.9.12.ebuild,
+  openscap-1.0.1.ebuild, openscap-9999.ebuild:
+  Fix bug #485452 - Use proper python in build
 
   23 Dec 2013; Sven Vermeulen <swift@gentoo.org> -openscap-0.9.4.1.ebuild,
   +openscap-1.0.1.ebuild, openscap-9999.ebuild, metadata.xml:
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index a6e0f0806803..f934f52dbdb2 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -4,26 +4,26 @@ Hash: SHA256
 DIST openscap-0.9.12.tar.gz 12777461 SHA256 8af595087fcf8b6a5076e3755b7a838fcaca899b398537c44c0fe3ff20d90cc8 SHA512 e4a2944a5f4b7adb3df98cfa575f3befbf7418b8ba8e4648016b00026ea9a811cb189f50453f6ac99e3d5e0b5993598b019c33d1c363477a5b1d80349ddf6e7b WHIRLPOOL d86cc85d7b03f6ba1245015310fb6d2a4bc7abf14c7475e3dea1f07333b3c6e71654e89ac25ad80d205b70b8bb7034608e2ab2279ea020ee8dc4f94f897315d3
 DIST openscap-0.9.8.tar.gz 12688640 SHA256 977fd8a0196c3dce727b9b166777385565a7c5001ca4ef20bb024d12dcb53af2 SHA512 35a221cde33d3295a0dfb59422aa276a6d307621d45920fa70d6ad056ab84ad94953f060b22c6e0dc0738e2e0694ec66f514c36b8cb178ffd5ca3639ffd8ab94 WHIRLPOOL ec952d10dab5cada7f01cf82224be7858c730a66545c05ad7148c20e2e62f6ac8d5aaaeac67d67038df8a6ab3a0290e1e9c76ee53748e485de0bbd41b5c281fc
 DIST openscap-1.0.1.tar.gz 13166679 SHA256 17fe190e35c68aaaaf0890daaed07ab65521c6879217ae30cfc68a66b743f0bb SHA512 ac497e5bcf06ef570ee2b3e022310797a9ac16585115cd09bdf81777bad9ef09f4536970c1f00bc9b93c227ecd95403c81c06886adab0155aabac07a65e9c7ea WHIRLPOOL a9913141d9ae67173e5a992396cb029a69b67abfc3ea30adbefa89e67d97257c11d131333ad46449f1d95660e6c6d41224328239c15ccb47b76cac634ca10f8b
-EBUILD openscap-0.9.12.ebuild 4108 SHA256 02aab6d619a8190950b338d0f4e2ce53e3fe0580ebe43e0b1fc453da2a5863fc SHA512 91ab1d9332bf7214ffaaa2f02f3fb5731e4576ff37f52caa1fbf6224ab68bd26c9cc2319757d1a7c21c792da35e2bdf1aa00a50d5b37e4423d17fb11557a630b WHIRLPOOL 45f00812938fe636dc8dead415160197a8b99b2a41efc31e1eb9985070e28b9962b7b33f1e313d46d3edb87c24bc56d925ff2571355a9b78b4d26c9b9a930b06
+EBUILD openscap-0.9.12.ebuild 4119 SHA256 ca8eaf81462b97bbd554bd83d4d0c9b77691d576f51ad3adc39013185dd81b78 SHA512 d20774af54f6ea20e215f7eb52da5fce2e8b5e1e70113d29cd9076c6819420a23cd99a155d173c3c4900faa134270832cb4c7c3bbc970016034782748480ecc6 WHIRLPOOL 6a2abb2e04d215c7e2ef006bbb0e9fc394e367bb04171b04484f415669670990334b28ba65a57c17db70e687e576ceaf6394bfafaf69569ac63b926bdf28ee6d
 EBUILD openscap-0.9.8.ebuild 3920 SHA256 7f4acec7bfd7c474d88b968101559bfcdd482a21dd53e2b51598eea095214081 SHA512 c86bf47e61efa822b7c411f0c6db6ddc6cbeef64dca1dd1bb6939f83da6a006689b6ff2dee1da95491da1bb3496c5a6dc573d1490aa9513afb93ebe907b6e1f7 WHIRLPOOL 8ddf3e5169c185753296a6f009bd56d99405326e07e6da6b3069bc3f657833b61c2567e7c28a4eeb1115b983d3c3eedc33228f7c06972781cf49e0e9e8bbacf4
-EBUILD openscap-1.0.1.ebuild 4434 SHA256 853689f02930b551b627d855c436bfd391c21e6cde4f50399992f22b13b17130 SHA512 adc0121706ee8ef04fc419ce5698a90814e76f526d48e75a48feaffe905537ce6c6cd36a4dc8bd129dd0796370bd8fb0f9c1748175036bcce8451226a66b29c0 WHIRLPOOL 158c6d7080dec171054f47dccc8fac6731c564320386db7661dc6f17606e22348cc89e3395ad9ec49de0bb059fec47c5d05a0b279f3a358a48525a4b7c4c32e6
-EBUILD openscap-9999.ebuild 4843 SHA256 986a7d8457ce88d6005ccb92ee224e610730d6bc06597966eb8ed0a365b1b3e9 SHA512 66c01145465ce5aaf5c45231e1cecc64e0bca8c579a2014021d73e57f02e64403c2834de07f7a1aa4d1860e6cf8ba7408b2e3d39b933b837a59e69b3b591ba53 WHIRLPOOL f12c51fe0d69c7a500aa6d5931d02f99cbfb2a8545494b81796ce74d7fd1f02d71910433b864efb8e0f4503fd343ebc1309676f0375841ed2b1fca0c57451236
-MISC ChangeLog 5208 SHA256 859ebe713f736d2e079e5dc5339b6be627aca4498fa65fc8107040923864620b SHA512 8c458aa23f66595981eaf8eae8262f1462d5b6b22bcabbad133ed9f67501014eb6df95b09c3fb484baa42aa14cf82dab97dcfde3b981caa2a3a2c50d5de44cfe WHIRLPOOL 9f1c46085a723eb025ad0378a85a81562a4097b07ff8b24cb2f285d102e6af55252b620f5015aa1b7226cd9fd969079006ea095eb96e5ff9942bd64cd12a292d
+EBUILD openscap-1.0.1.ebuild 4448 SHA256 ae2f581daa7248d19559589d321c693720bfc26b74b495dd1a922e12a7fa8f64 SHA512 5dc2e9e4e8b86eeccd8ae8d12aacea3a53e02bd3fd716c6800b6ff4ff8e458ccf7e99677bf1bf7a53e03853a6e29c57be6c30fa6c2e7ba32085618bdd41a47fd WHIRLPOOL dc5df62165fab981a395e1eac9058581caac4297a7cb9e430a7be1408f4bcc4868a71776024fa5280d8cc4c9953a40add5b27c1ba130dd6251567beb8dbef3ac
+EBUILD openscap-9999.ebuild 4857 SHA256 4549746754aa0c492bc416bc1c5f8a2c0805844bd1a3a0609e88df66371f2f96 SHA512 d68d94f620bdcfadbde02217db7c912fa1602f111d12fde1082e9900c5ae84249724e03772eeca066c7633a967a2c241ed3bcad5a9cff0cd9492bb1415b3c4df WHIRLPOOL 283de9d4aa8313017dd519e1cc2b7b4ae9716ec2cc171c6cc43294c6da6018075f85024afa73a8676bae49d85a16db9e1f07c21248a367cbb88ec036f1e239e5
+MISC ChangeLog 5376 SHA256 34b4072453a952f90c56be26b18f64eb859d9ceddbc4db2adab063066a3c21f4 SHA512 39303173574f01495424d0947dfc2c2c3ddd8ac8539aa539f51b3a2ad5f95dc63e586b95d37c4018a78a2b69c9d82005b795d076a5b7445e189656504dd2e2f3 WHIRLPOOL 1111e3de663a14fdde4efdab1192b19f0fe161bbc1f96a74da05ba0cd9a590820ca9f59d8d0a6349ebc164dc237bee048cc4fcc5ebb2792d3ee2f0e9b7a3d08a
 MISC metadata.xml 679 SHA256 8db139f8e51200a7422a764af7fee8bf530d69262af1e0de9ed30512f9492cb7 SHA512 2c7c81d31042b64673a01dae7e4a24df139f3bc066ecb7af73b91a60d22f8d8ee9f448bf31ec9d1ac26a41bc66e467855a61fe56e35fe7c7e06bd89fbb83b971 WHIRLPOOL c8a2efbe37a7d02161f49b29dc3b4bc823887d31cffe0d54baeb5b10cdc882bb0b3a03d45d286ed8176e96d63cd8f1022671833bb6abbb55dccb9009098a9392
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuJWsAAoJEC7dUkA7aK9HDSIP/3znzUUhBHlPRrvAXrE13lpd
-skZdVyY1OucHGTF5I/aCDtrv12BDNMb92rVr+ue//Zrqelr4WjHeLkJOffphXahI
-fVN7nergKvOfsMIpI5YMiOYh/CByegXmzhTa0gcHEXXoUz5aCb0utNG7gghU9iXT
-cuc9FyKcWCbJQHAIFXrx2m+dGxP+irY7qbY6PxmoEwn2Jj2YH1S2u5G2T3AyXzID
-IEw6l3xC7otfMOsAMw3rH2v1NJ8n3kseFM4sV8iEJMZt4gT3GvILhWem4ri4MwWe
-BhpczQZYs1dm1VwnjqetPpP/MJKUCR5nuy77oI8WRxI2UXJ7BiBDnj2DTSioiO4U
-U1cooAoeUKZC4J6g8/kSQv0w0qi7WTXCDStV6ObMcW6OkboCXGWvFzIEIsnpC4mQ
-V3sIcAf+jt7k5WcZZ1GNYyfvHaVkWv371kZckWAfSWiuBkjoaa083RtLa6daRDOE
-QVARQYxMnPr9cfDEd+usx9RkiGDZoz9VrvzD0acRqdTnvBg9fNRyWBLBNYYde4s8
-Rs6AaFRAzfPWbfZniRkfP+Io9ZuBLpgqK0SC/oeZzGx5fcfBoIjAQnAIovKynd9S
-8JSm/mrLlf4Lz8tdmdEeJ4JbP6gotrMPW9Db03mGRMePUvXPOUgl5CsVSF+Ms4SC
-dE/We0ezM2koP8Dqao6B
-=JyZP
+iQIcBAEBCAAGBQJSvF5mAAoJEC7dUkA7aK9HA6QQAKHoxRS1mCzP5BL91GsYto91
+pEbgKsMDDbjpY8vaoLMKwMsExQYGm9TB4tsuVXPxB1po7cfod7w6rnzMRZ5sdz9b
+YmzKil5fRJXA+lN19tOFSYsZQbI6t4SBd3GPdITArZDxqpxumnJzvTjJSve5UwHQ
+RdQl54+4AXKv6vkIvwtdjaYcxBFDETvFBfcFSmQHm8TAqj2MwotpZDd6+QxfX3Je
+OYJrH+vqxPcacLE6ocWePZN6F+0Dp9SFTJWhoF8kSPCEyi6dUPTTD0weMfXtBryl
+6IfgTpoJ9ou/bP3dJwVcrvYAgzcyLa7/Lp7OfCJvPoUnjEEE+eYdERhenjtQvMSr
+YP5b3uq/syNf0m2nQc9MJLNHOskqaCh+9+1cjHXUJFiKXoCSAzP4A8KLVY0qr4e9
+wWyGqzy+Ty3lUxrO5TKxLA3uHJbqLAo13hdoFyz7MQYp4MntaQAT9fQCQmfNe8qk
+RcIcsx/52ReurWqnuneP2rtx+nEfWzaGA29oDUu4JGdAmJ20odAogX2uXi7dQoCF
+rZ3ZAbolH4l8X/y+XXr4y3KAe5ROL6xJcfwGPoANuUmNrkXrKbKuKjVrW1P37iVe
+DaYLPhKlqZU3NoZUZLy48BfoScfg6IsOwWa6tGD8+PBtwVQrFdgK48046wJQGY6Q
+grXUlcSznkLiJnucetZo
+=Nd1k
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/openscap/openscap-0.9.12.ebuild b/app-forensics/openscap/openscap-0.9.12.ebuild
index 034664c48fda..180cdbff97c9 100644
--- a/app-forensics/openscap/openscap-0.9.12.ebuild
+++ b/app-forensics/openscap/openscap-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.12.ebuild,v 1.1 2013/09/19 15:31:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.12.ebuild,v 1.2 2013/12/26 16:52:27 swift Exp $
 
 EAPI=5
 
@@ -86,6 +86,7 @@ src_prepare() {
 }
 
 src_configure() {
+	python_setup
 	local myconf
 	if use python ; then
 		myconf+=" --enable-python"
diff --git a/app-forensics/openscap/openscap-1.0.1.ebuild b/app-forensics/openscap/openscap-1.0.1.ebuild
index 7d5ef44c1a38..12f50d56d262 100644
--- a/app-forensics/openscap/openscap-1.0.1.ebuild
+++ b/app-forensics/openscap/openscap-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-1.0.1.ebuild,v 1.1 2013/12/23 19:59:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-1.0.1.ebuild,v 1.2 2013/12/26 16:52:27 swift Exp $
 
 EAPI=5
 
@@ -92,6 +92,7 @@ src_prepare() {
 }
 
 src_configure() {
+	python_setup
 	local myconf
 	if use debug ; then
 		myconf+=" --enable-debug"
diff --git a/app-forensics/openscap/openscap-9999.ebuild b/app-forensics/openscap/openscap-9999.ebuild
index 72c3b1cd7f3f..bcbb6a872d90 100644
--- a/app-forensics/openscap/openscap-9999.ebuild
+++ b/app-forensics/openscap/openscap-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-9999.ebuild,v 1.2 2013/12/23 19:59:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-9999.ebuild,v 1.3 2013/12/26 16:52:27 swift Exp $
 
 EAPI=5
 
@@ -113,6 +113,7 @@ src_prepare() {
 }
 
 src_configure() {
+	python_setup
 	local myconf
 	if use debug ; then
 		myconf+=" --enable-debug"