floppym 14/05/10 01:44:50
Modified: python-2.7.6-r1.ebuild python-3.4.0.ebuild
python-3.3.5.ebuild ChangeLog
Added: python-3.2.5-r4.ebuild
Log:
Add optional dependency on dev-tcltk/tix, bug 413393 by John Keeping.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
0BBEEA1FEA4843A4)
Revision Changes Path
1.2 dev-lang/python/python-2.7.6-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.6-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.6-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.6-r1.ebuild?r1=1.1&r2=1.2
Index: python-2.7.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.6-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-2.7.6-r1.ebuild 25 Apr 2014 18:33:36 -0000 1.1
+++ python-2.7.6-r1.ebuild 10 May 2014 01:44:50 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.6-r1.ebuild,v
1.1 2014/04/25 18:33:36 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.6-r1.ebuild,v
1.2 2014/05/10 01:44:50 floppym Exp $
EAPI="4"
WANT_AUTOMAKE="none"
@@ -55,6 +55,7 @@
tk? (
>=dev-lang/tk-8.0
dev-tcltk/blt
+ dev-tcltk/tix
)
xml? ( >=dev-libs/expat-2.1 )
)
1.3 dev-lang/python/python-3.4.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.4.0.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.4.0.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.4.0.ebuild?r1=1.2&r2=1.3
Index: python-3.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-3.4.0.ebuild 30 Mar 2014 20:23:57 -0000 1.2
+++ python-3.4.0.ebuild 10 May 2014 01:44:50 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.0.ebuild,v 1.2
2014/03/30 20:23:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.0.ebuild,v 1.3
2014/05/10 01:44:50 floppym Exp $
EAPI="4"
WANT_AUTOMAKE="none"
@@ -43,6 +43,7 @@
tk? (
>=dev-lang/tk-8.0
dev-tcltk/blt
+ dev-tcltk/tix
)
xml? ( >=dev-libs/expat-2.1 )
)
1.2 dev-lang/python/python-3.3.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.5.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.5.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.5.ebuild?r1=1.1&r2=1.2
Index: python-3.3.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-3.3.5.ebuild 28 Mar 2014 01:35:30 -0000 1.1
+++ python-3.3.5.ebuild 10 May 2014 01:44:50 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.5.ebuild,v 1.1
2014/03/28 01:35:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.5.ebuild,v 1.2
2014/05/10 01:44:50 floppym Exp $
EAPI="4"
WANT_AUTOMAKE="none"
@@ -43,6 +43,7 @@
tk? (
>=dev-lang/tk-8.0
dev-tcltk/blt
+ dev-tcltk/tix
)
xml? ( >=dev-libs/expat-2.1 )
)
1.758 dev-lang/python/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.758&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.758&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?r1=1.757&r2=1.758
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v
retrieving revision 1.757
retrieving revision 1.758
diff -u -r1.757 -r1.758
--- ChangeLog 25 Apr 2014 18:33:36 -0000 1.757
+++ ChangeLog 10 May 2014 01:44:50 -0000 1.758
@@ -1,6 +1,12 @@
# ChangeLog for dev-lang/python
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.757
2014/04/25 18:33:36 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.758
2014/05/10 01:44:50 floppym Exp $
+
+*python-3.2.5-r4 (10 May 2014)
+
+ 10 May 2014; Mike Gilbert <[email protected]> +python-3.2.5-r4.ebuild,
+ python-2.7.6-r1.ebuild, python-3.3.5.ebuild, python-3.4.0.ebuild:
+ Add optional dependency on dev-tcltk/tix, bug 413393 by John Keeping.
*python-2.7.6-r1 (25 Apr 2014)
1.1 dev-lang/python/python-3.2.5-r4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.5-r4.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.5-r4.ebuild?rev=1.1&content-type=text/plain
Index: python-3.2.5-r4.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.5-r4.ebuild,v 1.1
2014/05/10 01:44:50 floppym Exp $
EAPI="4"
WANT_AUTOMAKE="none"
WANT_LIBTOOL="none"
inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1
toolchain-funcs multiprocessing
MY_P="Python-${PV}"
PATCHSET_REVISION="1"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="http://www.python.org/";
SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz";
LICENSE="PSF-2"
SLOT="3.2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline
sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
# If you need to apply a patch which requires python for bootstrapping, please
# run the bootstrap code on your dev box and include the results in the
# patchset. See bug 447752.
RDEPEND="app-arch/bzip2
>=sys-libs/zlib-1.1.3
virtual/libffi
virtual/libintl
!build? (
gdbm? ( sys-libs/gdbm[berkdb] )
ncurses? (
>=sys-libs/ncurses-5.2
readline? ( >=sys-libs/readline-4.1 )
)
sqlite? ( >=dev-db/sqlite-3.3.8:3 )
ssl? ( dev-libs/openssl )
tk? (
>=dev-lang/tk-8.0
dev-tcltk/blt
dev-tcltk/tix
)
xml? ( >=dev-libs/expat-2.1 )
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/autoconf-2.65
!sys-devel/gcc[libffi]"
RDEPEND+=" !build? ( app-misc/mime-types )
doc? ( dev-python/python-docs:${SLOT} )"
PDEPEND="app-admin/eselect-python
app-admin/python-updater"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
if [[ "${PV}" =~ ^3\.2(\.[1234])?(_pre)? ]]; then
rm -f "${EROOT}usr/$(get_libdir)/llibpython3.so"
else
die "Deprecated code not deleted"
fi
}
src_prepare() {
# Ensure that internal copies of expat, libffi and zlib are not used.
rm -r Modules/expat
rm -r Modules/_ctypes/libffi*
rm -r Modules/zlib
local excluded_patches
if ! tc-is-cross-compiler; then
excluded_patches="*_all_crosscompile.patch"
fi
EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
epatch "${WORKDIR}/patches"
epatch "${FILESDIR}/python-3.2-CVE-2013-2099.patch"
epatch "${FILESDIR}/CVE-2013-4238_py33.patch"
epatch "${FILESDIR}/python-3.2-issue16248.patch"
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
Lib/distutils/command/install.py \
Lib/distutils/sysconfig.py \
Lib/site.py \
Lib/sysconfig.py \
Lib/test/test_site.py \
Makefile.pre.in \
Modules/Setup.dist \
Modules/getpath.c \
setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
# Disable ABI flags.
sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed
failed"
epatch_user
eautoconf
eautoheader
}
src_configure() {
if use build; then
# Disable extraneous modules with extra dependencies.
export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel
readline _sqlite3 _tkinter _elementtree pyexpat"
export PYTHON_DISABLE_SSL="1"
else
local disable
use gdbm || disable+=" gdbm"
use ncurses || disable+=" _curses _curses_panel"
use readline || disable+=" readline"
use sqlite || disable+=" _sqlite3"
use ssl || export PYTHON_DISABLE_SSL="1"
use tk || disable+=" _tkinter"
use xml || disable+=" _elementtree pyexpat" # _elementtree
uses pyexpat.
export PYTHON_DISABLE_MODULES="${disable}"
if ! use xml; then
ewarn "You have configured Python without XML support."
ewarn "This is NOT a recommended configuration as you"
ewarn "may face problems parsing any XML documents."
fi
fi
if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
fi
if [[ "$(gcc-major-version)" -ge 4 ]]; then
append-flags -fwrapv
fi
filter-flags -malign-double
[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
# https://bugs.gentoo.org/show_bug.cgi?id=50309
if is-flagq -O3; then
is-flagq -fstack-protector-all && replace-flags -O3 -O2
use hardened && replace-flags -O3 -O2
fi
# Run the configure scripts in parallel.
multijob_init
mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
if tc-is-cross-compiler; then
(
multijob_child_init
cd "${WORKDIR}"/${CBUILD} >/dev/null
OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
"${S}"/configure \
--{build,host}=${CBUILD} \
|| die "cross-configure failed"
) &
multijob_post_fork
# The configure script assumes it's buggy when cross-compiling.
export ac_cv_buggy_getaddrinfo=no
export ac_cv_have_long_long_format=yes
fi
# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
tc-export CXX
# The configure script fails to use pkg-config correctly.
# http://bugs.python.org/issue15506
export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
# Set LDFLAGS so we link modules with -lpython3.2 correctly.
# Needed on FreeBSD unless Python 3.2 is already installed.
# Please query BSD team before removing this!
append-ldflags "-L."
local dbmliborder
if use gdbm; then
dbmliborder+="${dbmliborder:+:}gdbm"
fi
cd "${WORKDIR}"/${CHOST}
ECONF_SOURCE=${S} OPT="" \
econf \
--with-fpectl \
--enable-shared \
$(use_enable ipv6) \
$(use_with threads) \
$(use_with wide-unicode) \
--infodir='${prefix}/share/info' \
--mandir='${prefix}/share/man' \
--with-computed-gotos \
--with-dbmliborder="${dbmliborder}" \
--with-libc="" \
--enable-loadable-sqlite-extensions \
--with-system-expat \
--with-system-ffi
if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1"
pyconfig.h; then
eerror "configure has detected that the sem_open function is
broken."
eerror "Please ensure that /dev/shm is mounted as a tmpfs with
mode 1777."
die "Broken sem_open function (bug 496328)"
fi
if tc-is-cross-compiler; then
# Modify the Makefile.pre so we don't regen for the host/ one.
# We need to link the host python programs into $PWD and run
# them from here because the distutils sysconfig module will
# parse Makefile/etc... from argv[0], and we need it to pick
# up the target settings, not the host ones.
sed -i \
-e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
-e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
-e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
Makefile{.pre,} || die "sed failed"
fi
multijob_finish
}
src_compile() {
if tc-is-cross-compiler; then
cd "${WORKDIR}"/${CBUILD}
# Disable as many modules as possible -- but we need a few to
install.
PYTHON_DISABLE_MODULES=$(
sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}"
"${S}"/setup.py | \
egrep -v
'(unicodedata|time|cStringIO|_struct|binascii)'
) \
PTHON_DISABLE_SSL="1" \
SYSROOT= \
emake
# See comment in src_configure about these.
ln python ../${CHOST}/hostpython || die
ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath ||
die
fi
cd "${WORKDIR}"/${CHOST}
emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
# Work around bug 329499. See also bug 413751 and 457194.
if has_version dev-libs/libffi[pax_kernel]; then
pax-mark E python
else
pax-mark m python
fi
}
src_test() {
# Tests will not work when cross compiling.
if tc-is-cross-compiler; then
elog "Disabling tests due to crosscompiling."
return
fi
cd "${WORKDIR}"/${CHOST}
# Skip failing tests.
local skipped_tests="gdb"
for test in ${skipped_tests}; do
mv "${S}"/Lib/test/test_${test}.py "${T}"
done
# Rerun failed tests in verbose mode (regrtest -w).
PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-w" CPPFLAGS=""
CFLAGS="" LDFLAGS="" < /dev/tty
local result="$?"
for test in ${skipped_tests}; do
mv "${T}/test_${test}.py" "${S}"/Lib/test
done
elog "The following tests have been skipped:"
for test in ${skipped_tests}; do
elog "test_${test}.py"
done
elog "If you would like to run them, you may:"
elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
elog "and run the tests separately."
if [[ "${result}" -ne 0 ]]; then
die "emake test failed"
fi
}
src_install() {
local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
cd "${WORKDIR}"/${CHOST}
emake DESTDIR="${D}" altinstall
sed \
-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-e "s/\(PY_LDFLAGS=\).*/\1/" \
-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
# Backwards compat with Gentoo divergence.
dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
# Fix collisions between different slots of Python.
rm "${ED}usr/$(get_libdir)/libpython3.so" || die
if use build; then
rm -fr "${ED}usr/bin/idle${SLOT}"
"${libdir}/"{idlelib,sqlite3,test,tkinter}
else
use elibc_uclibc && rm -fr "${libdir}/test"
use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
use tk || rm -fr "${ED}usr/bin/idle${SLOT}"
"${libdir}/"{idlelib,tkinter,test/test_tk*}
fi
use threads || rm -fr "${libdir}/multiprocessing"
use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
if use examples; then
insinto /usr/share/doc/${PF}/examples
find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
doins -r "${S}"/Tools
fi
insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n'
| \
emake --no-print-directory -s -f - 2>/dev/null)
newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
sed \
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-e "s:@PYDOC@:pydoc${SLOT}:" \
-i "${ED}etc/conf.d/pydoc-${SLOT}"
"${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
local PYTHON=./python \
LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
export LD_LIBRARY_PATH
fi
echo "EPYTHON='${EPYTHON}'" > epython.py
python_domodule epython.py
}
pkg_preinst() {
if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version
">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
python_updater_warning="1"
fi
}
eselect_python_update() {
if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect
python show)" ]]; then
eselect python update
fi
if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f
"${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
eselect python update --python${PV%%.*}
fi
}
pkg_postinst() {
eselect_python_update
if [[ "${python_updater_warning}" == "1" ]]; then
ewarn "You have just upgraded from an older version of Python."
ewarn "You should switch active version of Python ${PV%%.*} and
run"
ewarn "'python-updater [options]' to rebuild Python modules."
fi
}
pkg_postrm() {
eselect_python_update
}
