Remove masked package

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

6 files changed, 7 insertions, 260 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 8ea73db99fb6..f5c262bc20f9 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.31 2013/01/02 04:41:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.32 2013/02/10 08:23:32 pacho Exp $
+
+  10 Feb 2013; Pacho Ramos <pacho@gentoo.org> -files/1.7-scripts-location.patch,
+  -files/1.8-elf-metadata-26a8d3fc57a7.patch,
+  -files/1.8-sext-instructions-02dc2f6160ee.patch, -pypy-1.8-r1.ebuild,
+  -pypy-1.8-r2.ebuild:
+  Remove masked package
 
   02 Jan 2013; Mike Gilbert <floppym@gentoo.org> pypy-2.0_beta1.ebuild:
   Add keywords.
diff --git a/dev-python/pypy/files/1.7-scripts-location.patch b/dev-python/pypy/files/1.7-scripts-location.patch
deleted file mode 100644
index 91b5ced96247..000000000000
--- a/dev-python/pypy/files/1.7-scripts-location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pypy-pypy-release-1.7/lib-python/modified-2.7/distutils/command/install.py
-+++ pypy-pypy-release-1.7/lib-python/modified-2.7/distutils/command/install.py
-@@ -87,7 +87,7 @@
-         'purelib': '$base/site-packages',
-         'platlib': '$base/site-packages',
-         'headers': '$base/include',
--        'scripts': '$base/bin',
-+        'scripts': '/usr/bin',
-         'data'   : '$base',
-         },
-     }
diff --git a/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch b/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch
deleted file mode 100644
index d58137350e2d..000000000000
--- a/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py.bak	2011-11-29 14:22:29.000000000 +0100
-+++ pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py	2011-11-29 14:22:55.000000000 +0100
-@@ -1694,6 +1694,7 @@
-             }
-             """
-         elif self.format in ('elf64', 'darwin64'):
-+            print >> output, "\t.section .note.GNU-stack,\"\",%progbits"
-             print >> output, "\t.text"
-             print >> output, "\t.globl %s" % _globalname('pypy_asm_stackwalk')
-             _variant(elf64='.type pypy_asm_stackwalk, @function',
diff --git a/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch b/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch
deleted file mode 100644
index 6528479e098c..000000000000
--- a/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- pypy/translator/c/gcc/trackgcroot.py.old	2012-02-15 14:11:38.551479431 -0800
-+++ pypy/translator/c/gcc/trackgcroot.py	2012-02-15 00:55:20.082136135 -0800
-@@ -471,8 +471,8 @@
-         return []
- 
-     IGNORE_OPS_WITH_PREFIXES = dict.fromkeys([
--        'cmp', 'test', 'set', 'sahf', 'lahf', 'cltd', 'cld', 'std',
--        'rep', 'movs', 'lods', 'stos', 'scas', 'cwtl', 'cwde', 'prefetch',
-+        'cmp', 'test', 'set', 'sahf', 'lahf', 'cld', 'std',
-+        'rep', 'movs', 'lods', 'stos', 'scas', 'cwde', 'prefetch',
-         # floating-point operations cannot produce GC pointers
-         'f',
-         'cvt', 'ucomi', 'comi', 'subs', 'subp' , 'adds', 'addp', 'xorp',
-@@ -485,6 +485,8 @@
-         'bswap', 'bt', 'rdtsc',
-         'punpck', 'pshufd', 'pcmp', 'pand', 'psllw', 'pslld', 'psllq',
-         'paddq', 'pinsr',
-+        # sign-extending moves should not produce GC pointers
-+        'cbtw', 'cwtl', 'cwtd', 'cltd', 'cltq', 'cqto',
-         # zero-extending moves should not produce GC pointers
-         'movz', 
-         # locked operations should not move GC pointers, at least so far
diff --git a/dev-python/pypy/pypy-1.8-r1.ebuild b/dev-python/pypy/pypy-1.8-r1.ebuild
deleted file mode 100644
index 12d8b4e639cc..000000000000
--- a/dev-python/pypy/pypy-1.8-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8-r1.ebuild,v 1.4 2012/11/18 02:06:28 floppym Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs check-reqs python versionator
-
-DESCRIPTION="PyPy is a fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV}.tar.bz2 -> ${P}.tar.bz2"
-SLOTVER=$(get_version_component_range 1-2 ${PV})
-
-LICENSE="MIT"
-SLOT="${SLOTVER}"
-PYTHON_ABI="2.7-pypy-${SLOTVER}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-		virtual/libffi
-		virtual/libintl
-		dev-libs/expat
-		bzip2? ( app-arch/bzip2 )
-		ncurses? ( sys-libs/ncurses )
-		sqlite? ( dev-db/sqlite:3 )
-		ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-PDEPEND="app-admin/python-updater"
-
-pkg_pretend() {
-	CHECKREQS_MEMORY="2G"
-	use amd64 && CHECKREQS_MEMORY="4G"
-	check-reqs_pkg_pretend
-}
-
-src_unpack() {
-	default
-	mv pypy-pypy-* "${S}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-elf-metadata-26a8d3fc57a7.patch"
-	epatch "${FILESDIR}/${PV}-sext-instructions-02dc2f6160ee.patch"
-	epatch "${FILESDIR}/1.7-scripts-location.patch"
-	epatch "${FILESDIR}/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	epatch "${FILESDIR}/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch"
-}
-
-src_compile() {
-	local conf
-	if use jit; then
-		conf="-Ojit"
-	else
-		conf="-O2"
-	fi
-	if use shadowstack; then
-		conf+=" --gcrootfinder=shadowstack"
-	fi
-	if use sandbox; then
-		conf+=" --sandbox"
-	fi
-
-	conf+=" ./pypy/translator/goal/targetpypystandalone.py"
-	# Avoid linking against libraries disabled by use flags
-	local optional_use=("bzip2" "ncurses" "ssl")
-	local optional_mod=("bz2" "_minimal_curses" "_ssl")
-	for ((i = 0; i < ${#optional_use[*]}; i++)); do
-		if use ${optional_use[$i]};	then
-			conf+=" --withmod-${optional_mod[$i]}"
-		else
-			conf+=" --withoutmod-${optional_mod[$i]}"
-		fi
-	done
-
-	local translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py --batch $conf"
-	echo ${_BOLD}"${translate_cmd}"${_NORMAL}
-	${translate_cmd} || die "compile error"
-}
-
-src_install() {
-	local INSPATH="/usr/$(get_libdir)/pypy${SLOT}"
-	insinto ${INSPATH}
-	doins -r include lib_pypy lib-python pypy-c
-	fperms a+x ${INSPATH}/pypy-c
-	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
-	dodoc README
-
-	if ! use sqlite; then
-		rm -fr "${ED}${INSPATH}/lib-python/2.7/sqlite3"
-		rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3"
-		rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py"
-	fi
-
-	# Generate Grammar and PatternGrammar pickles.
-	PYTHONPATH="${ED}${INSPATH}/lib_pypy/__extensions__:${ED}${INSPATH}/lib_pypy:${ED}${INSPATH}/lib-python/modified-2.7:${ED}${INSPATH}/lib-python/2.7" "${ED}${INSPATH}/pypy-c" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" || die "Generation of Grammar and PatternGrammar pickles failed"
-}
-
-src_test() {
-	$(PYTHON -2) ./pypy/test_all.py --pypy=./pypy-c lib-python
-}
diff --git a/dev-python/pypy/pypy-1.8-r2.ebuild b/dev-python/pypy/pypy-1.8-r2.ebuild
deleted file mode 100644
index 64a1cde7feb6..000000000000
--- a/dev-python/pypy/pypy-1.8-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8-r2.ebuild,v 1.3 2012/12/02 01:58:58 floppym Exp $
-
-EAPI=5
-
-# XXX: test other implementations
-PYTHON_COMPAT=( python2_7 pypy1_8 )
-inherit check-reqs eutils multilib python-any-r1 toolchain-funcs vcs-snapshot versionator
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT=$(get_version_component_range 1-2 ${PV})
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	dev-libs/expat
-	bzip2? ( app-arch/bzip2 )
-	ncurses? ( sys-libs/ncurses )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-PDEPEND="app-admin/python-updater"
-
-pkg_pretend() {
-	CHECKREQS_MEMORY="2G"
-	use amd64 && CHECKREQS_MEMORY="4G"
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	pkg_pretend
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-elf-metadata-26a8d3fc57a7.patch"
-	epatch "${FILESDIR}/${PV}-sext-instructions-02dc2f6160ee.patch"
-	epatch "${FILESDIR}/1.7-scripts-location.patch"
-	epatch "${FILESDIR}/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	epatch "${FILESDIR}/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch"
-}
-
-src_compile() {
-	local args=(
-		$(usex jit -Ojit -O2)
-		$(usex shadowstack --gcrootfinder=shadowstack '')
-		$(usex sandbox --sandbox '')
-
-		./pypy/translator/goal/targetpypystandalone.py
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-		ssl:_ssl
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	set -- "${PYTHON}" ./pypy/translator/goal/translate.py --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-}
-
-src_install() {
-	local INSDESTTREE=/usr/$(get_libdir)/pypy${SLOT}
-	doins -r include lib_pypy lib-python pypy-c
-	fperms a+x ${INSDESTTREE}/pypy-c
-	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
-	dodoc README
-
-	if ! use sqlite; then
-		rm -fr "${ED}${INSDESTTREE}"/lib-python/{2.7,modified-2.7}/sqlite3
-		rm -f "${ED}${INSDESTTREE}"/lib_pypy/_sqlite3.py
-	fi
-
-	python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=${ED}${INSDESTTREE}/pypy-c
-	fi
-
-	# Generate Grammar and PatternGrammar pickles.
-	PYTHONPATH="${ED}${INSDESTTREE}/lib-python/2.7" \
-		"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# compile the installed modules
-	python_optimize "${ED}${INSDESTTREE}"
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-src_test() {
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python
-}