Fix collision protect problem, bug 145241.

Package-Manager: portage-2.1.2.7

5 files changed, 35 insertions, 23 deletions

diff --git a/dev-python/python-docs/ChangeLog b/dev-python/python-docs/ChangeLog
index 840d6594cd87..60fa1d70a18e 100644
--- a/dev-python/python-docs/ChangeLog
+++ b/dev-python/python-docs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/python-docs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/ChangeLog,v 1.90 2007/05/07 10:35:24 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/ChangeLog,v 1.91 2007/05/07 12:46:26 kloeri Exp $
+
+  07 May 2007; Bryan Østergaard <kloeri@gentoo.org>
+  python-docs-2.3.5.ebuild, python-docs-2.4.4.ebuild,
+  python-docs-2.5.1.ebuild:
+  Fix collision protect problem, bug 145241.
 
   07 May 2007; Bryan Østergaard <kloeri@gentoo.org>
   python-docs-2.4.4.ebuild:
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 44ff054a3464..3dca69062ac2 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -13,30 +13,30 @@ EBUILD python-docs-2.2.3.ebuild 738 RMD160 78b0f626b308a8d6d2cc758e8a82988a402ee
 MD5 d0c7dadcfc4671c1d1587cf2cd9e07c6 python-docs-2.2.3.ebuild 738
 RMD160 78b0f626b308a8d6d2cc758e8a82988a402ee483 python-docs-2.2.3.ebuild 738
 SHA256 a190f96fc76611bc455a116ab357f6e2f8f9924a61827278f8ebccb43a40483e python-docs-2.2.3.ebuild 738
-EBUILD python-docs-2.3.5.ebuild 731 RMD160 680ce4bc52b56f08461252cfb9f0df02e0ccd4a8 SHA1 f64e63d23432a0a24ddfba725b6190a50336a178 SHA256 0131d98745510566dd2cfadb2b6e9b008f2c1b93853b98a81c7022401d2267c4
-MD5 4350a7029a801310a228331011e32392 python-docs-2.3.5.ebuild 731
-RMD160 680ce4bc52b56f08461252cfb9f0df02e0ccd4a8 python-docs-2.3.5.ebuild 731
-SHA256 0131d98745510566dd2cfadb2b6e9b008f2c1b93853b98a81c7022401d2267c4 python-docs-2.3.5.ebuild 731
+EBUILD python-docs-2.3.5.ebuild 750 RMD160 6efc4ee66abd5c551614d24057f94fca78a5cf75 SHA1 f36514ca3b3d2c13d613fe049fac612e78c4e84e SHA256 008f8c900e002df33b37665bae62ebdf6ed054cea0fa33cf736c765dbfeeaed5
+MD5 53f4b7b6b1ae563fb017b607156e52c5 python-docs-2.3.5.ebuild 750
+RMD160 6efc4ee66abd5c551614d24057f94fca78a5cf75 python-docs-2.3.5.ebuild 750
+SHA256 008f8c900e002df33b37665bae62ebdf6ed054cea0fa33cf736c765dbfeeaed5 python-docs-2.3.5.ebuild 750
 EBUILD python-docs-2.4.3.ebuild 989 RMD160 571025bf276a9b57496a9e442b4f04100a190b47 SHA1 3533e2317e302f69b32ae3f7ca5d3e106938395d SHA256 91c7287e264a3eef7b7eff4d9c97187482d3f75f5b8a5e5174477347a045ccd0
 MD5 d13a84d5cfe828d00b854e8be52e3a84 python-docs-2.4.3.ebuild 989
 RMD160 571025bf276a9b57496a9e442b4f04100a190b47 python-docs-2.4.3.ebuild 989
 SHA256 91c7287e264a3eef7b7eff4d9c97187482d3f75f5b8a5e5174477347a045ccd0 python-docs-2.4.3.ebuild 989
