Version bump (3.0.8). Move 3.0 and 3.1 series to separate slots.

Rationale: http://www.crummy.com/software/BeautifulSoup/3.1-problems.html
Package-Manager: portage-15123-svn/cvs/Linux x86_64

4 files changed, 66 insertions, 16 deletions

diff --git a/dev-python/beautifulsoup/ChangeLog b/dev-python/beautifulsoup/ChangeLog
index 36f7eb941ccb..54fa24bdc70b 100644
--- a/dev-python/beautifulsoup/ChangeLog
+++ b/dev-python/beautifulsoup/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/beautifulsoup
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/ChangeLog,v 1.25 2009/11/22 19:00:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/ChangeLog,v 1.26 2009/12/21 00:13:11 arfrever Exp $
+
+*beautifulsoup-3.1.0.1-r1 (21 Dec 2009)
+*beautifulsoup-3.0.8 (21 Dec 2009)
+
+  21 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +beautifulsoup-3.0.8.ebuild, -beautifulsoup-3.1.0.1.ebuild,
+  +beautifulsoup-3.1.0.1-r1.ebuild:
+  Version bump (3.0.8). Move 3.0 and 3.1 series to separate slots.
+  Rationale: http://www.crummy.com/software/BeautifulSoup/3.1-problems.html
 
   22 Nov 2009; Fabian Groffen <grobian@gentoo.org>
   beautifulsoup-3.1.0.1.ebuild:
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index f1750875666b..fee7bbb28864 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,7 +1,9 @@
 AUX beautifulsoup-3.1.0.1-python-3.patch 42319 RMD160 4f7c565db498c1b8716bb339b5835308e5b6ea18 SHA1 949794c651fc1214d59379d9eee18b2232841dc6 SHA256 ff316866451fa89bcd55f2a12590960df0d1c5b099cb94ca8e2d684024536a97
 DIST BeautifulSoup-3.0.7.tar.gz 30217 RMD160 770f64396132c9104b586b6e32db477b14631311 SHA1 f5466428556856c89d923adb6d75c9cecff84160 SHA256 56699116e4f4dbd2e3708ef7c4ad0a1e57c08207d8eed863eedbcac81907a1e0
+DIST BeautifulSoup-3.0.8.tar.gz 30867 RMD160 b61ae0c4254deb087f3887e9ef785109a82d3326 SHA1 e63912be4bcb7db91091caae1d01eeef3ad4b33f SHA256 c733dc499bec490af1d6914e3288287275332c42cd8c7704ef1a2e4e8b8f5abd
 DIST BeautifulSoup-3.1.0.1.tar.gz 71460 RMD160 24a4ac2a5faef8136223cba3f3532f7ce0b6bb70 SHA1 e9593b0412402325b6a98e3bf35ac8d00da5fc00 SHA256 820a80f473240d9d30047f36c959d530a699a732500662dd8b03e1d3ccad12a8
 EBUILD beautifulsoup-3.0.7.ebuild 915 RMD160 08282e9e63692b4324f17e1f646b6ed76055eb75 SHA1 b544d3edb2f8e3401de2605790df0bc48f52d47f SHA256 08d6102a1b7103a6f4a430039c513bd5678d6005d09d0a89fa6de006896e028d
-EBUILD beautifulsoup-3.1.0.1.ebuild 1320 RMD160 7c96dfcc5c21b8f26270b02c5e75f3c4762679d4 SHA1 df402c9a9d5d6b2331ddc87b78d0c38323608b80 SHA256 58adbbc639ad567969b8afc0e9607803916c28e09d0a2d5e7648d5057838db97
-MISC ChangeLog 3418 RMD160 73c7f4a6053c7a8da8c5a7adfb25a847a2a63f1b SHA1 09ace28cd61863e182e0ea2561a40c957219f09c SHA256 a52725edd20d30e94503195b96e4692f1add74836e65e6378ee4059a033e7b90
+EBUILD beautifulsoup-3.0.8.ebuild 952 RMD160 8b6f68934a5172b056ea4b57bab8249f2d99f892 SHA1 48559f0ef7d5014393aa2354ad705dccff1c5550 SHA256 3094afc1eddadda690f931dc2c86c75e819aafd425a3b2dc10559323edd33bb4
+EBUILD beautifulsoup-3.1.0.1-r1.ebuild 1247 RMD160 e08014a78786e731477a59ad7e56938fc846d65d SHA1 fce8a5025888c2dfc5ffd1227b7fff18afecf7b2 SHA256 868d537fec7e975dc95d68fb0fbccd30f7309082e7ab2599bc865ee284ebfc24
+MISC ChangeLog 3810 RMD160 1f563fa2ee8a9d2e481054d8ea2f32ad76db6ae9 SHA1 20eb43582be2806400e3244a28dc835dcbf55719 SHA256 bddb8ff0dbad3736a5241c5c8a5d2fd05b36993a3a7be66fd435c6129dfdefdc
 MISC metadata.xml 563 RMD160 cf0490772a189d33d61d70e36a3284d931b25a2e SHA1 e2ee0122de0b6ca86344eed9f21757142d2e8e7d SHA256 a6cb08d6eeabbc3b9229ffd0de8f9abf724346d62891f33183bd6ae37a5417cf
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.0.8.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.0.8.ebuild
new file mode 100644
index 000000000000..159db9d86d99
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-3.0.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.0.8.ebuild,v 1.1 2009/12/21 00:13:11 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+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/"
+SRC_URI="http://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz"
+
+LICENSE="PSF-2.3"
+SLOT="3.0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!dev-python/beautifulsoup:0"
+RESTRICT_PYTHON_ABIS="3.*"
+
+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.1.0.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild
index 314a956f06b3..770911873fe0 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 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.ebuild,v 1.7 2009/12/20 23:41:25 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild,v 1.1 2009/12/21 00:13:11 arfrever Exp $
 
 EAPI="2"
+NEED_PYTHON="3.0"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils eutils
@@ -15,31 +16,34 @@ HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/"
 SRC_URI="http://www.crummy.com/software/${MY_PN}/download/${MY_P}.tar.gz"
 
 LICENSE="PSF-2.3"
-SLOT="0"
+SLOT="3.1"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="!dev-python/beautifulsoup:0"
+# Avoid collisions with 3.0 slot.
+RESTRICT_PYTHON_ABIS="2.*"
 
 S="${WORKDIR}/${MY_P}"
 
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
 PYTHON_MODNAME="BeautifulSoup.py BeautifulSoupTests.py"
 
 src_prepare() {
-	python_copy_sources --no-link
-
-	conversion() {
-		[[ "${PYTHON_ABI}" == 2.* ]] && return
-		epatch "${FILESDIR}/${P}-python-3.patch"
-	}
-	python_execute_function --action-message 'Applying patches for Python ${PYTHON_ABI}' --failure-message 'Applying patches for Python ${PYTHON_ABI} failed' -s conversion
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-python-3.patch"
 }
 
 src_test() {
 	testing() {
-		PYTHONPATH="build/lib" "$(PYTHON)" BeautifulSoupTests.py
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" BeautifulSoupTests.py
 	}
-	python_execute_function -s testing
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	# Delete useless files.
+	rm -fr "${D}usr/bin"
 }