summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Østergaard <kloeri@gentoo.org>2007-05-11 18:30:51 +0000
committerBryan Østergaard <kloeri@gentoo.org>2007-05-11 18:30:51 +0000
commit9a4a720f6da0caa794a7d436082089fe0e00b336 (patch)
tree05518d2a005b5cb82c8cba40e2a3c5882bca2ad0 /dev-lang
parentadd metadata.xml (diff)
downloadgentoo-2-9a4a720f6da0caa794a7d436082089fe0e00b336.tar.gz
gentoo-2-9a4a720f6da0caa794a7d436082089fe0e00b336.tar.bz2
gentoo-2-9a4a720f6da0caa794a7d436082089fe0e00b336.zip
More cleanups, this time removing <python-2.3.
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/python/ChangeLog6
-rw-r--r--dev-lang/python/files/digest-python-2.1.3-r13
-rw-r--r--dev-lang/python/files/digest-python-2.2.3-r66
-rw-r--r--dev-lang/python/python-2.1.3-r1.ebuild76
-rw-r--r--dev-lang/python/python-2.2.3-r6.ebuild145
5 files changed, 5 insertions, 231 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index a4b80f849dcd..df6bc241eb63 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/python
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.243 2007/05/11 14:06:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.244 2007/05/11 18:30:51 kloeri Exp $
+
+ 11 May 2007; Bryan Østergaard <kloeri@gentoo.org>
+ -python-2.1.3-r1.ebuild, -python-2.2.3-r6.ebuild:
+ More cleanups, this time removing <python-2.3.
11 May 2007; Bryan Østergaard <kloeri@gentoo.org>
-python-2.3.6-r1.ebuild, -python-2.4.4-r2.ebuild, -python-2.4.4-r3.ebuild,
diff --git a/dev-lang/python/files/digest-python-2.1.3-r1 b/dev-lang/python/files/digest-python-2.1.3-r1
deleted file mode 100644
index 05e36afb0776..000000000000
--- a/dev-lang/python/files/digest-python-2.1.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a8b04cdc822a6fc833ed9b99c7fba589 Python-2.1.3.tgz 6194432
-RMD160 d7216480cf884507d97bf7932767871977fc1ccc Python-2.1.3.tgz 6194432
-SHA256 1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9 Python-2.1.3.tgz 6194432
diff --git a/dev-lang/python/files/digest-python-2.2.3-r6 b/dev-lang/python/files/digest-python-2.2.3-r6
deleted file mode 100644
index d68a92546c72..000000000000
--- a/dev-lang/python/files/digest-python-2.2.3-r6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 169f89f318e252dac0c54dd1b165d229 Python-2.2.3.tgz 6709556
-RMD160 3590f813582d65194b467f4ab450e360e35eb40e Python-2.2.3.tgz 6709556
-SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 Python-2.2.3.tgz 6709556
-MD5 e65c2bc4d45ecca1f5f18908263ac32e python-gentoo-patches-2.2.3.tar.bz2 3138
-RMD160 0160617413b2ee4165eb0a7ceb68e95cb36e0f25 python-gentoo-patches-2.2.3.tar.bz2 3138
-SHA256 e85f6afba9d2cd23f39c46ed5e50d48b971615cd5dc5bc7af766b201a03b3893 python-gentoo-patches-2.2.3.tar.bz2 3138
diff --git a/dev-lang/python/python-2.1.3-r1.ebuild b/dev-lang/python/python-2.1.3-r1.ebuild
deleted file mode 100644
index 720c4a5168c4..000000000000
--- a/dev-lang/python/python-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.1.3-r1.ebuild,v 1.23 2006/07/08 19:13:37 cardoe Exp $
-
-inherit versionator
-
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-S=${WORKDIR}/Python-${PV}
-
-DESCRIPTION="A really great language"
-HOMEPAGE="http://www.python.org"
-SRC_URI="http://www.python.org/ftp/python/${PV}/Python-${PV}.tgz"
-
-LICENSE="PSF-2.1.1"
-SLOT="2.1"
-KEYWORDS="x86 sparc alpha ia64 ppc"
-IUSE="readline tk berkdb"
-
-DEPEND=">=sys-libs/zlib-1.1.3
- readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
- berkdb? ( >=sys-libs/db-3 )
- tk? ( >=dev-lang/tk-8.0 )"
-
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
-
-PROVIDE="virtual/python"
-
-src_compile() {
- export OPT="$CFLAGS"
-
- # adjust makefile to install pydoc into ${D} correctly
- t=${S}/Makefile.pre.in
- cp $t $t.orig || die
- sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' $t.orig > $t
-
- local myopts
- #if we are creating a new build image, we remove the dependency on g++
-
- econf --with-fpectl \
- --with-threads \
- --infodir='${prefix}'/share/info \
- --mandir='${prefix}'/share/man \
- $myopts || die
- emake || die "Parallel make failed"
-}
-
-src_install() {
- dodir /usr
- make install prefix=${D}/usr || die
- rm "${D}/usr/bin/python"
-# dosym python${PYVER_MAJOR} /usr/bin/python
-# dosym python${PYVER_MAJOR}.${PYVER_MINOR} /usr/bin/python${PYVER_MAJOR}
- dodoc README
-
- # install our own custom python-config
-# exeinto /usr/bin
-# newexe ${FILESDIR}/python-config-${PYVER} python-config
-
- # seems like the build do not install Makefile.pre.in anymore
- # it probably shouldn't - use DistUtils, people!
- insinto /usr/lib/python${PYVER}/config
- doins ${S}/Misc/Makefile.pre.in
-
- # If USE tk lets install idle
- # Need to script the python version in the path
- if use tk; then
- dodir /usr/lib/python${PYVER}/tools
- mv "${S}/Tools/idle" "${D}/usr/lib/python${PYVER}/tools/"
- dosym /usr/lib/python${PYVER}/tools/idle/idle.py /usr/bin/idle-${PV}.py
- fi
- mv ${D}/usr/man/man1/python.1 ${D}/usr/man/man1/python-${PV}
- rm ${D}/usr/bin/pydoc
-}
diff --git a/dev-lang/python/python-2.2.3-r6.ebuild b/dev-lang/python/python-2.2.3-r6.ebuild
deleted file mode 100644
index 9c0b83c428c6..000000000000
--- a/dev-lang/python/python-2.2.3-r6.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r6.ebuild,v 1.7 2006/08/22 22:26:50 liquidx Exp $
-
-inherit flag-o-matic eutils python versionator
-
-PYVER_MAJOR=$(get_major_version)
-PYVER_MINOR=$(get_version_component_range 2)
-PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-
-S="${WORKDIR}/Python-${PV}"
-DESCRIPTION="A really great language"
-HOMEPAGE="http://www.python.org"
-SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tgz
- mirror://gentoo/python-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.2"
-KEYWORDS="amd64 x86 ppc sparc alpha mips hppa ia64 ppc64"
-IUSE="berkdb bootstrap build doc gdbm ncurses readline ssl tk nocxx"
-
-DEPEND=">=sys-libs/zlib-1.1.3
- !build? ( tk? ( >=dev-lang/tk-8.0 )
- ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
- berkdb? ( >=sys-libs/db-3 )
- dev-libs/expat
- gdbm? ( sys-libs/gdbm )
- ssl? ( dev-libs/openssl )
- doc? ( =dev-python/python-docs-${PV}* )
- )"
-
-RDEPEND="${DEPEND} dev-python/python-fchksum"
-
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
-
-PROVIDE="virtual/python"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- #Fixes security vulnerability in XML-RPC server - pythonhead (06 Feb 05)
- #http://www.python.org/security/PSF-2005-001/
- epatch ${WORKDIR}/${PV}/2.2.3-xmlrpc.patch
- epatch ${WORKDIR}/${PV}/2.2.3-db4.patch
- epatch ${WORKDIR}/${PV}/2.2.3-disable_modules_and_ssl.patch
- epatch ${WORKDIR}/${PV}/2.3-add_portage_search_path.patch
- epatch ${WORKDIR}/${PV}/2.2.3-gentoo_py_dontcompile.patch
- epatch ${WORKDIR}/${PV}/2.2.3-fPIC.patch
-}
-
-src_configure() {
- # disable extraneous modules with extra dependencies
- if use build; then
- export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter"
- export PYTHON_DISABLE_SSL=1
- else
- use gdbm \
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
- use berkdb \
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb"
- use readline \
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline"
- use tk \
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter"
- use ncurses \
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel"
- use ssl \
- || export PYTHON_DISABLE_SSL=1
- export PYTHON_DISABLE_MODULES
- fi
-}
-
-src_compile() {
- filter-flags -malign-double
-
- export CFLAGSFORSHARED="-fPIC"
- export OPT="${CFLAGS}"
-
- # adjust makefile to install pydoc into ${D} correctly
- t="${S}/Makefile.pre.in"
- cp ${t} ${t}.orig || die
- sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' ${t}.orig > ${t}
-
- local myopts
- #if we are creating a new build image, we remove the dependency on g++
- if use build && ! use bootstrap || use nocxx
- then
- myopts="--with-cxx=no"
- fi
-
- src_configure
-
- # build python with threads support
- myopts="${myopts} --with-threads"
-
- econf --with-fpectl \
- --infodir='${prefix}'/share/info \
- --mandir='${prefix}'/share/man \
- ${myopts} || die
- emake || die "Parallel make failed"
-}
-
-src_install() {
- dodir /usr
- src_configure
- make install prefix=${D}/usr || die
-
- rm -f ${D}/usr/bin/python
- dodoc README
-
- # install our own custom python-config
- exeinto /usr/bin
- newexe ${FILESDIR}/python-config-${PYVER} python-config
-
- # seems like the build do not install Makefile.pre.in anymore
- # it probably shouldn't - use DistUtils, people!
- insinto /usr/lib/python${PYVER}/config
- doins ${S}/Makefile.pre.in
-
- # While we're working on the config stuff... Let's fix the OPT var
- # so that it doesn't have any opts listed in it. Prevents the problem
- # with compiling things with conflicting opts later.
- dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile
-
- # If USE tk lets install idle
- # Need to script the python version in the path
- if use tk; then
- dodir /usr/lib/python${PYVER}/tools
- cp -r "${S}/Tools/idle" "${D}/usr/lib/python${PYVER}/tools/"
- dosym /usr/lib/python${PYVER}/tools/idle/idle.py /usr/bin/idle.py
- fi
- use ncurses || rm -rf ${D}/usr/lib/python${PYVER}/curses
-}
-
-pkg_postinst() {
- python_makesym
- PYTHON_OVERRIDE_PYVER="2.2" python_mod_optimize
- PYTHON_OVERRIDE_PYVER="2.2" python_mod_optimize -x site-packages -x test ${ROOT}usr/lib/python${SLOT}
-}
-
-pkg_postrm() {
- python_makesym
- python_mod_cleanup /usr/lib/python2.2
-}