Don't inherit unused eclass. Fix dependencies. Simplify distutils_src_test_pre_hook(). Patch by Arfrever.

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

4 files changed, 43 insertions, 19 deletions

diff --git a/dev-python/dulwich/ChangeLog b/dev-python/dulwich/ChangeLog
index 8d3ab2b26ac6..e922e64a4c4b 100644
--- a/dev-python/dulwich/ChangeLog
+++ b/dev-python/dulwich/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/dulwich
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/ChangeLog,v 1.39 2011/11/10 10:37:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/ChangeLog,v 1.40 2011/11/11 19:21:43 hwoarang Exp $
+
+  11 Nov 2011; Markos Chandras <hwoarang@gentoo.org> dulwich-0.8.1.ebuild:
+  Don't inherit unused eclass. Fix dependencies. Simplify
+  distutils_src_test_pre_hook(). Patch by Arfrever.
 
   10 Nov 2011; Fabian Groffen <grobian@gentoo.org> dulwich-0.8.1.ebuild:
   Marked ~x86-linux
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 42f161ece1de..325c7c47f422 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX dulwich-0.8.0-darwin.patch 869 RMD160 190e656d10443a04fd4b46744477a2734fae2db6 SHA1 bf3658dcf552f0c386855c2a970ec4cd80016f6c SHA256 9d255f480852d56486d9f5f939c77e623bb7e8af661553571e99bc0477720cb7
 DIST dulwich-0.7.1.tar.gz 164718 RMD160 569a628854c2c29d14735acb15615a23fba14417 SHA1 cfbeb7e83c4258f489ed2736a684190004c1733f SHA256 24e393bdadd685608b61e0293719296d467b76917e2135822576246b988724b5
@@ -7,13 +7,23 @@ DIST dulwich-0.8.0.tar.gz 183532 RMD160 772f70d1c5a8c322acdb8ca61fbd2a82b02ca7ce
 DIST dulwich-0.8.1.tar.gz 190280 RMD160 c67e97225f7bbe5f7562acdaf4bb466fde912a9c SHA1 b98ad0bd668464767e0605b0ef50443ad54488f1 SHA256 1a1619e9c7e63fe9bdc93356ee893be1016b7ea12ad953f4e1f1f5c0c5056ee8
 EBUILD dulwich-0.7.1.ebuild 1397 RMD160 4243149ce1f56c91d11e0d9691cff43a1083721b SHA1 b6bf9c48f2dac524384e2154c1eff95f356980d4 SHA256 26b9d8bf97339942cd474522c50ca7dd9ca09680f55a17ae85b341769a02d357
 EBUILD dulwich-0.8.0.ebuild 1471 RMD160 63c699a7fd91130badebb3f5f80c800af5972fd3 SHA1 26111f3022011b7925e9db4192170018db106149 SHA256 daf4b1d0854ad593c7ae063211804bb3fc234dd2d67cb13c31d7b94230af2c21
-EBUILD dulwich-0.8.1.ebuild 1442 RMD160 b099ea679fc27ab7e8cf1cfd59d1f199a994ea31 SHA1 75622dcd4ef808ca5c3894bf14d966609ed328df SHA256 5752e6ded0014471de7b379bbe43a22f565d13ec49e1404a39328c9bde06c727
-MISC ChangeLog 4711 RMD160 316335345077fa268367f037e90c4af8ab225721 SHA1 ed20c001f64d13cab13304c4f849272843a6c811 SHA256 e28c143783dbb1184c27cda824d0a558420990756cb7df6e7f1ef547512608e1
+EBUILD dulwich-0.8.1.ebuild 1405 RMD160 4dfb4e10cdf05cbb140e739e3c0dace6e35616ac SHA1 272af03eb9467e35e67ad1bab317e86f1157572a SHA256 9c94b6dfcfaffa344db38c544f098d7d0af2ebdf91bafa20172a3e445386d549
+MISC ChangeLog 4898 RMD160 bb9ad93e84a7faf6c9eb3262cfd89d472b95a23b SHA1 ad283a175529113871a3959a8669595ec8e48a00 SHA256 1800c96996b29fdc7f9396778d05efb64d88bff807dfb0f3fea59580d960adaf
 MISC metadata.xml 360 RMD160 cb7b2f9c8c097b1e21307896968bf4b2dd2bfaef SHA1 326014508746a44617838bd6d700ac4b3104fe81 SHA256 8ce45bf5319217c8027a2f8a0fe3b5814be8851264b969d1b232d446cf9770a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (SunOS)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk67qXUACgkQX3X2B8XHTonFpgCgmS36Ed/DkHYqHjr5vLntRwnH
