Add patch for python tests and make python_need_rebuild use-conditional. Bug #389691

Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog
index 9e37745b12a46e83233f23fb0830cbc095e78fea..b30e0ef4ac44fca73ded55e839281da87f67fef1 100644 (file)
--- a/app-misc/hivex/ChangeLog
+++ b/app-misc/hivex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/hivex
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.7 2011/11/06 07:44:20 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.8 2011/11/06 08:13:35 maksbotan Exp $
+
+  06 Nov 2011; Maxim Koltsov <maksbotan@gentoo.org> hivex-1.3.2.ebuild,
+  +files/python-test-fix-1.3.2.patch:
+  Add patch for python tests and make python_need_rebuild use-conditional. Bug
+  #389691
 
   06 Nov 2011; Maxim Koltsov <maksbotan@gentoo.org> hivex-1.3.2.ebuild:
   Fix ebuild syntax, bug #389691.

diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 8eadaaee602dc1f3263278ce1e0969d299899362..fc3a38c60322e19c1ad61fcba9d9607962e44443 100644 (file)
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,8 +1,9 @@
 AUX autoconf_fix-1.3.1.patch 3561 RMD160 05d90b32f940649dc0bb0d959f70604e1cc84bdc SHA1 bb221c20105751f031ff1d2a2555de2ef88db730 SHA256 318b92cbecf6858a57188b7c4d1c2d18ba0daea84335825286bb4860c32ffe26
 AUX autoconf_fix-1.3.2.patch 3561 RMD160 05d90b32f940649dc0bb0d959f70604e1cc84bdc SHA1 bb221c20105751f031ff1d2a2555de2ef88db730 SHA256 318b92cbecf6858a57188b7c4d1c2d18ba0daea84335825286bb4860c32ffe26
+AUX python-test-fix-1.3.2.patch 281 RMD160 5a87dc1bbda092acb5cbe5df220cb71597a421fe SHA1 56a08eb4f2cf5e09e857b398265dcd34cca58502 SHA256 9bed6a09223f6429966b9c49ffa1fa597127190fec79aee99dd514734d3cc53b
 DIST hivex-1.3.1.tar.gz 1078397 RMD160 5f42e555fae7c694421714b7e7e9909888b5b2f3 SHA1 71b54636b516f7c08767c826c2c630358f9e52de SHA256 dc18d94c88f088b9423ed429fe2fd95bab51fc66f86b6081a7c73e4093913328
 DIST hivex-1.3.2.tar.gz 1082330 RMD160 4c762ee80b5347497559af0c78d7f3962487ca2d SHA1 cdd53de1f6f17a98333b0bde8193458d409fe861 SHA256 e02d664b262f616e842d58a3787315ceb239c5986ff0652b37af9aeed483025c
 EBUILD hivex-1.3.1.ebuild 1563 RMD160 3223dad9d06820cc293092e63b4342bb18225360 SHA1 8fd26711441a63047bdbd20a3e2e8ab9faecb8b1 SHA256 c6c0e8e3e611246fc5b7dbeee1ac95042fd087faf9eace150a9afd6d5bfdc762
-EBUILD hivex-1.3.2.ebuild 1551 RMD160 560e5e8dc19a0b1b1d59c2665d43af24175cfefb SHA1 8caaf3ec8ff5772501f696caabccb051ee73eee6 SHA256 177d3d909318f1b2a42a9a9ece13a8b0bf18f5eaa14448dd29cf72ff77cc148e
-MISC ChangeLog 1519 RMD160 13a145ee83b7559a69c2f1331a0c49093c7ce979 SHA1 d27414760fc36e6064a8be8b96fa01fe6478cc53 SHA256 83f6445063ed79bb51a8035b918f955aabd76bc4df85345b7a56a01c56262fdb
+EBUILD hivex-1.3.2.ebuild 1620 RMD160 ec52e9d5d90d5ec335660b7b58042b091da1114e SHA1 4f0fe833aa9935754701589f3082ec7713b2549a SHA256 42ac10cbd96bb96e16deb4ea03654817e9972f21ddaa97b96f201f91389a71d5
+MISC ChangeLog 1719 RMD160 f04b1f7b35c2225d4de97022a849c10db66362b3 SHA1 094debeabbccdf64f833adac7d0e5ed67ca07462 SHA256 c0ff41e047e9b55cf6cc4f289c5b3b5cf3d62baf46f90b4b11506c2a6902514a
 MISC metadata.xml 327 RMD160 4d929f82166d31d5710f17e78f8c66f8fecef407 SHA1 cde31cdfff5ff2543719f2d83cf074261e06910a SHA256 ad8f529f9a202f44af4371b094874e9cd0857e8325396676a189b91e5dd544fc

diff --git a/app-misc/hivex/files/python-test-fix-1.3.2.patch b/app-misc/hivex/files/python-test-fix-1.3.2.patch
new file mode 100644 (file)
index 0000000..0b31e21
--- /dev/null
+++ b/app-misc/hivex/files/python-test-fix-1.3.2.patch
@@ -0,0 +1,11 @@
+--- python/run-python-tests.in 2011-08-11 22:40:25.000000000 +0400
++++ python/run-python-tests.in 2011-11-06 11:52:14.064248069 +0400
+@@ -19,7 +19,7 @@
+ set -e
+ shopt -s nullglob
+ 
+-for f in $(srcdir)t/*.py; do
++for f in ${srcdir}t/*.py; do
+   basename "$f"
+   @PYTHON@ "$f"
+ done

diff --git a/app-misc/hivex/hivex-1.3.2.ebuild b/app-misc/hivex/hivex-1.3.2.ebuild
index 7986d1d129a6915a69242e82d2934948b9d2fde5..a3b212b842009675b00f590f4327107c9ba418eb 100644 (file)
--- a/app-misc/hivex/hivex-1.3.2.ebuild
+++ b/app-misc/hivex/hivex-1.3.2.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/app-misc/hivex/hivex-1.3.2.ebuild,v 1.2 2011/11/06 07:44:20 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2.ebuild,v 1.3 2011/11/06 08:13:35 maksbotan Exp $
 
 EAPI=4
 
@@ -36,12 +36,15 @@ DEPEND="${RDEPEND}
                                dev-perl/Test-Pod-Coverage ) )
        ruby? ( dev-ruby/rake )
        "
-PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch)
+PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch
+"${FILESDIR}"/python-test-fix-${PV}.patch)
 DOCS=(README)
 
 pkg_config() {
-       python_set_active_version 2
-       python_need_rebuild
+       if use python; then
+               python_set_active_version 2
+               python_need_rebuild
+       fi
 }
 
 src_prepare() {