Fix various ebuild errors. Thanks to Arfrever for reporting

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

4 files changed, 28 insertions, 24 deletions

diff --git a/dev-python/pep8/ChangeLog b/dev-python/pep8/ChangeLog
index 22ba6aa77c1f..ffced2110c05 100644
--- a/dev-python/pep8/ChangeLog
+++ b/dev-python/pep8/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pep8
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/ChangeLog,v 1.6 2012/05/29 18:33:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/ChangeLog,v 1.7 2012/06/02 15:24:35 xarthisius Exp $
+
+  02 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org> pep8-1.0.1.ebuild,
+  pep8-1.1.ebuild:
+  Fix various ebuild errors. Thanks to Arfrever for reporting
 
 *pep8-1.1 (29 May 2012)
 
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index d67c342f95aa..9aa99988b563 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -5,24 +5,24 @@ DIST pep8-0.6.1.tar.gz 21499 RMD160 9234bd7776ef09cc06c6f33350f1752d49ec2135 SHA
 DIST pep8-1.0.1.tar.gz 25832 RMD160 789ceed5cd0241dc5661a6e7b3b0f2a656183547 SHA1 55bd3874555751057f65ebf70226b18ec1017b43 SHA256 67ce5e323d3366cd76b41e794ccc5fa580ed83267332f8c06c36ffe6ad20185d
 DIST pep8-1.1.tar.gz 22115 RMD160 f3ed7d287debfef0d30cc0e9f91a110e0caca4ac SHA1 28ff0c5740e6256ce7540b85eed6107a379dbfb6 SHA256 c6235cfba9f1f98650d80145e52cd2ac5e2d16ff9b17fa08e8af5d33f63b5879
 EBUILD pep8-0.6.1.ebuild 701 RMD160 6fcf2ddb73747ca1fc0318ffb2fd78544e46fcd6 SHA1 a292d96e7c7907568212d9764e666900f3450eaf SHA256 fec61798b27f615089844342abcaeef53858136138eb60a84d65f2bfbf77a509
