Delete old code. Update LICENSE. Patch by Arfrever.

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

6 files changed, 39 insertions, 66 deletions

diff --git a/dev-python/python-docs/ChangeLog b/dev-python/python-docs/ChangeLog
index 3549c0cac17d..2e134082eb4f 100644
--- a/dev-python/python-docs/ChangeLog
+++ b/dev-python/python-docs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/python-docs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/ChangeLog,v 1.158 2011/08/27 21:22:56 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/ChangeLog,v 1.159 2011/11/28 19:52:06 hwoarang Exp $
+
+  28 Nov 2011; Markos Chandras <hwoarang@gentoo.org>
+  python-docs-2.4.4-r1.ebuild, python-docs-2.5.4-r1.ebuild,
+  python-docs-2.6.6.ebuild, python-docs-3.2.ebuild:
+  Delete old code. Update LICENSE. Patch by Arfrever.
 
   27 Aug 2011; Jesus Rivero <neurogeek@gentoo.org> python-docs-2.7.1.ebuild,
   python-docs-3.1.3.ebuild, python-docs-3.2.ebuild:
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 89f66432176f..e311e729b930 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST html-2.4.4.tar.bz2 1398442 RMD160 aa75cff896abd89c0ef2dbda5d5b1bcd45e42689 SHA1 c493b57cd06b16e6da6379524425c20828a00b8b SHA256 6b1a6f1be187b1d0cab69ab7c8c436409468232d376419c978cbb1d019c6f465
 DIST html-2.5.4.tar.bz2 1619772 RMD160 78cf1d55bc50b9c4535d1519a11a0a4e1a47a12e SHA1 f547228fbabc9b259ca4c4b32daffc813cfe5455 SHA256 b73eaeaf0400e64d9bb223cfb0d09a935e8044f0ba485e5bc549b003e6df8325
@@ -8,18 +8,28 @@ DIST python-2.6.6-docs-html.tar.bz2 3967744 RMD160 aa5c0791e3ba5ea1702feaaf7e704
 DIST python-2.7.1-docs-html.tar.bz2 4229348 RMD160 a8b4e28b722464cb62fa6774dae7a32615ed9665 SHA1 6103869bec3994da859f7c83cc0090a9a1f39cd4 SHA256 3262387c12c1ba4e3a38b3d1b19723cc46e09e6e20f7fd1b62825ae8ba1ad4a0
 DIST python-3.1.3-docs-html.tar.bz2 3776041 RMD160 b15a492c5c3b414b2f7c406a8a6fe18f2cf0d945 SHA1 09fb91661e0482075b58417a6cfc5620c22ec736 SHA256 829bd631809f06c16e65e58b82034d0043f47f9ee59b8951aa9549fc1fa9ee6c
 DIST python-3.2-docs-html.tar.bz2 4338603 RMD160 5a914816f5a8891bbda4c0dc4ee8b4f147fdfb03 SHA1 153f09beb197dcac3bb1f92aac58646b6c41a9f8 SHA256 cad7090244c6824da9bc04d06ba8e77af5e9d886f9562ee1a810619a0c069deb
-EBUILD python-docs-2.4.4-r1.ebuild 1737 RMD160 d9109d3bae19a78342a06aff25e15183dbf329d2 SHA1 ec5093214fe409dbbe7a991b724a219d987d1873 SHA256 b11db18cb5172c97e56b2d8df0c5fd70193f982682f81b11153e8ac45ededea0
-EBUILD python-docs-2.5.4-r1.ebuild 1520 RMD160 f1a358135590246c7e7706954a3d8bf1e2c4a2c5 SHA1 c6fe592e14a6d4c54460e82e81b6d343a2793600 SHA256 94b236d95800a784902361a8ed7f2f123d32233f42727403781a40c17eb6f970
-EBUILD python-docs-2.6.6.ebuild 1084 RMD160 c792157fe6ef0f83980d6f1ba785853a9a4c58d3 SHA1 c832bb0f3ea1b5cf46de3bb3f364b2bef4296edc SHA256 ff6cfcf32c914a14a1fb0df626d7bdb99063f44237e3f952279476b6b28cf693
+EBUILD python-docs-2.4.4-r1.ebuild 1315 RMD160 c40297571a645c44d6b33ecdc05fa338ecc90584 SHA1 6f363d71632e7316bcc02a759edbe225f563e72a SHA256 6cc02a01589e58f4af911a6c11da8c8bb3335b8e6487b9007991cba15f1dd776
+EBUILD python-docs-2.5.4-r1.ebuild 1098 RMD160 2540e2a1de82bd6d02c213c650e58addf3d34679 SHA1 3425faff0aa560f2eb9fcf752ac146c91adf19a0 SHA256 c03a4bd6cb1dad555f331cddea08d034f89d989052d7c51f13bb7fd89886e15a
+EBUILD python-docs-2.6.6.ebuild 1082 RMD160 c1951095ab59b83b45c6447ea6c6d25b2dd5fadc SHA1 d5b1d6b0bc9b546d9f457042e9695e8f763f9314 SHA256 c189823be54078d020416cefd5be7a84118f14ce1c1cd9aed4c725638191d491
 EBUILD python-docs-2.7.1.ebuild 1083 RMD160 fe45cb0750721eaca0f090171200e4f1eb2bc9f8 SHA1 4e030d352f63ea07a4d46dc525fa84df2c142578 SHA256 acb565663990d8faf49e04f3b4afa01cea03438fc6fb68add1e54c404638d59e
 EBUILD python-docs-3.1.3.ebuild 1083 RMD160 d482e2ab032d4409f33f56f32e39234f4121185a SHA1 f1435beaf19135fd1e36ab202cc25c6b632134ba SHA256 271471ea76aa91c863e8e648b87278c1480b1cdf8bf4a5162efad476a8f6b876
