From bcc1aebea432078714789909b86f18da06bfd128 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 28 Nov 2011 19:52:06 +0000 Subject: Delete old code. Update LICENSE. Patch by Arfrever. (Portage version: 2.2.0_alpha77/cvs/Linux x86_64) --- dev-python/python-docs/ChangeLog | 7 +++++- dev-python/python-docs/python-docs-2.4.4-r1.ebuild | 28 ++++------------------ dev-python/python-docs/python-docs-2.5.4-r1.ebuild | 28 ++++------------------ dev-python/python-docs/python-docs-2.6.6.ebuild | 4 ++-- dev-python/python-docs/python-docs-3.2.ebuild | 8 +------ 5 files changed, 19 insertions(+), 56 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 + 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 python-docs-2.7.1.ebuild, python-docs-3.1.3.ebuild, python-docs-3.2.ebuild: 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%.*}.$((${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%.*}.$((${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" -- cgit v1.2.3-65-gdbad