summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2004-05-13 23:48:36 +0000
committerAlastair Tse <liquidx@gentoo.org>2004-05-13 23:48:36 +0000
commitfedd64eaf8dc6ea96a802138151f4242ee38f021 (patch)
tree027b6379cecd2c99ab62ca128efc8b07a01869ef /dev-lang/python
parentVersion bump (Manifest recommit) (diff)
downloadgentoo-2-fedd64eaf8dc6ea96a802138151f4242ee38f021.tar.gz
gentoo-2-fedd64eaf8dc6ea96a802138151f4242ee38f021.tar.bz2
gentoo-2-fedd64eaf8dc6ea96a802138151f4242ee38f021.zip
version bump to 2.3.4_rc1, stablize 2.3.3-r1
Diffstat (limited to 'dev-lang/python')
-rw-r--r--dev-lang/python/Manifest39
-rw-r--r--dev-lang/python/files/digest-python-2.3.4_rc11
-rw-r--r--dev-lang/python/files/python-updater18
-rw-r--r--dev-lang/python/python-2.3.3-r1.ebuild4
-rw-r--r--dev-lang/python/python-2.3.4_rc1.ebuild189
5 files changed, 222 insertions, 29 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 303f0cad6791..2d0a642b4bbd 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,30 +1,33 @@
-MD5 164d6890dbe12fe1ddfc014f78a05173 python-2.3.3-r1.ebuild 6015
-MD5 93b7662124de176bfe45c4086578e583 python-2.2.3-r5.ebuild 4343
-MD5 14fe9278f03360e1dc9c190e798c40c7 python-2.3.3.ebuild 5354
-MD5 30ef34267e56472ca4108138d9a52640 python-2.2.2.ebuild 3020
-MD5 a9096f479423e2fb5da2afac23238751 python-2.1.3-r1.ebuild 2335
MD5 e679b9597cb5796a18d916ed3476a850 ChangeLog 16391
MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
-MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
-MD5 85f269cd745feae3953f7e35215e242d files/python-updater 8138
-MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
+MD5 a9096f479423e2fb5da2afac23238751 python-2.1.3-r1.ebuild 2335
+MD5 30ef34267e56472ca4108138d9a52640 python-2.2.2.ebuild 3020
+MD5 93b7662124de176bfe45c4086578e583 python-2.2.3-r5.ebuild 4343
+MD5 14fe9278f03360e1dc9c190e798c40c7 python-2.3.3.ebuild 5354
+MD5 574be6db3987afa6cd5516f0bb28bf17 python-2.3.3-r1.ebuild 6014
+MD5 574be6db3987afa6cd5516f0bb28bf17 python-2.3.4_rc1.ebuild 6014
+MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
+MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3 66
+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 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732
-MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614
MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
+MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767
-MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
-MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
+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 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015
MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
-MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607
-MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
+MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
+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 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
-MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
+MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
+MD5 69dfdde8a2e880656ba066253dee80ee files/python-updater 8087
+MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614
MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3-r1 66
-MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
+MD5 85f269cd745feae3953f7e35215e242d files/python-updater.~1.6.~ 8138
+MD5 3dcb08fe99cfbfb0394dc84dfbc93b11 files/digest-python-2.3.4_rc1 68
diff --git a/dev-lang/python/files/digest-python-2.3.4_rc1 b/dev-lang/python/files/digest-python-2.3.4_rc1
new file mode 100644
index 000000000000..2bf5741846ca
--- /dev/null
+++ b/dev-lang/python/files/digest-python-2.3.4_rc1
@@ -0,0 +1 @@
+MD5 b5a8fe66136104409ad1d68d33c21628 Python-2.3.4c1.tar.bz2 7193312
diff --git a/dev-lang/python/files/python-updater b/dev-lang/python/files/python-updater
index cfc1ff9dcd43..da4112db78cd 100644
--- a/dev-lang/python/files/python-updater
+++ b/dev-lang/python/files/python-updater
@@ -236,42 +236,42 @@ OUTPUT_PKGS_FAILED=""
for pkg in ${PKGS_FAILED}; do OUTPUT_PKGS_FAILED="${OUTPUT_PKGS_FAILED} \=$pkg"; done
if [ -n "${PKGS_FAILED}" -o -n "${PKGS_MISSING}" -o -n "${PKGS_MASKED}" ]; then
- ewarn " "
+ echo
ewarn "************************************************************"
ewarn "* Packages that still need to be manually emerged : *"
ewarn "************************************************************"
if [ -n "${OUTPUT_PKGS_MASKED}" ]; then
- ewarn " "
+ echo
ewarn " Masked Packages:"
ewarn " ----------------"
ewarn " Unmask the following packages (at your own risk) and "
ewarn " emerge them using this command after removing the '-p'"
ewarn " parameter."
- ewarn " "
+ echo
ewarn " emerge -p ${OUTPUT_PKGS_MASKED}"
- ewarn " "
+ echo
fi
if [ -n "${OUTPUT_PKGS_MISSING}" ]; then
- ewarn " "
+ echo
ewarn " Missing Packages:"
ewarn " -----------------"
ewarn " These packages need to be updated because their versions do"
ewarn " not exist in portage anymore."
- ewarn " "
+ echo
for x in ${OUTPUT_PKGS_MISSING}; do
echo " ${x}"
done
fi
if [ -n "${OUTPUT_PKGS_FAILED}" ]; then
- ewarn " "
+ echo
ewarn " Failed Packaged:"
ewarn " ----------------"
ewarn " These packages have failed and need to be re-emerged again."
ewarn " Alternatively, try re-running this script again to see if it"
ewarn " can be fixed."
- ewarn " "
+ echo
ewarn " emerge -p ${OUTPUT_PKGS_FAILED}"
- ewarn " "
+ echo
fi
elog "Python update completed with errors."
diff --git a/dev-lang/python/python-2.3.3-r1.ebuild b/dev-lang/python/python-2.3.3-r1.ebuild
index 22662a615fec..93346eec4b66 100644
--- a/dev-lang/python/python-2.3.3-r1.ebuild
+++ b/dev-lang/python/python-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 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.3-r1.ebuild,v 1.4 2004/04/27 14:08:34 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3-r1.ebuild,v 1.5 2004/05/13 23:48:35 liquidx Exp $
# NOTE about python-portage interactions :
# - Do not add a pkg_setup() check for a certain version of portage
@@ -23,7 +23,7 @@ IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X"
LICENSE="PSF-2.2"
SLOT="2.3"
-KEYWORDS="~x86 ~ppc ~sparc arm ~hppa ~amd64 s390 ~alpha ~ia64"
+KEYWORDS="x86 ~ppc ~sparc arm ~hppa ~amd64 s390 ~alpha ~ia64"
# ~mips ~arm"
DEPEND="virtual/glibc
diff --git a/dev-lang/python/python-2.3.4_rc1.ebuild b/dev-lang/python/python-2.3.4_rc1.ebuild
new file mode 100644
index 000000000000..620e369c8265
--- /dev/null
+++ b/dev-lang/python/python-2.3.4_rc1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2004 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.4_rc1.ebuild,v 1.1 2004/05/13 23:48:35 liquidx Exp $
+
+# NOTE about python-portage interactions :
+# - Do not add a pkg_setup() check for a certain version of portage
+# in dev-lang/python. It _WILL_ stop people installing from
+# Gentoo 1.4 images.
+
+inherit eutils 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}.tar.bz2"
+HOMEPAGE="http://www.python.org"
+
+IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X"
+LICENSE="PSF-2.2"
+SLOT="2.3"
+
+KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64"
+# ~mips
+
+DEPEND="virtual/glibc
+ >=sys-libs/zlib-1.1.3
+ !arm? (
+ !build? ( X? ( tcltk? ( >=dev-lang/tk-8.0 ) )
+ ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
+ berkdb? ( >=sys-libs/db-3.1 )
+ gdbm? ( sys-libs/gdbm )
+ ssl? ( dev-libs/openssl )
+ doc? ( =dev-python/python-docs-${PV}* )
+ dev-libs/expat
+ )
+ )"
+
+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}
+ # adds /usr/lib/portage/pym to sys.path - liquidx (08 Oct 03)
+ # prepends /usr/lib/portage/pym to sys.path - liquidx (12 Apr 04)
+ epatch ${FILESDIR}/${PN}-2.3-add_portage_search_path_take_2.patch
+ # adds support for PYTHON_DONTCOMPILE shell environment to
+ # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
+ epatch ${FILESDIR}/${PN}-2.3-gentoo_py_dontcompile.patch
+ epatch ${FILESDIR}/${PN}-2.3.2-disable_modules_and_ssl.patch
+ epatch ${FILESDIR}/${PN}-2.3-mimetypes_apache.patch
+ epatch ${FILESDIR}/${PN}-2.3-db4.2.patch
+}
+
+src_configure() {
+ # disable extraneous modules with extra dependencies
+ if [ -n "`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"
+ [ -z "use X" -o -z "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
+ echo $PYTHON_DISABLE_MODULES
+ fi
+}
+
+src_compile() {
+ filter-flags -malign-double
+
+ [ "${ARCH}" = "hppa" ] && append-flags -fPIC
+ [ "${ARCH}" = "alpha" ] && append-flags -fPIC
+ [ "${ARCH}" = "amd64" ] && 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
+
+ # super-secret switch. don't use this unless you know what you're
+ # doing. enabling UCS2 support will break your existing python
+ # modules
+ use ucs2 \
+ && myconf="${myconf} --enable-unicode=ucs2" \
+ || myconf="${myconf} --enable-unicode=ucs4"
+
+ src_configure
+
+ econf --with-fpectl \
+ --enable-shared \
+ `use_enable ipv6` \
+ --infodir='${prefix}'/share/info \
+ --mandir='${prefix}'/share/man \
+ --with-threads \
+ --with-cxx=no \
+ ${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
+
+ # install python-updater in /usr/sbin
+ dosbin ${FILESDIR}/python-updater
+}
+
+pkg_postrm() {
+ python_makesym
+ python_mod_cleanup /usr/lib/python2.3
+}
+
+pkg_postinst() {
+ local myroot
+ myroot=$(echo $ROOT | sed 's:/$::')
+
+
+ python_makesym
+ python_mod_optimize
+ python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER}
+
+ # workaround possible python-upgrade-breaks-portage situation
+ if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
+ if [ -f ${myroot}/usr/lib/python2.2/site-packages/portage.py ]; then
+ einfo "Working around possible python-portage upgrade breakage"
+ mkdir -p ${myroot}/usr/lib/portage/pym
+ cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
+ python_mod_optimize ${myroot}/usr/lib/portage/pym
+ fi
+ fi
+
+ echo
+ ewarn
+ ewarn "If you have just upgraded from python-2.2.x you will need to run:"
+ ewarn
+ ewarn "/usr/sbin/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
+}