-EBUILD python-docs-2.4.4.ebuild 1000 RMD160 ceb1a3604a21290de58765e4fa7adb9f91ed7f44 SHA1 e4e8f95d43c2baa5cd73934ad3a6e05dcd0a7668 SHA256 baaea45c0c7419d61e3e96189e222f346b6c46b5e1be6b770a65628c65b502a5
-MD5 220f1e5a8f18c37e18cf45633e3afc07 python-docs-2.4.4.ebuild 1000
-RMD160 ceb1a3604a21290de58765e4fa7adb9f91ed7f44 python-docs-2.4.4.ebuild 1000
-SHA256 baaea45c0c7419d61e3e96189e222f346b6c46b5e1be6b770a65628c65b502a5 python-docs-2.4.4.ebuild 1000
-EBUILD python-docs-2.5.1.ebuild 838 RMD160 ec0394dd262e4c9e8adacc3e0bb23a2cf994ce74 SHA1 fdb463df2cf762a517f723ffa5c71883786f44ed SHA256 4180656dc9e364bebddbf0ed0a03210aadef4f8b07eb81d6d167530085b58ea9
-MD5 843f09960b33c224ff6d04a5bc7a6511 python-docs-2.5.1.ebuild 838
-RMD160 ec0394dd262e4c9e8adacc3e0bb23a2cf994ce74 python-docs-2.5.1.ebuild 838
-SHA256 4180656dc9e364bebddbf0ed0a03210aadef4f8b07eb81d6d167530085b58ea9 python-docs-2.5.1.ebuild 838
+EBUILD python-docs-2.4.4.ebuild 1018 RMD160 0600de96e758d0d9b6c1d92653083444ee61579b SHA1 730a1134e3e67f33b7fb97ae30e38473985e9708 SHA256 bee8ec0724b6803072418b109af1cd2407fb2ddc46fe1c60c0eb672db38da022
+MD5 cce686fe4373ee14cb54f26a93583e50 python-docs-2.4.4.ebuild 1018
+RMD160 0600de96e758d0d9b6c1d92653083444ee61579b python-docs-2.4.4.ebuild 1018
+SHA256 bee8ec0724b6803072418b109af1cd2407fb2ddc46fe1c60c0eb672db38da022 python-docs-2.4.4.ebuild 1018
+EBUILD python-docs-2.5.1.ebuild 856 RMD160 461bfbc701c9c16858494636720e0c7b06a13c18 SHA1 5e0e7e29efcee1030dc6e0d37f027ad8d056ddda SHA256 73911ef382e285723e42ef01a0d8de07fe82400dd00527d1d92c64b309f1ec34
+MD5 65d877ff54ddaf787d4055ef5a478364 python-docs-2.5.1.ebuild 856
+RMD160 461bfbc701c9c16858494636720e0c7b06a13c18 python-docs-2.5.1.ebuild 856
+SHA256 73911ef382e285723e42ef01a0d8de07fe82400dd00527d1d92c64b309f1ec34 python-docs-2.5.1.ebuild 856
 EBUILD python-docs-2.5.ebuild 834 RMD160 f29dd04442678debe7e02a6a9c989b55c102deec SHA1 48912b737d47a060fa9d71373f84ee1dc4157eb9 SHA256 db313902883cff286d704db15e6a6606fb0f8cd6147f372ee2a0374d7c552422
 MD5 c591bf1f89dcb2e67969e9885a23eb2c python-docs-2.5.ebuild 834
 RMD160 f29dd04442678debe7e02a6a9c989b55c102deec python-docs-2.5.ebuild 834
 SHA256 db313902883cff286d704db15e6a6606fb0f8cd6147f372ee2a0374d7c552422 python-docs-2.5.ebuild 834
