From: Bryan Østergaard Date: Wed, 28 Sep 2005 18:13:31 +0000 (+0000) Subject: Bump version to 2.4.2. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75d892f850d3e12c65a6894d5d3d1716f5c995b4;p=gentoo.git Bump version to 2.4.2. Package-Manager: portage-2.0.52-r1 --- diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 32b896f97774..0899e777446c 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/python # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.167 2005/09/17 10:54:52 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.168 2005/09/28 18:13:31 kloeri Exp $ + +*python-2.4.2 (28 Sep 2005) + + 28 Sep 2005; Bryan Østergaard + +files/python-2.4.2-readline.patch, +python-2.4.2.ebuild: + Bump version to 2.4.2. 14 Sep 2005; Aaron Walker python-2.3.5-r2.ebuild: 2.3.5-r2 stable on mips for security bug #104009. diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 8bd49291793e..a296d22d2233 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -11,7 +11,9 @@ MD5 4928085fdd7860dd8104011c9955a7f2 python-2.3.5.ebuild 7799 MD5 ad616f0fecea68a16aea3f97e46c9a72 python-2.4-r3.ebuild 7106 MD5 1297065ab6caf1a8d31f06f4575a5798 python-2.4.1-r1.ebuild 8849 MD5 1df326999058ecec71a274a37ba15514 python-2.4.1.ebuild 8094 -MD5 ec9f6c85a36918cf42b0eff00f94a7fb ChangeLog 27460 +MD5 0b2169037f60f9e451936c89cc92066f ChangeLog 27628 +MD5 84b16b34a0b0c9f2584eb3cabe2abb7f python-2.4.2.ebuild 8873 +MD5 678a7e4660de986e8e22808d18f93686 files/digest-python-2.4.2 66 MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62 @@ -61,10 +63,11 @@ MD5 9bb508a4b15481e4722c1317b9fb02a3 files/python-2.4.1-bindir-libdir.patch 405 MD5 ec1400ca4877399cae56ccefb72a200f files/python-2.4.1-crosscompile.patch 4126 MD5 47ee57ffc9b69af4ff828a3a1ae26afd files/python-2.3-pcre.patch 4278 MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5-r2 66 +MD5 36b36bac050785b8e393dc72f8e51d2f files/python-2.4.2-readline.patch 8628 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDK/YRKf2g/qXtneoRAmBIAKC6fpnXkzd0/WcfuGOKeA5RGyMrmACcCFNY -JitTJOzryTM4VT4Z2JhhYgo= -=rfAm +iD8DBQFDOt1lKf2g/qXtneoRAuynAJ9s1nXb6/bWIVvLdtIIMH5hm2LfnACgnV1g +nhYkv4qMUxgn4A6omoFSVKQ= +=zpdv -----END PGP SIGNATURE----- diff --git a/dev-lang/python/files/digest-python-2.4.2 b/dev-lang/python/files/digest-python-2.4.2 new file mode 100644 index 000000000000..267e62738cf0 --- /dev/null +++ b/dev-lang/python/files/digest-python-2.4.2 @@ -0,0 +1 @@ +MD5 98db1465629693fc434d4dc52db93838 Python-2.4.2.tar.bz2 7853169 diff --git a/dev-lang/python/files/python-2.4.2-readline.patch b/dev-lang/python/files/python-2.4.2-readline.patch new file mode 100644 index 000000000000..7c5ab7d69f74 --- /dev/null +++ b/dev-lang/python/files/python-2.4.2-readline.patch @@ -0,0 +1,287 @@ +diff -u configure configure +--- configure 2005-03-29 00:23:02.000000000 +0100 ++++ configure 2005-04-26 14:14:49.373258580 +0100 +@@ -19306,6 +19306,217 @@ + + fi + ++# what library does readline need to be linked with ++READLINE_SHARED_LIBADD="" ++echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 ++echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6 ++if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lncurses $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char tgetent (); ++int ++main () ++{ ++tgetent (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_ncurses_tgetent=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_ncurses_tgetent=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5 ++echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6 ++if test $ac_cv_lib_ncurses_tgetent = yes; then ++ READLINE_SHARED_LIBADD="-lncurses" ++else ++ echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5 ++echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6 ++if test "${ac_cv_lib_curses_tgetent+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lcurses $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char tgetent (); ++int ++main () ++{ ++tgetent (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_curses_tgetent=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_curses_tgetent=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5 ++echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6 ++if test $ac_cv_lib_curses_tgetent = yes; then ++ READLINE_SHARED_LIBADD="-lcurses" ++else ++ echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5 ++echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6 ++if test "${ac_cv_lib_termcap_tgetent+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltermcap $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char tgetent (); ++int ++main () ++{ ++tgetent (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_termcap_tgetent=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_termcap_tgetent=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5 ++echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6 ++if test $ac_cv_lib_termcap_tgetent = yes; then ++ READLINE_SHARED_LIBADD="-ltermcap" ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ + # check for readline 2.1 + echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5 + echo $ECHO_N "checking for rl_callback_handler_install in -lreadline... $ECHO_C" >&6 +@@ -19313,7 +19524,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline -ltermcap $LIBS" ++LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -19445,7 +19656,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline -ltermcap $LIBS" ++LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -19519,7 +19730,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline -ltermcap $LIBS" ++LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +diff -u configure.in configure.in +--- configure.in 2005-03-29 00:23:34.000000000 +0100 ++++ configure.in 2005-04-26 14:01:03.721206572 +0100 +@@ -2846,10 +2846,18 @@ + [Define this if you have flockfile(), getc_unlocked(), and funlockfile()]) + fi + ++# what library does readline need to be linked with ++READLINE_SHARED_LIBADD="" ++AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"], ++ AC_CHECK_LIB(curses, tgetent, [READLINE_SHARED_LIBADD="-lcurses"], ++ AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"]) ++ ) ++ ) ++ + # check for readline 2.1 + AC_CHECK_LIB(readline, rl_callback_handler_install, + AC_DEFINE(HAVE_RL_CALLBACK, 1, +- [Define if you have readline 2.1]), , -ltermcap) ++ [Define if you have readline 2.1]), , $READLINE_SHARED_LIBADD) + + # check for readline 2.2 + AC_TRY_CPP([#include ], +@@ -2865,12 +2873,12 @@ + # check for readline 4.0 + AC_CHECK_LIB(readline, rl_pre_input_hook, + AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1, +- [Define if you have readline 4.0]), , -ltermcap) ++ [Define if you have readline 4.0]), , $READLINE_SHARED_LIBADD) + + # check for readline 4.2 + AC_CHECK_LIB(readline, rl_completion_matches, + AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, +- [Define if you have readline 4.2]), , -ltermcap) ++ [Define if you have readline 4.2]), , $READLINE_SHARED_LIBADD) + + # also in readline 4.2 + AC_TRY_CPP([#include ], + diff --git a/dev-lang/python/python-2.4.2.ebuild b/dev-lang/python/python-2.4.2.ebuild new file mode 100644 index 000000000000..5a1e4b665871 --- /dev/null +++ b/dev-lang/python/python-2.4.2.ebuild @@ -0,0 +1,282 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2.ebuild,v 1.1 2005/09/28 18:13:31 kloeri 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 multilib versionator toolchain-funcs + +# we need this so that we don't depends on python.eclass +PYVER_MAJOR=$(get_major_version) +PYVER_MINOR=$(get_version_component_range 2) +PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" + +MY_P="Python-${PV}" +S="${WORKDIR}/${MY_P}" +DESCRIPTION="Python is an interpreted, interactive, object-orientated programming language." +HOMEPAGE="http://www.python.org/" +SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2" + +LICENSE="PSF-2.2" +SLOT="2.4" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx" + +DEPEND=">=sys-libs/zlib-1.1.3 + !dev-python/cjkcodecs + !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 + )" + +# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python +# provides the functionality expected from previous pythons. + +# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need +# it to compile python. We just need to ensure that when we install +# python, we definitely have fchksum support. - liquidx + +# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri + +PDEPEND="${DEPEND} dev-python/python-fchksum" + +PROVIDE="virtual/python" + +src_unpack() { + unpack ${A} + cd ${S} + + echo "her er vi.. $(pwd)" + # unnecessary termcap dep in readline (#79013) + epatch ${FILESDIR}/${PN}-2.4.2-readline.patch + # db4.2 support + epatch ${FILESDIR}/${PN}-2.4.1-db4.patch + + # adds support for PYTHON_DONTCOMPILE shell environment to + # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03) + epatch ${FILESDIR}/${PN}-${PYVER}-gentoo_py_dontcompile.patch + epatch ${FILESDIR}/${PN}-${PYVER}-disable_modules_and_ssl.patch + epatch ${FILESDIR}/${PN}-${PYVER}-mimetypes_apache.patch + + # prepends /usr/lib/portage/pym to sys.path + epatch ${FILESDIR}/${PN}-${PYVER}-add_portage_search_path.patch + + epatch ${FILESDIR}/${PN}-2.4.1-libdir.patch + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + Lib/distutils/command/install.py \ + Lib/distutils/sysconfig.py \ + Lib/site.py \ + Makefile.pre.in \ + Modules/Setup.dist \ + Modules/getpath.c \ + setup.py || die + + # add support for struct stat st_flags attribute (bug 94637) + epatch ${FILESDIR}/python-2.4.1-st_flags.patch + + if tc-is-cross-compiler ; then + epatch "${FILESDIR}"/python-2.4.1-bindir-libdir.patch + epatch "${FILESDIR}"/python-2.4.1-crosscompile.patch + fi +} + +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 !X || 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 + + # Seems to no longer be necessary + #[ "${ARCH}" = "amd64" ] && append-flags -fPIC + [ "${ARCH}" = "alpha" ] && append-flags -fPIC + + # http://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flag -O3; then + is-flag -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + export OPT="${CFLAGS}" + + local myconf + #if we are creating a new build image, we remove the dependency on g++ + if use build && ! use bootstrap || use nocxx ; 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 + + if tc-is-cross-compiler ; then + OPT="-O1" LDFLAGS="" \ + ./configure --with-cxx=no || die "cross-configure failed" + emake python Parser/pgen || die "cross-make failed" + mv python hostpython + mv Parser/pgen Parser/hostpgen + make distclean + sed -i \ + -e '/^HOSTPYTHON/s:=.*:=./hostpython:' \ + -e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \ + Makefile.pre.in || die + fi + + tc-export CXX + econf \ + --with-fpectl \ + --enable-shared \ + `use_enable ipv6` \ + --infodir='${prefix}'/share/info \ + --mandir='${prefix}'/share/man \ + --with-threads \ + --with-libc='' \ + ${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 + + # Use correct libdir in python-config + dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/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/$(get_libdir)/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/$(get_libdir)/python${PYVER}/config/Makefile + + # install python-updater in /usr/sbin + dosbin ${FILESDIR}/python-updater + + if use build ; then + rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test} + else + use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test} + use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb + ( use !X || use !tcltk ) && rm -rf ${D}/usr/lib/python${PYVER}/lib-tk + fi + + prep_ml_includes usr/include/python${PYVER} +} + +pkg_postrm() { + python_makesym + python_mod_cleanup /usr/lib/python${PYVER} + [[ "$(get_libdir)" == "lib" ]] || python_mod_cleanup /usr/$(get_libdir)/python${PYVER} +} + +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} + [[ "$(get_libdir)" == "lib" ]] || python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/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.3/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.4/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 + + # try to upgrade to new python automatically - something to think about + #if [ "${ROOT}" = "/" ]; then + # /usr/sbin/python-updater + #fi + + echo + ewarn + ewarn "If you have just upgraded from an older version of python 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-${PYVER}." + ewarn + ewarn "Your original Python is still installed and can be accessed via" + ewarn "/usr/bin/python2.x." + ewarn + ebeep 5 +} + +src_test() { + # PYTHON_DONTCOMPILE=1 breaks test_import + unset PYTHON_DONTCOMPILE + + #skip all tests that fail during emerge but pass without emerge: + #(See bug# 67970) + local skip_tests="subprocess tcl urllib urllib2" + + for test in ${skip_tests} ; do + mv ${S}/Lib/test/test_${test}.py ${T} + done + + make test || die "make test failed" + + for test in ${skip_tests} ; do + mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py + done + + einfo "Portage skipped the following tests which aren't able to run from emerge:" + for test in ${skip_tests} ; do + einfo "test_${test}.py" + done + + einfo "If you'd like to run them, you may:" + einfo "cd /usr/lib/python${PYVER}/test" + einfo "and run the tests separately." +}