rm old impls, 3.1.0.1-r2; add pypy3, rm old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

7 files changed, 11 insertions, 172 deletions

diff --git a/dev-python/beautifulsoup/ChangeLog b/dev-python/beautifulsoup/ChangeLog
index fab5a76e5814..6eca2ff347db 100644
--- a/dev-python/beautifulsoup/ChangeLog
+++ b/dev-python/beautifulsoup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/beautifulsoup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/ChangeLog,v 1.127 2014/12/16 20:39:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/ChangeLog,v 1.128 2014/12/22 02:36:54 idella4 Exp $
+
+  22 Dec 2014; Ian Delaney <idella4@gentoo.org>
+  -beautifulsoup-3.1.0.1-r1.ebuild, -beautifulsoup-3.2.0.ebuild,
+  -beautifulsoup-3.2.1.ebuild, -beautifulsoup-4.2.1.ebuild,
+  beautifulsoup-3.1.0.1-r2.ebuild, beautifulsoup-3.2.1-r1.ebuild:
+  rm old impls, 3.1.0.1-r2; add pypy3, rm old
 
   16 Dec 2014; Markus Meier <maekke@gentoo.org> beautifulsoup-4.3.2.ebuild:
   arm stable, bug #530292
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild
deleted file mode 100644
index 165bde5714aa..000000000000
--- a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild,v 1.20 2014/08/10 21:07:30 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="3"
-SUPPORT_PYTHON_ABIS="1"
-# Avoid collisions with python-2 slot.
-RESTRICT_PYTHON_ABIS="2.* *-jython"
-
-inherit distutils eutils
-
-MY_PN="BeautifulSoup"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="HTML/XML parser for quick-turnaround applications like screen-scraping"
-HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/BeautifulSoup"
-SRC_URI="http://www.crummy.com/software/${MY_PN}/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="python-3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!dev-python/beautifulsoup:0"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="BeautifulSoup.py BeautifulSoupTests.py"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${P}-python-3.patch"
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" BeautifulSoupTests.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	# Delete useless files.
-	rm -fr "${ED}usr/bin"
-}
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild
index db591af47097..0a341082318e 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild,v 1.16 2014/11/24 13:47:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild,v 1.17 2014/12/22 02:36:54 idella4 Exp $
 
 EAPI="5"
 # A few tests fail with python3.3/3.4 :(
-PYTHON_COMPAT=( python{3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4} pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.0.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.0.ebuild
deleted file mode 100644
index 8e95813e6221..000000000000
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.2.0.ebuild,v 1.15 2014/08/10 21:07:30 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-MY_PN="BeautifulSoup"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="HTML/XML parser for quick-turnaround applications like screen-scraping"
-HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/BeautifulSoup"
-SRC_URI="http://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="python-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!dev-python/beautifulsoup:0"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="BeautifulSoup.py BeautifulSoupTests.py"
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" BeautifulSoupTests.py
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
index 5d98a6c677cd..37b57baae44c 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild,v 1.16 2014/08/10 21:07:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild,v 1.17 2014/12/22 02:36:54 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{6,7} pypy pypy2_0 )
+PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1.ebuild
deleted file mode 100644
index fed5105af41e..000000000000
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.2.1.ebuild,v 1.3 2014/08/10 21:07:30 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-MY_PN="BeautifulSoup"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="HTML/XML parser for quick-turnaround applications like screen-scraping"
-HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/BeautifulSoup"
-SRC_URI="http://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="python-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!dev-python/beautifulsoup:0"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="BeautifulSoup.py BeautifulSoupTests.py"
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" BeautifulSoupTests.py
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.2.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.2.1.ebuild
deleted file mode 100644
index e07ad599c41b..000000000000
--- a/dev-python/beautifulsoup/beautifulsoup-4.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.2.1.ebuild,v 1.4 2014/03/31 20:31:26 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/
-	http://pypi.python.org/pypi/beautifulsoup4"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-# new html5 awaits keywording of html5lib in Bug 471002
-IUSE="doc test"
-# pending Bug 471002; html5? ( dev-python/html5lib[$(python_gen_usedep 'python{2_6,2_7}' pypy pypy2_0)] )
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/lxml[$(python_gen_usedep 'python{2_6,2_7}' 'python3*')] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc html
-	fi
-}
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=doc/build/html/.
-	distutils-r1_python_install_all
-}