-EBUILD python-docs-3.2.ebuild 1215 RMD160 45bce0c4fe002988521c69ab116afaa64fafca34 SHA1 3164c555900435883c46a7f992d4d010820a2141 SHA256 af8cf148eb7b8145f475419c7f0859a68ba6920c346e0a6a612b6bd63d40b951
-MISC ChangeLog 20304 RMD160 f8a2c41a2e11b5ec31850ab6464941c66f8d595e SHA1 b6a2d6f82c308eac8bb4586d187fb37b39ced3ef SHA256 5ae4bd9f3ee3da0587feb556901c711f10a6fee1c50360f11730c4e2aaf2a977
+EBUILD python-docs-3.2.ebuild 1092 RMD160 81e971379e33ca2707c1b0ddf6368f2a6925ec47 SHA1 2af0e22f54c3a90ba8393f5c8f79c0c219e2e046 SHA256 b7890e4343304c70952a7c57d758af63909a30ac0c045582190106fb95040952
+MISC ChangeLog 20523 RMD160 7056704b1e18811e172922ecec7f7fefa308cb87 SHA1 9140eb11b8b41267c2513eeb74bc3fa06a5f42a4 SHA256 8ae663af0ec9286585c8b87774cda0123e27771d006885a2d2f1d4576a1238a2
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5ZJ7sACgkQdIssYB9vBoOnVACfTHx83Cm5yIx1yUDUQdSI4bzH
-pK0An3RSKwBZ9cb/mEi3Q5xodv7urhzv
-=ZfGP
+iQIcBAEBCgAGBQJO0+ZlAAoJEPqDWhW0r/LCc+wP/iIJGvna6F52SmoEj80S6hgf
+RAhx5K39HC6Xa0oRtIJdZNOgiwiTKPgC7bvSdgUTKR+rmkZYi+JQIVV9TypjRPNc
+qXyOORgyxvSg5c6qj3RnIXNdLtk1t/Hywfj4ABN6+g3+nqyysdRqDaBlRJyUSPPD
+Bmy9y0AXaZyaLLagmN+30RvhQA/6TqMwuB0EHwKyHt8r/a5caioBScy5B8mLLCMl
+bUWewpIkLL3yR5W+ON7w21ji99UfJHcsTyj5T+S62IlxaDlvob1OuFrqdJGnE0jj
+X4bzNrWRyPvr1ziDjIiN0gZq8wgxk/Efig/lJ04M/wphnjnN7weXyXjpdUBEhIm4
+TIdr1idXCi2vzcRatY2lT41UGfm8Ln6kNaF/fSlfbEXq1ZVIwIbF3u10D+1qzeDp
+HxRKjsaUCX8R8LoCHvwb8uU0VdRO5YpErEWMnS9fMeHscbgtBAVPB1EnGD9bnglS
+ibGwWwHik8FybJ8TydmQhR43uUcZKCOsW0MIcH+aeehDV8+xTi+17G3Awzc4Epe0
+fSNuqMJ4fCP1m2MXXYO+Ky864F7oBwSEh3m3jwdN5aaDHCpLAiilH893TAluT4dF
+JVVcXC/Bx+hXgoOEiZMdfh5Z6YSl1UNkqeWXxM916Q4A35wnXzilztybWFcwpG4a
+/+wMfO8aupjq2da6ay3p
+=xpiE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-docs/python-docs-2.4.4-r1.ebuild b/dev-python/python-docs/python-docs-2.4.4-r1.ebuild
index 826ee02cba40..152ed8461bad 100644
--- a/dev-python/python-docs/python-docs-2.4.4-r1.ebuild
+++ b/dev-python/python-docs/python-docs-2.4.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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-r1.ebuild,v 1.7 2010/07/04 20:08:46 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.4.4-r1.ebuild,v 1.8 2011/11/28 19:52:06 hwoarang Exp $
 
 EAPI="3"
 
