Delete old 3.1 release

Package-Manager: portage-2.1.12.2

4 files changed, 5 insertions, 371 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 0b1affa2..61425779 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 May 2013; Bertrand Jacquin <beber@meleeweb.net>
+  -files/python-3.1.3-BJA-cross.diff, -python-3.1.3-r1.ebuild:
+  dev-lang/python: Delete old 3.1 release
+
 *python-2.7.3-r3 (30 May 2013)
 
   30 May 2013; Bertrand Jacquin <beber@meleeweb.net>
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index fd2b0b05..0f061314 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,12 +1,8 @@
 AUX pydoc.conf 279 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8 WHIRLPOOL 1ba44797765939d7c0bcbecb08cb6201eeff9b134d4d3caef9339729dcad9f258e20b16db5f369f49b378df3c91e530115dbce5ce3595d71cd325a48793ac814
 AUX pydoc.init 741 SHA256 c2611330da516682d9a489e21b426550d6896d57d1b15eaafde3e8c518931460 WHIRLPOOL b9fe7bafcd984de6b80d58961fb31704ea40235a8ac6a896f2c9dbc015db11b0c711320e6687ac88e6621a8a217d5b8468b4e17f32ae25592b0708d894f0fc44
 AUX python-2.7.3-BJA-cross.diff 791 SHA256 d062e76017795ea11a560d37465dcde8be26ae79e430037b0fb3b33376562930 WHIRLPOOL a66f2eb9865d73d777ce19ce8ea7df333d1842b9e893087962c7f021ff89e0a66645feec7ce44c03fe7c8e0a7042cfd6be34a97c29672117eabae4212a6cab66
-AUX python-3.1.3-BJA-cross.diff 931 SHA256 a55958807d2d226921e299bba899cc566186e66cf2d1d6a64bdf701c0898ece7 WHIRLPOOL b4857c0988592ad6bde7d5ea834b6a20ef9982a0c3f96e45e3e74f95c23951af4312825b9aa4705d47bc9d3130699e59e638ff6f2bc1ef46e06840b017461609
 DIST Python-2.7.3.tar.bz2 11793433 SHA256 726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c WHIRLPOOL c980f465066ef0881d8b1141c6d8d4c54991c765fc258ddcd37ed2ec483f0686b8cc4cd076c56e0c8fa8891852905bed74d70b3f5071210cef7a9713542ab1a8
-DIST Python-3.1.3.tar.bz2 9875464 SHA256 77f6f41a51be4ca85d83670405c8281dd1237bb00d8be8a7560cb3ccdf5558cb
 DIST python-gentoo-patches-2.7.3-1.tar.bz2 13858 SHA256 51f6981ba02064998dfb020725c33233641b3743c4f5cf04091657313a49b8fd WHIRLPOOL b8c4e83354f913eb50b9c91ad558a4cc042a395fd4bd7227cc2e5e6ede8962eb699d44ec3b3a05b47ea658fce2e90b2d0e035282d9737d602f313bad1a7d314a
-DIST python-gentoo-patches-3.1.3-r1.tar.bz2 13730 SHA256 f23056436b298ed0ff9823b52902aaaa63eae0c4585a4a19e47571685127631e
 EBUILD python-2.7.3-r3.ebuild 11665 SHA256 976876f4263f8b09d7419a2731409fae60acc986a9da37f5af555648c4d74dbf WHIRLPOOL 0a7bd167e94223b2ba5523139515d87501aa57f84ac1e8afca7f134999cdd98ed0a842bffd716415acbf3f5ade9ffae9029b4c43440de75f01a92b606f1cd0d6