-choAoKBUOloiFYyOeIRnxoDrBeDPrh05
-=t70I
+iQIcBAEBCgAGBQJOvXXKAAoJEPqDWhW0r/LCGUcP/2G4p2sprXZ1S9xlQ7yB2WGX
+n9GTMZzbqZdLHSCrHsjLyXdhW6KuNeV5hgYH/DLvJN5qP/vfo9O77u3k38aqcgB4
+YcAcppnd7mQ2O2Vn3csLT5PnUzLPpokLMol9gjhCiQWQf46uOqIQeXSRh83k+k5d
+HwHGT4p9XTkUDStBNpDu0prlT83KoSF5QIgMfubMUn2Re/21iHkRnbR9kTXwJR9p
+EnCAxjTZJwNwEYl1Kyqz5SuuXDBFdxaUW8jzAxspFqe8PPjU0n9b3jaqQnYTV2zP
+Ubt3Xh134i1H/8rmH/IgIPHgzySdb1vqMPXwOySbxC85tWRvuamkvGcuD7ZvIMdL
+kSwwS2lpjxM/0zlQGxoVByPL83qRY8QDo8n2QHZNMnrGoloQ9fIx0r1ahirdGLtC
+Z8tPk1w5N71tWrLE6OlG3Ri1v6Bmskura2iNNqizkSt9mim4qMw/wTsX8JF0Mkad
+tCtuNfHms44bwl+2LT8a2MQ2N/zOl4K6oL36Yg2n0YxXFyJyQZjsrovZZG6TBUEu
+7P/rAj/3OSlfcKRqCbkGn30uTEOno1cjmcpc7xKbi8PzzCMfITs/q+3s71faJImd
+hD2ki0OqK1H49mTGnm0ZawBnyh0aXygUaQ0x+uaqpf2rGqmL4cqQxQ/sA2HICLl3
+6fzNlFJo+9dChq/oo0eX
+=F1eM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/dulwich/dulwich-0.8.1.ebuild b/dev-python/dulwich/dulwich-0.8.1.ebuild
index a9f51b0e7df9..b5c1548f72ad 100644
--- a/dev-python/dulwich/dulwich-0.8.1.ebuild
+++ b/dev-python/dulwich/dulwich-0.8.1.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/dev-python/dulwich/dulwich-0.8.1.ebuild,v 1.2 2011/11/10 10:37:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/dulwich-0.8.1.ebuild,v 1.3 2011/11/11 19:21:43 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 DISTUTILS_SRC_TEST="nosetests"
 
-inherit distutils eutils
+inherit distutils
 
 DESCRIPTION="Dulwich is a pure-Python implementation of the Git file formats and protocols."
 HOMEPAGE="http://samba.org/~jelmer/dulwich/ http://pypi.python.org/pypi/dulwich"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-ma
 IUSE=""
 
 DEPEND="dev-python/setuptools
