[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-python/

[Michał Górny]

commit:     940a4882df87dca5f2db33bdec5280631688e8ac
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 19:45:46 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 20:29:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=940a4882

app-eselect/eselect-python: Remove intermediate masked versions

 app-eselect/eselect-python/Manifest                |  1 -
 .../eselect-python-20151117-r3.ebuild              | 89 ----------------------
 .../eselect-python/eselect-python-20160207.ebuild  | 39 ----------
 3 files changed, 129 deletions(-)

diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index 84bb0fe..9e45852 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -3,5 +3,4 @@ DIST eselect-python-20131210.tar.bz2 71802 SHA256 61ff5a5a3ae7982c6ffd503886cbcd
 DIST eselect-python-20140115.tar.bz2 71910 SHA256 5898ee19015ae905168e8b7aa76552b96f691285ab77c426b6a9238ecf742e45 SHA512 65d6a6b9dfa0a0f4bea5352f965bed8942a16382135edea093342fa79a824d114b900cbcf607490f260b4ce4e5a2eb57872169e5494f8e6e65f41dd63cd5d335 WHIRLPOOL 633bca3e8a87e04c54a3790bb207da92d41af604cce7f8600c5317f6a759c55efbd3e5ba658e893d2d079248d2dadb1a0bb60248960e3d20cd766768a228d8c5
 DIST eselect-python-20140125.tar.bz2 72102 SHA256 ee7b470f7facc42285bab7f4b947280741515a85c9067339511c219248f8fdfb SHA512 94d4eb5a1af365c6f56a6fc2b75298018267cd4f6004f30b2e4d0c4744d3e82b33f6c82e6f0ea0f15132d5157c3ace99fa167bbf3ebada46edd2e005ca96eb51 WHIRLPOOL 70d5f9af2929507d26e56080ce934066d2de5f16030dfd63b016215465ad5fc89eb952d64cc545c7058d146108e26925741d2c8fbaba08abba1a5cae7b0c23b6
 DIST eselect-python-20151117.tar.bz2 62793 SHA256 6f2912ae4d4fc12949ae0c9bb8b93b3a3a8c372336c2138c758f042f91484561 SHA512 3e680f8c851251176d6bb916d003e421e4b414aa9cc59e20cb15d454a3251cdf1e587828e9b2a5db461641f277e3b764ca172f4466fe3f6ef9679a9a05a71732 WHIRLPOOL a2e4ca676ead692b08a6194fb4bf5dabdd383ad158f45a17cb21c59022af139b0646fe39b0f4c9b540c80c4c2a04362c75f90e3c7f1506056b7b0f01e5e51474
-DIST eselect-python-20160207.tar.bz2 57454 SHA256 1da389c71b2b133ce56daae199334e920766d78e9e424d66cd76753a99b19a82 SHA512 ff83fb43df85ef0989ab9f557800e9ef97cd5b4e01316bc4f2b6fbe34e87b3fd5b4b1fb0081c11e2ff1ba42777c50d243eea306ec9211bf820211708f2fc395a WHIRLPOOL db63a490006d5fc53642448a3b19154bc48597a57b052413c42c7713a56665edae1505f9a2f432f88bb37ae5d7563743fc3a25b929896ca3e55a2365e2cd19c4
 DIST eselect-python-20160222.tar.bz2 48584 SHA256 be266ed02c60d4c44d07b575af87e4f9d3f952e387d8edb98edabbb72e855b75 SHA512 d0e424887594a1ffc0ce4f141e5c7d73763a49a2ec209b55ac2978a0bf82db9eaa3f07cc1c6650f609e6003f8292a260ce802c89f973b94c8a9a7c1d1ca84e3c WHIRLPOOL ba52a724fd3478b891d0c6a495885601bcc7f3bda713a5fd2e1c07ca1230d8a542ceb627329675f9935c07735e4de4a43d3d64d44771434cc4bbe9fb1cec6003

diff --git a/app-eselect/eselect-python/eselect-python-20151117-r3.ebuild b/app-eselect/eselect-python/eselect-python-20151117-r3.ebuild
deleted file mode 100644
index 7c478b0..0000000
--- a/app-eselect/eselect-python/eselect-python-20151117-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-else
-	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Eselect module for management of multiple Python versions"
-HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3
-	>=dev-lang/python-exec-2.2_pre:2
-	!<dev-lang/python-2.7.10-r4:2.7
-	!<dev-lang/python-3.3.5-r4:3.3
-	!<dev-lang/python-3.4.3-r4:3.4
-	!<dev-lang/python-3.5.0-r3:3.5"
-
-# Those files are copied from built package
-QA_PREBUILT="
-	/usr/bin/python
-	/usr/bin/python2
-	/usr/bin/python3"
-
-src_prepare() {
-	[[ ${PV} == "99999999" ]] && eautoreconf
-}
-
-src_install() {
-	keepdir /etc/env.d/python
-	emake DESTDIR="${D}" install || die
-
-	local f
-	for f in python{,2,3}; do
-		# can't use symlinks here since random stuff
-		# loves to do readlink on sys.executable...
-		newbin "${EPREFIX}/usr/lib/python-exec/python-exec2-c" "${f}"
-	done
-	for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
-		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
-	done
-}
-
-pkg_preinst() {
-	local py
-
-	# Copy python[23] selection from the old format (symlink)
-	for py in 2 3; do
-		# default to none
-		declare -g "PREV_PYTHON${py}"=
-
-		if [[ -L ${EROOT}/usr/bin/python${py} ]]; then
-			local target=$(readlink "${EROOT}/usr/bin/python${py}")
-
-			# check if it's actually old eselect symlink
-			if [[ ${target} == python?.? ]]; then
-				declare -g "PREV_PYTHON${py}=${target}"
-			fi
-		fi
-	done
-}
-
-pkg_postinst() {
-	local py
-
-	if has_version 'dev-lang/python'; then
-		eselect python update --if-unset
-	fi
-
-	for py in 2 3; do
-		local pyvar=PREV_PYTHON${py}
-		if [[ -n ${!pyvar} ]]; then
-			einfo "Setting Python${py} to ${!pyvar}"
-			eselect python set "--python${py}" "${!pyvar}"
-		elif has_version "=dev-lang/python-${py}*"; then
-			eselect python update "--python${py}" --if-unset
-		fi
-	done
-}

diff --git a/app-eselect/eselect-python/eselect-python-20160207.ebuild b/app-eselect/eselect-python/eselect-python-20160207.ebuild
deleted file mode 100644
index 52eb0ce..0000000
--- a/app-eselect/eselect-python/eselect-python-20160207.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-else
-	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Eselect module for management of multiple Python versions"
-HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3
-	>=dev-lang/python-exec-2.3"
-
-src_prepare() {
-	[[ ${PV} == "99999999" ]] && eautoreconf
-}
-
-pkg_postinst() {
-	local py
-
-	if has_version 'dev-lang/python'; then
-		eselect python update --if-unset
-	fi
-
-	if has_version "=dev-lang/python-3*"; then
-		eselect python update "--python3" --if-unset
-	fi
-}