Fix a bug in a patch and rename 0.6.8 to 0.6.8-r1 without changes in the ebuild.

Package-Manager: portage-15044-svn/cvs/Linux x86_64

4 files changed, 14 insertions, 6 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index a67bc4ef9320..559b65789ed0 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/setuptools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.92 2009/12/09 18:52:20 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.93 2009/12/12 03:25:39 arfrever Exp $
+
+*setuptools-0.6.8-r1 (12 Dec 2009)
+
+  12 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -setuptools-0.6.8.ebuild, +setuptools-0.6.8-r1.ebuild,
+  files/distribute-0.6.8-fix_tests.patch:
+  Fix a bug in a patch and rename 0.6.8 to 0.6.8-r1 without changes in the
+  ebuild.
 
   09 Dec 2009; nixnut <nixnut@gentoo.org> setuptools-0.6.8.ebuild:
   ppc stable #295696
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index d052cdc035bf..baf7935168f1 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,7 @@
 AUX distribute-0.6-provide_setuptools.patch 1738 RMD160 aac0fd198e7607d8c5ec2c4e6cea82d44b6e6fe6 SHA1 d9c575419313561d1ef6636e349b9241de7e40f3 SHA256 2b7f5a271a71e09a2504a1adf1ad3ad64cdde7ec637101c16ca7a7f353a26a35
 AUX distribute-0.6-sandbox.patch 3141 RMD160 44ecc05e769fb87fcc6f297d1bade6abaa8de0ee SHA1 0188eae1184058d3687a2ce24a40046afe133caa SHA256 63b2e8cd06af0251a37341b43a652ecc0361470a00cd26f63310d2ca146dfa27
 AUX distribute-0.6.8-C_locale_tests.patch 550 RMD160 a0f46df17ceb637896def7373458c30d4021e5a8 SHA1 0647f180eb0f3b19aa31d11774a8b3f69d1c8a8f SHA256 9bad9237138015e0fe921a6b594f2fdd21559b096defa5afc5923a081fc18bb2
-AUX distribute-0.6.8-fix_tests.patch 1786 RMD160 f8028e7566b9a2327d6f2052a9c72b3e24b3c25d SHA1 31da15b7fffb8240fc13a1b9c190208c6219c6cb SHA256 e5d771755a457124b24f205648a9caeea248fa92e6ff736efa75bbb36fe3a33c
+AUX distribute-0.6.8-fix_tests.patch 1770 RMD160 6ad69160a3e1f402dd881ab8000fa2e6bae849c3 SHA1 00f7eb60a6d12d7e3600d62f0c9159b41d6afa79 SHA256 e5af9af52244bce76f21bc6a0efb48b83ea24c41f3bebb41e4b587bf01325072
 AUX setuptools-0.6_rc7-noexe.patch 351 RMD160 6c978d3494b1025e8730796a923dd69f5872a823 SHA1 0f63e1a885f37aca375023ca845de3d7044e7c9d SHA256 772731de7539b71d45da2ac77062965c1ea36294781d4113a2845868b98d8b83
 DIST distribute-0.6.3.tar.gz 412848 RMD160 100b4b9a54589608ae2c5f71f9172088a99b8223 SHA1 f259822547f09726d7c96258a6b3bb6ae9bcb75a SHA256 cc560ae693fe9acb5a525ebe2b5ec0dcf0b05808e999d464dc9bca30d175a466
 DIST distribute-0.6.4.tar.gz 519338 RMD160 6cc5e12e7d1bb268f38b22f688a80e2c3e66c658 SHA1 a2f64bd8552a2c47fb0aefea0fa0e29d992f9fa0 SHA256 27bb04614e07d819f703e9d8310e6438160efbab4c30efc6dc257e65f06ac079
@@ -13,7 +13,7 @@ EBUILD setuptools-0.6-r1.ebuild 1424 RMD160 8f8eb2f992f91ecb019923181630e914c531
 EBUILD setuptools-0.6.3-r3.ebuild 1607 RMD160 b6335e5e93c2b8695d7778d784284bb23e0dd250 SHA1 88fd6ef35cb432560bd9f88a46e661dc31e7495d SHA256 7a1c9eaf5081bcca1f9108024c6bd45c93a69b858b8cec44f17e0fee205280e6
 EBUILD setuptools-0.6.4.ebuild 1600 RMD160 9472d453d0e66d0396201c97fa3d992bc8a709e8 SHA1 742683992f457a5c2ac300c51917c4b32cae45e3 SHA256 1f03e722a5f5869be1aecbd009a18e9f0e66fef57ae42fc7014d809c9072e7f2
 EBUILD setuptools-0.6.6.ebuild 1831 RMD160 1b031248925c7368c8352241e7b8d9d566938289 SHA1 787e443320322cb38243fe074b676d1886f9b55d SHA256 72e167f4b58ae8c5f560f925f04099c160ff7e85932259d073b5145a73a6ec6e
-EBUILD setuptools-0.6.8.ebuild 1962 RMD160 5346fa12c98473ed2a85fbdba0b9ac578639b60f SHA1 9214de09af00e973c1ca65489c9994ab18616109 SHA256 681926fd2b85a574481de9d26775fafe699303dd55a2ccbc596ebb7dec04caf1
+EBUILD setuptools-0.6.8-r1.ebuild 1967 RMD160 d5451131d74c19db670951e84d752514282dc53d SHA1 d1ad8889efc1305c7bda0dfcfe67f2e9c0334cfe SHA256 53e427fe28306d31e99edab94651cc2f4cf8d481a636f8a10ec7590d1c935a57
 EBUILD setuptools-0.6_rc9-r1.ebuild 1215 RMD160 1fc0ec07a0f911790b9d4ebd2a70107328ee9b22 SHA1 0a4c7de7e3747322be1bdeb7e698863e44f44e3f SHA256 740faf17e85536e171cdfc9a680f9acd2d6cb48e219ab81a050e6c00a811937f
-MISC ChangeLog 13760 RMD160 3b6b228734020266468dddd76c4a55db826e5e90 SHA1 6f9c07097adfe381006ca73f5c612febaf80878b SHA256 8fef330dd80a1aef11f99e7efded83f63e12490fe285b12969a07f09e41cc663
+MISC ChangeLog 14056 RMD160 faa377627b34069571c2767ef061c4966caecd74 SHA1 0443c8e6ca9f00a33a9e31e59fda700286efa841 SHA256 64f814de0e36c3ef04e8493a6af94e5aecb526d36fdf6bd23ba6e80a09b8b19d
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/setuptools/files/distribute-0.6.8-fix_tests.patch b/dev-python/setuptools/files/distribute-0.6.8-fix_tests.patch
index 41b1779f3b48..1ae52297c048 100644
--- a/dev-python/setuptools/files/distribute-0.6.8-fix_tests.patch
+++ b/dev-python/setuptools/files/distribute-0.6.8-fix_tests.patch
@@ -7,7 +7,7 @@ https://bitbucket.org/tarek/distribute/changeset/e2de9f1e9064/
      'register', 'bdist_wininst', 'upload_docs',
  ]
  
-+from setuptools.command.install_scripts import install_scripts
++from setuptools.command import install_scripts
  import sys
 +
  if sys.version>='2.5':
diff --git a/dev-python/setuptools/setuptools-0.6.8.ebuild b/dev-python/setuptools/setuptools-0.6.8-r1.ebuild
index 146140499912..ed66bb4aaddb 100644
--- a/dev-python/setuptools/setuptools-0.6.8.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.8.ebuild,v 1.9 2009/12/09 18:52:20 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.8-r1.ebuild,v 1.1 2009/12/12 03:25:39 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"