@@ -9,13 +9,13 @@ HOMEPAGE="http://www.python.org/doc/"
 SRC_URI="http://www.python.org/ftp/python/doc/${PV}/html-${PV}.tar.bz2
 	http://www.python.org/ftp/python/doc/${PV}/info-${PV}.tar.bz2"
 
-LICENSE="PSF-2.2"
+LICENSE="PSF-2"
 SLOT="2.4"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
-DEPEND=">=app-admin/eselect-python-20091230"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND=""
 
 S="${WORKDIR}"
 
@@ -41,26 +41,8 @@ src_install() {
 	doenvd "60python-docs-${SLOT}"
 }
 
-eselect_python_update() {
-	local eselect_python_options
-	[[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
-
-	# Create python2 symlink.
-	eselect python update --python2 > /dev/null
-
-	eselect python update ${eselect_python_options}
-}
-
-pkg_postinst() {
-	eselect_python_update
-}
-
 pkg_postrm() {
-	eselect_python_update
-
 	if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
 		rm -f "${EROOT}etc/env.d/65python-docs"
 	fi
-
-	rm -f "${EROOT}etc/env.d/50python-docs"
 }
diff --git a/dev-python/python-docs/python-docs-2.5.4-r1.ebuild b/dev-python/python-docs/python-docs-2.5.4-r1.ebuild
index 58fc5802b112..cc1b7c279e97 100644
--- a/dev-python/python-docs/python-docs-2.5.4-r1.ebuild
+++ b/dev-python/python-docs/python-docs-2.5.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.4-r1.ebuild,v 1.7 2010/07/04 20:08:46 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.5.4-r1.ebuild,v 1.8 2011/11/28 19:52:06 hwoarang Exp $
 
 EAPI="3"
 
@@ -8,13 +8,13 @@ DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/"
 SRC_URI="http://www.python.org/ftp/python/doc/${PV}/html-${PV}.tar.bz2"
 
-LICENSE="PSF-2.2"
+LICENSE="PSF-2"
 SLOT="2.5"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
-DEPEND=">=app-admin/eselect-python-20091230"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND=""
 
 S="${WORKDIR}"
 
@@ -30,26 +30,8 @@ src_install() {
 	doenvd "60python-docs-${SLOT}"
 }
 
-eselect_python_update() {
-	local eselect_python_options
-	[[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
-
-	# Create python2 symlink.
-	eselect python update --python2 > /dev/null
-
-	eselect python update ${eselect_python_options}
-}
-
-pkg_postinst() {
-	eselect_python_update
-}
-
 pkg_postrm() {
-	eselect_python_update
-
 	if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
 		rm -f "${EROOT}etc/env.d/65python-docs"
 	fi
-
-	rm -f "${EROOT}etc/env.d/50python-docs"
 }
diff --git a/dev-python/python-docs/python-docs-2.6.6.ebuild b/dev-python/python-docs/python-docs-2.6.6.ebuild
index 520bf815b01a..a1c43810aa84 100644
--- a/dev-python/python-docs/python-docs-2.6.6.ebuild
+++ b/dev-python/python-docs/python-docs-2.6.6.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/python-docs/python-docs-2.6.6.ebuild,v 1.2 2011/02/20 16:36:46 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.6.6.ebuild,v 1.3 2011/11/28 19:52:06 hwoarang Exp $
 
 EAPI="3"
 
@@ -8,7 +8,7 @@ DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/"
 SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
 
-LICENSE="PSF-2.2"
+LICENSE="PSF-2"
 SLOT="2.6"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
diff --git a/dev-python/python-docs/python-docs-3.2.ebuild b/dev-python/python-docs/python-docs-3.2.ebuild
index 66b00e518aa1..182551e909f7 100644
--- a/dev-python/python-docs/python-docs-3.2.ebuild
+++ b/dev-python/python-docs/python-docs-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/dev-python/python-docs/python-docs-3.2.ebuild,v 1.2 2011/08/27 21:22:56 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-3.2.ebuild,v 1.3 2011/11/28 19:52:06 hwoarang Exp $
 
 EAPI="3"
 
@@ -18,12 +18,6 @@ RDEPEND=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
 
-pkg_setup() {
-	if has_version "=dev-lang/python-3.2_pre*[doc]"; then
-		rm -f "${EROOT}etc/env.d/60python-docs-3.2"
-	fi
-}
-
 src_install() {
 	docinto html
 	cp -R [a-z]* _static "${ED}usr/share/doc/${PF}/html"