-EBUILD pep8-1.0.1.ebuild 769 RMD160 44833edf106c4eb2384ee8298009fd9d221ba81d SHA1 936e2f003e39dfa4f2e69771338362a92216cf1a SHA256 27b9daec2c0782580ed27f42b0d6237aed30676ba838ad126f63958641ffef6d
-EBUILD pep8-1.1.ebuild 925 RMD160 0e5f95423216e94097bf225612b7e052fa52ba14 SHA1 6964a32d5422c64e656146ba89eeb5a2d67d8fee SHA256 de0452c237c8ea7952b71feb7d30dc744bc6ce3a51aa27cfb68c2f842fc780c5
-MISC ChangeLog 1065 RMD160 23332e25e3ca2a5f9c56f6458462e01dd384867b SHA1 ec0e76c3f4e0be99df162f0b9af8a85e9ea8dd0a SHA256 63e1a413a5bd688aae15a1682ad11091abf214983771f60d0a1eccf46e73cd50
+EBUILD pep8-1.0.1.ebuild 772 RMD160 a9d674e6d0f51b2d8473776623f54425f81b679a SHA1 ae8c3676bff14a479fac6997c6a119ed03678ed9 SHA256 e78ee582c971a17cd23484b952090c0941c417b33405240dc8d4c0e267e4b675
+EBUILD pep8-1.1.ebuild 921 RMD160 14fb4ed0541b096b3f60a5c5274d7b4152c1b1e1 SHA1 8872cf8b68d842c263f8bf55657787f23209145a SHA256 61f3fc5369194fc4976739f050e7f8cb64f0c429ece7b4a396c56f9aecabfdb6
+MISC ChangeLog 1220 RMD160 6d1a0d67bae29568885503e5deaa7f656a9f5d48 SHA1 2036f8f1fa2ab2f9295f7cd02d635a8d495fe093 SHA256 65e093f3abcbed185c8889cf26b8652bd58e9b5e610e28445a2a5a7bcb3a631b
 MISC metadata.xml 227 RMD160 6a22823fed2a4be8955a8b1da4319057f9f61534 SHA1 858d0f5bcfdf0914183d6dfbd633a7563c77b0d6 SHA256 cb9606d106937025e91f5f934ecb96cedbbfd3b1a350baab206fa99ce068e842
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPxRZvAAoJEF0huFKJUZL5yHAP/3l1BhwxlxkOKpJuJ4Bbxk7h
-timRtZ+r64gwvVeW2WRWLKPW5jxCSUXUTvOXU98A964ECEjVff5wgT4DbhvXc2RV
-KaCWlUkBRv4OcZZJqKdH85q3KgNmy97nE9fC4Gg4b4sh6OHz7cscBIRvPK6eXLUX
-/0b3yfUCDjS6Vs9rutAIRN59+lIw+OYe/d+qhfh4GETLlFwJgoTo58GtKHPQJ6Xv
-hOCS8ztLy4tTbqxx/ud5ABOttOCt0FiOli8HLNnt1t6rAfYezfsz7wLCgwGYkl7a
-cleJU2sQnMwdT8r3htYwEiyoD03yU1ryUKSB8/73RczbIy3loob3vmLdH0mDk79z
-dnv8HqOM79kvROXhrRKvvts1UhOHWBq/NsxTX3goZfySpkW+goM0TXJbxswssE2V
-7hPkwrzcTf4AlrlmxQnW9AJYwYRj+nRU2p84QVXpYMQ6vGRgk0y8oQw84pZXxdsT
-oU0o5Qoq0i+RRycKK13C4CfJy6wkYMG8oy2WscmNoKRLqWQzJQX0HbC0JlMQ0NKT
-IioYHYdg27yB8D11/uuofmng9tbr1SXz0y168LrWFWPWoPEMlBYIdRs/gyPM72wu
-MUXjl3sYdnSItFgt/T7Ot1NbPh0JJ63+iRuO3FzOhgtbpzErzMmlptUECCV/0097
-IcGHvka60R5+XzB2+tBT
-=8iii
+iQIcBAEBCAAGBQJPyjA8AAoJEF0huFKJUZL5MAYP/2eskY8u6cSsnxNx+eRhROxu
+JSG+hGbMe5/M4d7LUVunteVVxs5SdLsgjKyYGkvAn/DeBjke5LDPjEj/BfuuGiNz
+hWOM9+re7qnG+D4RyE3EGUnzaprk9fszU8ErG12Fde2NumC2uOGqUqeqiQX1YUYy
+8/QJFwocrORqMwyBa5bpkIep33/rLXQPArLf6+wRJPr7FzUnXrB68/5unYkTNrmH
+ihU+WJLo2xbpSJDid37qVUmvpQqRLcr7wWrMp0UXVkWorZ9GNWxKW4X446aJfWm/
+TnKLrepMYXMUwsiHR9H1LAyhtRsJMm0wuXZzcntt8ICAFRn9oYyFL5ekkCYzu18Y
+/oTH8D0IVUlhZPeDXvWtpkbd/ps0EDE3ZC87rEd8nzbv7E5qGi11tiGFKencCnSp
+7/pCpyKBhirmXmmvQK4aSKgw61LdOZxCGcEZm30l7bflcAouwjBhPDHlCiYWDYJn
+7Kqy+O36RZedKxm+8P4ct8shs86ysI/0Q52OZjRqmeNhEU80gvk1Jwdm7xPVyLvz
+ylr/R7fdYtucOi0M34nJ7wo9kGyQdrtCLz+551znXqqc4jVQkB7dufncFVUG8yrl
+LMhiG41rw+RM5+fAajjnNWWcFH7Ghh//w3ntVtDLce0y2wL/B3jQCcZ4rImJM9Jj
+tvHMpk3AGKVeovOyTbxh
+=4YI+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pep8/pep8-1.0.1.ebuild b/dev-python/pep8/pep8-1.0.1.ebuild
index f34fe6961394..45fc6af54bc5 100644
--- a/dev-python/pep8/pep8-1.0.1.ebuild
+++ b/dev-python/pep8/pep8-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.0.1.ebuild,v 1.3 2012/05/29 15:16:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.0.1.ebuild,v 1.4 2012/06/02 15:24:35 xarthisius Exp $
 
 EAPI=3
 
@@ -21,12 +21,12 @@ IUSE=""
 DEPEND="dev-python/setuptools"
 RDEPEND="${DEPEND}"
 
-PYTHON_MODNAME="${PN}.py"
+PYTHON_MODNAME=${PN}.py
 
 src_test() {
 
 	test_func() {
-		PYTHONPATH=${S} ${PYTHON} ${S}/${PYTHON_MODNAME} -v --testsuite=testsuite
+		PYTHONPATH="${S}" "$(PYTHON)" ${PYTHON_MODNAME} -v --testsuite=testsuite
 	}
 
 	python_execute_function test_func
diff --git a/dev-python/pep8/pep8-1.1.ebuild b/dev-python/pep8/pep8-1.1.ebuild
index f53dd28e6cd7..7977758bd602 100644
--- a/dev-python/pep8/pep8-1.1.ebuild
+++ b/dev-python/pep8/pep8-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.1.ebuild,v 1.1 2012/05/29 18:33:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.1.ebuild,v 1.2 2012/06/02 15:24:35 xarthisius Exp $
 
 EAPI=4
 
@@ -25,9 +25,9 @@ DOCS="CHANGES.txt"
 
 src_test() {
 	test_func() {
-		test_ok=0
-		PYTHONPATH="${S}" ${PYTHON} "${S}/${PYTHON_MODNAME}" -v	--testsuite=testsuite || test_ok=1
-		PYTHONPATH="${S}" ${PYTHON} "${S}/${PYTHON_MODNAME}" --doctest -v || test_ok=1
+		local test_ok=0
+		PYTHONPATH="${S}" "$(PYTHON)" ${PYTHON_MODNAME} -v --testsuite=testsuite || test_ok=1
+		PYTHONPATH="${S}" "$(PYTHON)" ${PYTHON_MODNAME} --doctest -v || test_ok=1
 		return ${test_ok}
 	}
 	python_execute_function test_func