Added src_test to run regression tests. Minor cleanups and more ToDo's.

Package-Manager: portage-2.1.2_pre2

3 files changed, 37 insertions, 15 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 5600be81f4a9..74beb4920461 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/boost
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.90 2006/09/30 23:15:22 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.91 2006/10/01 23:00:09 dev-zero Exp $
+
+  01 Oct 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  Adding src_test to boost-1.34 for regression tests. Minor cleanups.
 
   30 Sep 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
   Snapshot for 1.34 added for testing
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 380e97450915..58fab4a2070f 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -8,14 +8,14 @@ EBUILD boost-1.33.1.ebuild 5707 RMD160 15d30543711b2f2031d806f5d940c3f5857b197f
 MD5 86e8d433f3cdebf7e571deaa981757fb boost-1.33.1.ebuild 5707
 RMD160 15d30543711b2f2031d806f5d940c3f5857b197f boost-1.33.1.ebuild 5707
 SHA256 9b3b320ae2029b192ffbaeb8cbcffef785b03885235c6b4fae796c62dc557723 boost-1.33.1.ebuild 5707
-EBUILD boost-1.34_pre20060930.ebuild 5528 RMD160 326016c991978a5b7d11b7d3f1be259437e8b2e1 SHA1 003e2c43f80be7dfc1a4b54bba1bd3f7f6cf708a SHA256 13fe96806cacc7bfba6711a1592d2f5ceafc6d4496b9b65e2271d1d18fe3630b
-MD5 07c4073cb318160cea922ba0543b9607 boost-1.34_pre20060930.ebuild 5528
-RMD160 326016c991978a5b7d11b7d3f1be259437e8b2e1 boost-1.34_pre20060930.ebuild 5528
-SHA256 13fe96806cacc7bfba6711a1592d2f5ceafc6d4496b9b65e2271d1d18fe3630b boost-1.34_pre20060930.ebuild 5528
-MISC ChangeLog 12121 RMD160 3217945df8f6f86c2bff7809837b879ee751d7cd SHA1 5d40ada3937a47c78eb5bfdc9aa0442916ac587e SHA256 223add45c6aedb43e3b10d6089f48e1aa99dc4c42631533494f4aeb246012ece
-MD5 d822db5a635e6bab77b4b4fb51c95853 ChangeLog 12121
-RMD160 3217945df8f6f86c2bff7809837b879ee751d7cd ChangeLog 12121
-SHA256 223add45c6aedb43e3b10d6089f48e1aa99dc4c42631533494f4aeb246012ece ChangeLog 12121
+EBUILD boost-1.34_pre20060930.ebuild 6242 RMD160 7990da559a720ab863208aa0f7283f2c4af811e0 SHA1 6d922143a85997dc99d90bcb4e95994ceb2f6900 SHA256 54766ed91bb2963f11631cae8117c06499e3b2728383e58d268bd7ddb61c0fc0
+MD5 12bf6ff8c13118c5e7a07f35705c0568 boost-1.34_pre20060930.ebuild 6242
+RMD160 7990da559a720ab863208aa0f7283f2c4af811e0 boost-1.34_pre20060930.ebuild 6242
+SHA256 54766ed91bb2963f11631cae8117c06499e3b2728383e58d268bd7ddb61c0fc0 boost-1.34_pre20060930.ebuild 6242
+MISC ChangeLog 12256 RMD160 ebd8f7a5a4e51d6eafb4307eadbb1dc0444adc91 SHA1 796368bc06fded60dd16a79cfc4be0975a5a391c SHA256 5b7f13b80043750255e337333022c5fbfd274b1f8194688daf948bd75900bf73
+MD5 6d676431ce674d547b53ad798dc4a6ba ChangeLog 12256
+RMD160 ebd8f7a5a4e51d6eafb4307eadbb1dc0444adc91 ChangeLog 12256
+SHA256 5b7f13b80043750255e337333022c5fbfd274b1f8194688daf948bd75900bf73 ChangeLog 12256
 MISC metadata.xml 349 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd SHA1 042144f72d878c355a55ad72a5212b2c2db88b9a SHA256 17524a0d3400af3c713289c5cf1f713cf63619264b9c6b535be3e2d543512cf6
 MD5 b0f631e883fed00f233ff27ce7ceb93d metadata.xml 349
 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd metadata.xml 349
diff --git a/dev-libs/boost/boost-1.34_pre20060930.ebuild b/dev-libs/boost/boost-1.34_pre20060930.ebuild
index 73e57a48a908..dec6ec8728cd 100644
--- a/dev-libs/boost/boost-1.34_pre20060930.ebuild
+++ b/dev-libs/boost/boost-1.34_pre20060930.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34_pre20060930.ebuild,v 1.1 2006/09/30 23:15:22 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34_pre20060930.ebuild,v 1.2 2006/10/01 23:00:09 dev-zero Exp $
 
 inherit python distutils multilib eutils versionator
 
@@ -14,8 +14,9 @@ SLOT="1"
 KEYWORDS="~x86"
 IUSE="bcp bjam debug doc icu pyste static threads threadsonly"
 
-DEPEND="icu? ( dev-libs/icu )"
+DEPEND="icu? ( >=dev-libs/icu-3.2 )"
 RDEPEND="${DEPEND}
+		!dev-util/boost-jam
 		pyste? ( dev-cpp/gccxml dev-python/elementtree )"
 
 S=${WORKDIR}/${MY_P}
@@ -25,15 +26,17 @@ S=${WORKDIR}/${MY_P}
 # - Check whether the threading-patch for alpha is still needed
 # - Check the LICENSE, upstream updated a lot and changed licenses
 # - possibility to add a separate boost-build package and depend on it
-# - possibility to split out boost.python
 # - gccxml which is needed by pyste is broken with gcc-4.1.1, bug #147976
-# - This version doesn't block boost-jam anymore as preparation for it's removal
+#   Testing gccxml-snapshot with this version of boost/pyste
+# - Remove boost-jam and remove the blocker
+# - Find a better way to do set the options than in pkg_setup (check whether they are really needed for installation)
+# - Eventually split-out boost.python and spirit (second one has it's own release-cycle)
 
 pkg_setup() {
 	BOOSTJAM="${S}/tools/jam/src/bin.*/bjam"
 
-	# Just make sure that we only get the '-j [0-9]+' part from MAKEOPTS
-	NUMJOBS=$(echo ${MAKEOPTS} | sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/')
+	# FIXME: Until we have a better way to do that
+	NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/' <<< ${MAKEOPTS})
 
 	python_version
 
@@ -210,3 +213,19 @@ src_install () {
 		dobin bjam || die "bjam install failed"
 	fi
 }
+
+src_test() {
+	cd "${S}/tools/regression"
+
+	sed -i \
+		-e "s#^\(boost_root\)=.*#\1=\"${S}\"#" \
+		-e "s#^\(bjam\)=.*#\1=\"$(ls ${BOOSTJAM})\"#" \
+		-e 's#tools/build/jam_src#tools/jam/src#' \
+		-e 's#--comment "$comment_path" ##' \
+		run_tests.sh || die "sed'ing run_tests.sh failed"
+	chmod +x run_tests.sh
+	./run_tests.sh || die "regression tests failed"
+
+	elog "Please check the files in "${S}/status" for results and/or more information."
+	elog "If it failed, you might want to attach the regression.log to the bug."
+}