-EBUILD python-3.1.3-r1.ebuild 9839 SHA256 2b0e1f6f5698362dc9fcf467696f0f7571edd3c0baaa2b0f6efaf180d01ee441 WHIRLPOOL 17a919a49548a4b4940c880e1e6900b9be83ae49fde8b29dab348f453cd74cfd1c998dd31d4e16f1bf8010540a632779222398b662f048b2496383a3559abf00
-MISC ChangeLog 1630 SHA256 a1320868208cce8601b0a4fdc80b97333b9f5cc236029dd794a1c763bf8115eb WHIRLPOOL c280615e95e19d522cd3df2c36474ac2bfda623712edf83f5cda60f7fa3e716e790aebf8c0bfdf00e5f7ba406aaa4a122d3d929c7f9bf5426e66a71508970deb
+MISC ChangeLog 1789 SHA256 3c3a58a1d260f56c097c3965d6aa5c23a1929abea8a9a09f210ae7bd3e683205 WHIRLPOOL 51be7fc1932961b3bee7674ad4e3cebe5c2dfd000ed606d9b98047377ba0f53add15aa9395cece85d7a46c3d9e93d3f7f427a26af5fdf977b943ec6d139f8ba9
 MISC metadata.xml 646 SHA256 1a7d28445660381ad5989180cfe129cf6ae58c080cf489c504d96eed437d57a7 WHIRLPOOL 51e5c8521020b00a16a2a8cba2dea477ff1d08594e047a09e8865d9697c1660fe8310f2639867960022e2e72757998cc30864d8d8f1e420012f4a13159aff9e9