-	test? ( || ( dev-lang/python:2.7 dev-python/unittest2 dev-python/testtools ) )"
+	test? ( || ( dev-lang/python:2.7 dev-python/unittest2 ) )"
 RDEPEND=""
 
 src_prepare() {
@@ -31,7 +31,7 @@ src_prepare() {
 distutils_src_test_pre_hook() {
 	local module
 	for module in _diff_tree _objects _pack; do
-		ln -fs "../$(ls -d build-${PYTHON_ABI}/lib.*)/dulwich/${module}.so" "dulwich/${module}.so" || die "Symlinking dulwich/${module}.so failed with $(python_get_implementation) $(python_get_version)"
+		ln -fs "../$(ls -d build-${PYTHON_ABI}/lib.*)/dulwich/${module}.so" "dulwich/${module}.so" || die "Symlinking dulwich/${module}.so failed with $(python_get_implementation_and_version)"
 	done
 }
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index e1d5e1ac48a3..b98cb3a61ff6 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST paramiko-1.7.6.tar.gz 843748 RMD160 bd1e4c983db9fb450066531b5d24847946f683eb SHA1 0051dd01b7d17823d567b2988495b32afb549c20 SHA256 3059263b016255640151cde1e3e74ffd7234b90e780628865cb3f5a407fd5002
 DIST paramiko-1.7.7.1.tar.gz 823017 RMD160 4b08451a9d73d3b62d1e4b43fbb92108a78ff527 SHA1 9b40f1757743793e64c935192a474e7307445438 SHA256 101e7642cbb59574539eaef537d0ef0bb54f1f987cc950f0ada0b050ac245eae
 EBUILD paramiko-1.7.6.ebuild 1102 RMD160 e86e6e480ea80fbd31bdcc3ab6e8b874a9873c1e SHA1 e3ac1359fa78d56ffc216080bd8fdb07c181abdc SHA256 4bef48d111b732a7edcb025de8bc99e86d4677ca7bd9ef77535355b3c071f2b6
-EBUILD paramiko-1.7.7.1.ebuild 1106 RMD160 e9378fe4ddb7aad2a745fef08507336b3ed52f95 SHA1 7d3e8e85bf8db634a833ffb5082cea67684d12e6 SHA256 82577aa23263125216fa28285f28f9df3b8a4547da105d9a9c46e0997b9f6d64
-MISC ChangeLog 8393 RMD160 b820822866b8b76a330588ee85b34a708347a79c SHA1 42e8fd20031583d50ed4db5008f1692ab5ab0784 SHA256 52a084f0a6f2507d55f71b9ad8b8bfd99a3b339fd1b9447100fa80710d82d08f
+EBUILD paramiko-1.7.7.1.ebuild 1137 RMD160 62976901861628079b7ba85c8ebe4717309e274e SHA1 f580b0aeaeca982f1e792d586678f042be2be2ad SHA256 8aadcc40dd829851e77f2e828b8eadf92d4ea4ed6675c98abe1dd29e7882bf2f
+MISC ChangeLog 8552 RMD160 b2a23a3d6171d3398af70b5106dd72f84237b6f0 SHA1 85bd9311c1e8bed0648fddbe995378239272174c SHA256 14081e5b6b591d2fac6cd0beda0610847663af2e6cbc17262af2cd714ccdeccf
 MISC metadata.xml 897 RMD160 53d2f82df4ad314ad8543ca95e82037f7e4e3a50 SHA1 403f5279ce7df3f3e9a76dd7a7096f855e5abd61 SHA256 2706e534ea7bc52cf5fbc3ce6ee4008ec371db4869a76edcbbbd78782b63fd17
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6kTLUACgkQuQc30/atMkB67ACeNWJ/xdHYodi6u6Mb63iDRPaU
-2a0An38mGF4LcBOhfNcs+3dzqSMrAVYf
-=3jKC
+iQIcBAEBCgAGBQJOvXYPAAoJEPqDWhW0r/LCOVgP/30KLKH5WUWUT66ZXGQc5DAW
+yaTXzVwp+hTxz9HQZgSnWPNbGyi/t8ijb9Ff2XBPY5uG2mz7moBwne9hG+uPsXCO
+bTnXJlsYh/q+TKyrWVCYm0R7U10MvDAzrwxrKNHmhne2ncYDRkvo86L9qz9ZLG3W
+5XYHrN9mnfJlN2Q4VvyZhpwB4XRXP2XL15ZjUpyH8ItCtLcqK1SOkC2JxF67Cla+
+doVtVcSIlctxX+dXeKY43w9pMoagPIVbmvEKeFgqWpFghag4+bV4EHRiEWAyCE4d
+97rK8tXIPDcVVdbREYAEHzwZAM1+kWuxwT72wIyeFvV96SfwP1DvnrPYfIrymOys
+LPb5uSxWAWVPrPluEcDRahh93aR+T6JhZ4WOVZ+0TfHum41o/Uhng0NECYm/cC7a
+ZAdByXjsGKX0bTVhLylWsWafjcDE50fXJxsZ/Z8g7do4hMqeVCyYl0EFtR6lhhE0
+eLPLb5+Ox1uuX2TtCop1ZQXOKVJHPT0d0KmThmkg+hxWXC/waO56v1uBBN1IUUUL
+zgE76QjZ9MHPp9TdtWDmYBhoOXl5qWFvGDhgCh5NbfbD9hQSJOzB9l9Tj8Wh9yTN
+4TZJOjzc0pvb7nBBM8clPAhTNqwt/b1xNmUDxDkBpEVwvgLwpknFhTbpfxkxMtdD
+bQV+vLgiSDhBx3AZbqhC
+=yJbD
 -----END PGP SIGNATURE-----