-MISC ChangeLog 10685 RMD160 3ec4ca3e8fd712b8338b596cce89e77145303d6f SHA1 71f9ff1b1a51261217b05895d3333e66e4d5c176 SHA256 f33a444c933396bfb9d17180cf817f72f9fbb12ad19be67ac30e94b27953b7ba
-MD5 396eef682c7b5a79fc5cb9b039f68756 ChangeLog 10685
-RMD160 3ec4ca3e8fd712b8338b596cce89e77145303d6f ChangeLog 10685
-SHA256 f33a444c933396bfb9d17180cf817f72f9fbb12ad19be67ac30e94b27953b7ba ChangeLog 10685
+MISC ChangeLog 10866 RMD160 52138988f40d99992403d8a43bcb0422232f4aa1 SHA1 b979dec5a4c08ea15d15a7bda6ad7c1bb1292103 SHA256 97c5a65765fb8a367fe9d86564d38e3eb6c1452fa4fc517888571c81226b6f6a
+MD5 39363ea0ba6c6ab3ade6af5d10818d7c ChangeLog 10866
+RMD160 52138988f40d99992403d8a43bcb0422232f4aa1 ChangeLog 10866
+SHA256 97c5a65765fb8a367fe9d86564d38e3eb6c1452fa4fc517888571c81226b6f6a ChangeLog 10866
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -62,7 +62,7 @@ SHA256 71a358940a37a2e12e012f25edcf71d10b25e759daaa196b148dd1ec5b7e511a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGPwCjugEuf3OQ0akRAijjAKCfIQMZrsvtshNWj5avzarJC0z3BACcDx0Y
-8Tx3hPaZl0f4H1spcD2gsqQ=
-=cqpb
+iD8DBQFGPx9nugEuf3OQ0akRAnmdAKCHbCDrUkCpex+mFvFh0abKuo5bXwCgobqD
+moLbGC9esTWyAXg6G0wMo0c=
+=bnPs
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-docs/python-docs-2.3.5.ebuild b/dev-python/python-docs/python-docs-2.3.5.ebuild
index a1a8a3b6ce12..ce34bea4fb8c 100644
--- a/dev-python/python-docs/python-docs-2.3.5.ebuild
+++ b/dev-python/python-docs/python-docs-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.3.5.ebuild,v 1.11 2007/05/06 22:36:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.3.5.ebuild,v 1.12 2007/05/07 12:46:26 kloeri Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/2.3/"
@@ -19,6 +19,9 @@ S=${WORKDIR}
 src_install() {
 	docinto html
 	cp -R ${S}/Python-Docs-${PV}/* ${D}/usr/share/doc/${PF}/html
+}
+
+pkg_preinst() {
 	dodir /etc/env.d
 	echo "PYTHONDOCS=/usr/share/doc/${PF}/html/lib" > ${D}/etc/env.d/50python-docs
 }
diff --git a/dev-python/python-docs/python-docs-2.4.4.ebuild b/dev-python/python-docs/python-docs-2.4.4.ebuild
index 1bfa01cc21e1..52c9272745f6 100644
--- a/dev-python/python-docs/python-docs-2.4.4.ebuild
+++ b/dev-python/python-docs/python-docs-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.4.4.ebuild,v 1.4 2007/05/07 10:35:24 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.4.4.ebuild,v 1.5 2007/05/07 12:46:26 kloeri Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/${PV}/"
@@ -31,7 +31,9 @@ src_install() {
 
 	insinto /usr/share/info
 	doins ${S}/info/*
+}
 
+pkg_preinst() {
 	dodir /etc/env.d
 	echo "PYTHONDOCS=/usr/share/doc/${PF}/html/lib" > ${D}/etc/env.d/50python-docs
 }
diff --git a/dev-python/python-docs/python-docs-2.5.1.ebuild b/dev-python/python-docs/python-docs-2.5.1.ebuild
index 9b8a15447293..a739aed4b06f 100644
--- a/dev-python/python-docs/python-docs-2.5.1.ebuild
+++ b/dev-python/python-docs/python-docs-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.5.1.ebuild,v 1.1 2007/05/06 22:36:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.5.1.ebuild,v 1.2 2007/05/07 12:46:26 kloeri Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/${PV}/"
@@ -24,7 +24,9 @@ src_unpack() {
 src_install() {
 	docinto html
 	cp -R ${S}/Python-Docs-${PV}/* ${D}/usr/share/doc/${PF}/html
+}
 
+pkg_preinst() {
 	dodir /etc/env.d
 	echo "PYTHONDOCS=/usr/share/doc/${PF}/html/lib" > ${D}/etc/env.d/50python-docs
 }