diff --git a/dev-lang/python/files/python-3.1.3-BJA-cross.diff b/dev-lang/python/files/python-3.1.3-BJA-cross.diff
deleted file mode 100644
index 2c45f528..00000000
--- a/dev-lang/python/files/python-3.1.3-BJA-cross.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- Python-3.1.3/configure.in.ori	2011-10-02 22:30:36.695328093 +0200
-+++ Python-3.1.3/configure.in	2011-10-02 22:37:37.248498660 +0200
-@@ -3533,6 +3533,7 @@
- 
- # Multiprocessing check for broken sem_getvalue
- AC_MSG_CHECKING(for broken sem_getvalue)
-+AC_CACHE_VAL(ac_cv_broken_sem_getvalue,
- AC_TRY_RUN([
- #include <unistd.h>
- #include <fcntl.h>
-@@ -3555,10 +3556,16 @@
-   return res==-1 ? 1 : 0;
- }
- ]
--,AC_MSG_RESULT(no),
-- AC_MSG_RESULT(yes)
--  AC_DEFINE(HAVE_BROKEN_SEM_GETVALUE, 1, define to 1 if your sem_getvalue is broken.)
-+, ac_cv_broken_sem_getvalue=no,
-+  ac_cv_broken_sem_getvalue=yes,
-+  ac_cv_broken_sem_getvalue=no)
- )
-+AC_MSG_RESULT($ac_cv_broken_sem_getvalue)
-+if test $ac_cv_broken_sem_getvalue = yes
-+then
-+  AC_DEFINE(HAVE_BROKEN_SEM_GETVALUE, 1,
-+    [define to 1 if your sem_getvalue is broken])
-+fi
- 
- # determine what size digit to use for Python's longs
- AC_MSG_CHECKING([digit size for Python's longs])
diff --git a/dev-lang/python/python-3.1.3-r1.ebuild b/dev-lang/python/python-3.1.3-r1.ebuild
deleted file mode 100644
index c8b75505..00000000
--- a/dev-lang/python/python-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.3-r1.ebuild,v 1.9 2011/08/27 21:09:43 neurogeek Exp $
-
-EAPI="3"
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib python toolchain-funcs
-
-if [[ "${PV}" == *_pre* ]]; then
-	inherit subversion
-
-	ESVN_PROJECT="python"
-	ESVN_REPO_URI="http://svn.python.org/projects/python/branches/release31-maint"
-	ESVN_REVISION=""
-else
-	MY_PV="${PV%_p*}"
-	MY_P="Python-${MY_PV}"
-fi
-
-PATCHSET_REVISION="1"
-
-DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
-HOMEPAGE="http://www.python.org/"
-if [[ "${PV}" == *_pre* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.bz2
-		mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
-fi
-
-LICENSE="PSF-2"
-SLOT="3.1"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-RDEPEND=">=app-admin/eselect-python-20091230
-		>=sys-libs/zlib-1.1.3
-		virtual/libffi
-		virtual/libintl
-		!build? (
-			gdbm? ( sys-libs/gdbm )
-			ncurses? (
-				>=sys-libs/ncurses-5.2
-				readline? ( >=sys-libs/readline-4.1 )
-			)
-			sqlite? ( >=dev-db/sqlite-3.3.3:3 )
-			ssl? ( dev-libs/openssl )
-			tk? ( >=dev-lang/tk-8.0 )
-			xml? ( >=dev-libs/expat-2 )
-		)"
-DEPEND="${RDEPEND}
-		$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
-		virtual/pkgconfig
-		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] && echo "doc? ( dev-python/sphinx )")
-		!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( dev-python/python-docs:${SLOT} )")"
-PDEPEND="app-admin/python-updater"
-
-if [[ "${PV}" != *_pre* ]]; then
-	S="${WORKDIR}/${MY_P}"
-fi
-
-pkg_setup() {
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then
-			# Update micro version, release level and version string.
-			local micro_version="${PV%_pre*}"
-			micro_version="${micro_version##*.}"
-			local version_string="${PV%.*}.$((${micro_version} - 1))+"
-			sed \
-				-e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \
-				-e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \
-				-e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \
-				-i Include/patchlevel.h || die "sed failed"
-		fi
-	fi
-
-	local excluded_patches
-	if ! tc-is-cross-compiler; then
-		excluded_patches="*_all_crosscompile.patch"
-	fi
-
-	local patchset_dir
-	if [[ "${PV}" == *_pre* ]]; then
-		patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
-	else
-		patchset_dir="${WORKDIR}/${MY_PV}"
-	fi
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
-
-	epatch "${FILESDIR}/${P}-BJA-cross.diff"
-
-	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 "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	if ! use wininst; then
-		# Remove Microsoft Windows executables.
-		rm Lib/distutils/command/wininst-*.exe
-	fi
-
-	if [[ "${PV}" == *_pre* ]]; then
-		sed -e "s/\(-DSVNVERSION=\).*\( -o\)/\1\\\\\"${ESVN_REVISION}\\\\\"\2/" -i Makefile.pre.in || die "sed failed"
-	fi
-
-	eautoreconf
-}
-
-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
-
-	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || 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 "sed failed"
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython3.1 correctly.
-	# Needed on FreeBSD unless Python 3.1 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	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="" \
-		--with-system-ffi
-}
-
-src_compile() {
-	emake EPYTHON="python${PV%%.*}" || die "emake failed"
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	if ! use threads; then
-		ewarn "Disabling tests due to USE=\"-threads\""
-		return
-	fi
-
-	# Byte compiling should be enabled here.
-	# Otherwise test_import fails.
-	python_enable_pyc
-
-	# Skip failing tests.
-	local skip_tests="distutils"
-
-	for test in ${skip_tests}; do
-		mv "${S}/Lib/test/test_${test}.py" "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skip_tests}; do
-		mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skip_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
-	elog "and run the tests separately."
-
-	python_disable_pyc
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
-	python_clean_installation_image -q
-
-	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc3" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle3" "${ED}usr/bin/idle${SLOT}"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/test"
-		use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
-
-	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}/Tools" || die "doins failed"
-	fi
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
-	sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-}
-
-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
-
-	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should run 'python-updater \${options}' to rebuild Python modules."
-		ewarn
-		ewarn "\e[1;31m************************************************************************\e[0m"
-		ewarn
-
-		local n
-		for ((n = 0; n < 12; n++)); do
-			echo -ne "\a"
-			sleep 1
-		done
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-
-	python_mod_cleanup $(python_get_libdir)
-}