diff options
author | Alastair Tse <liquidx@gentoo.org> | 2003-12-05 16:48:20 +0000 |
---|---|---|
committer | Alastair Tse <liquidx@gentoo.org> | 2003-12-05 16:48:20 +0000 |
commit | aae41e6911baebf81f0b66fbf638e0d51cfb1e1a (patch) | |
tree | 3ba04d089df9a09ad6a5ca31140143d0dae13065 /dev-lang | |
parent | unmasking python-2.3 for ~x86 (diff) | |
download | gentoo-2-aae41e6911baebf81f0b66fbf638e0d51cfb1e1a.tar.gz gentoo-2-aae41e6911baebf81f0b66fbf638e0d51cfb1e1a.tar.bz2 gentoo-2-aae41e6911baebf81f0b66fbf638e0d51cfb1e1a.zip |
cleanup
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/python/Manifest | 32 | ||||
-rw-r--r-- | dev-lang/python/files/digest-python-2.3.2-r1 | 1 | ||||
-rw-r--r-- | dev-lang/python/python-2.3.2-r1.ebuild | 159 |
3 files changed, 15 insertions, 177 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 5aa5d0d87886..85cea985173b 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,33 +1,31 @@ MD5 9c35bc39ecf6541f715a6ca62f2b8d2f ChangeLog 11135 +MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221 MD5 58b06d58bccd371fcbf1b781164c75a9 python-2.1.3-r1.ebuild 2345 +MD5 f7959cf61958991a7e25f83a4e8b2ff8 python-2.2.1-r5.ebuild 2912 +MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027 +MD5 58ed89f3cc48f16f8bc96b76490e5b6a python-2.2.3-r1.ebuild 3293 MD5 2fc8ae655f6f97feaa9c285d70bb7f2c python-2.2.3-r5.ebuild 4328 MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999 -MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221 -MD5 58ed89f3cc48f16f8bc96b76490e5b6a python-2.2.3-r1.ebuild 3293 MD5 c4daff95a8ff22a0d7f6f9012dcc0dbe python-2.3.2-r2.ebuild 5279 -MD5 f7959cf61958991a7e25f83a4e8b2ff8 python-2.2.1-r5.ebuild 2912 -MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027 -MD5 cca542f96b13c06fa4f7cd6626182a6c python-2.3.2-r1.ebuild 4817 -MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 -MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767 -MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997 -MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3 62 -MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178 -MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r1 62 MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947 +MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 62 MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62 +MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3 62 +MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r1 62 +MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62 +MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r2 62 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152 +MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997 MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220 -MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178 -MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178 MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212 -MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r1 62 +MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767 MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732 MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607 MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478 +MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285 +MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178 +MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178 +MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178 MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178 MD5 85f269cd745feae3953f7e35215e242d files/python-updater 8138 -MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285 -MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62 -MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r2 62 diff --git a/dev-lang/python/files/digest-python-2.3.2-r1 b/dev-lang/python/files/digest-python-2.3.2-r1 deleted file mode 100644 index 416c04df6929..000000000000 --- a/dev-lang/python/files/digest-python-2.3.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 f54d7a529d444994b4b33429bbb45479 Python-2.3.2.tgz 8459427 diff --git a/dev-lang/python/python-2.3.2-r1.ebuild b/dev-lang/python/python-2.3.2-r1.ebuild deleted file mode 100644 index 86c37f7f481d..000000000000 --- a/dev-lang/python/python-2.3.2-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.2-r1.ebuild,v 1.9 2003/11/13 09:01:53 liquidx Exp $ - -inherit flag-o-matic python - -MY_PV=${PV/_rc/c} -PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`" -PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`" -PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" - -S="${WORKDIR}/Python-${MY_PV}" -DESCRIPTION="A really great language" -SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${MY_PV}.tgz" -HOMEPAGE="http://www.python.org" - -IUSE="ncurses ssl readline tcltk berkdb bootstrap ipv6 cjk build" -LICENSE="PSF-2.2" -SLOT="2.3" - -KEYWORDS="~x86" -# "~ppc ~sparc ~alpha ~mips ~hppa ~arm" - -DEPEND="virtual/glibc - >=sys-libs/zlib-1.1.3 - >=sys-libs/zlib-1.1.3 - !build? ( tcltk? ( >=dev-lang/tk-8.0 ) - ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) - berkdb? ( >=sys-libs/db-3.1 ) - dev-libs/expat - 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} - # adds /usr/lib/portage/pym to sys.path - liquidx (08 Oct 03) - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.3.2-disable_modules_and_ssl.patch - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.3-add_portage_search_path.patch - # adds support for PYTHON_DONTCOMPILE shell environment to - # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03) - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.3-gentoo_py_dontcompile.patch -} - -src_configure() { - # disable extraneous modules with extra dependencies - if [ -n "`use build`" ]; then - export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _socket _curses _curses_panel _tkinter" - export PYTHON_DISABLE_SSL=1 - else - use berkdb \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb" - use readline \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline" - use tcltk \ - || 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 - - [ "${ARCH}" = "hppa" ] && append-flags -fPIC - [ "${ARCH}" = "alpha" ] && append-flags -fPIC - export OPT="${CFLAGS}" - - local myconf - #if we are creating a new build image, we remove the dependency on g++ - if [ "`use build`" -a ! "`use bootstrap`" ] - then - myconf="--with-cxx=no" - fi - - src_configure - - # FIXME: (need to verify the consequences of this, probably breaks tkinter?) - # use unicode ucs4 if cjk, otherwise use ucs2. - use cjk \ - && myconf="${myconf} --enable-unicode=ucs4" \ - || myconf="${myconf} --enable-unicode=ucs2" - - econf --with-fpectl \ - --enable-shared \ - `use_enable ipv6` \ - --infodir='${prefix}'/share/info \ - --mandir='${prefix}'/share/man \ - --with-threads \ - ${myconf} || die - emake || die "Parallel make failed" -} - -src_install() { - dodir /usr - src_configure - make DESTDIR="${D}" altinstall || die - - # install our own custom python-config - exeinto /usr/bin - newexe ${FILESDIR}/python-config-${PYVER} python-config - - # The stuff below this line extends from 2.1, and should be deprecated - # in 2.3, or possibly can wait till 2.4 - - # 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 - -} - -pkg_postrm() { - python_makesym - python_mod_cleanup -} - -pkg_postinst() { - python_makesym - python_mod_optimize - python_mod_optimize -x site-packages -x test ${ROOT}usr/lib/python${PYVER} - - echo - ewarn - ewarn "If you have just upgraded from python-2.2.x you will need to run:" - ewarn - ewarn "${PORTDIR}/dev-lang/python/files/python-updater" - ewarn - ewarn "This will automatically rebuild all the python dependent modules" - ewarn "to run with python-2.3." - ewarn - ewarn "Python 2.2 is still installed and can be accessed via /usr/bin/python2.2." - ewarn "Portage-2.0.49-r8 and below will continue to use python-2.2.x, so" - ewarn "think twice about uninstalling it, otherwise your system will break." - ewarn - echo -ne "\a"; sleep 1 - echo -ne "\a"; sleep 1 - echo -ne "\a"; sleep 1 - echo -ne "\a"; sleep 1 - echo -ne "\a"; sleep 1 - -} |