Removed ${ROOT} where not appropriate (bug #167271). Added src_test for 1.33.1-r1.

Package-Manager: portage-2.1.2-r7

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 895eaa835cf42f8c4c0317c8ee059d235df92e89..b259cf14417aa1e67e116193582eb6bfacdb1c42 100644 (file)
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/boost
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.107 2007/02/18 11:15:23 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.108 2007/02/20 20:32:25 dev-zero Exp $
+
+  20 Feb 2007; Tiziano Müller <dev-zero@gentoo.org> boost-1.33.1-r1.ebuild,
+  boost-1.34_pre20061214.ebuild:
+  Removed ${ROOT} where not appropriate (bug #167271). Added src_test for
+  1.33.1-r1.
 
   18 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org>
   boost-1.33.1-r1.ebuild:

diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 351aa659b15040bc3332e64b76e9bb8cdc4f54ab..d8c2fec4f0dc33a5e2851ae4422dd29cae16e8f3 100644 (file)
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX boost-1.33.1-gcc41_visit_each.patch 338 RMD160 295e85b70cb27da6bb24eb6d757c8cc3465877d7 SHA1 265bdab2f664ffaa23f340f78a99506616457ad6 SHA256 a9ced5f54e52ade899a7b09dff097e4c9ca958c85d51ae431c7e7521f53b441e
 MD5 be654f750b09a2a826f3bf6948276d5d files/boost-1.33.1-gcc41_visit_each.patch 338
 RMD160 295e85b70cb27da6bb24eb6d757c8cc3465877d7 files/boost-1.33.1-gcc41_visit_each.patch 338
@@ -15,22 +12,22 @@ RMD160 478b592e9d33d371b07e5364e63512c8208263bf files/random-Jamfile 355
 SHA256 7dc71ab8b862ccd5ea9c21c42557adfe0c711ea7fbe7faa47328a37aa84bc096 files/random-Jamfile 355
 DIST boost_1_33_1.tar.bz2 11507161 RMD160 3d5999d321b558f74d786bec52ee1b1fcd7e7152 SHA1 22682f75ff0d1ea548688e78c8cca83d599ca576 SHA256 6232e93205acbc8c705f44f15977aae158550c99a384f41606cff26c16393be0
 DIST boost_1_34_pre20061214.tar.bz2 12357020 RMD160 51a96ef3dc28b4bd1d5fc3c295a4a3f874fe59fa SHA1 62e6fc5ea23aec68e26282068e950c0ca035f846 SHA256 4c88805afe6b47366d960d878eec8a6e0e7f40a7f9122a7d877020e9102d0e49
-EBUILD boost-1.33.1-r1.ebuild 5496 RMD160 e0704732d45ce76bf28311c6652196c95156b0cd SHA1 a60ad7c12fcef964cf632c4500a7214589b9eb51 SHA256 bb82071d79e4f1da3761718df9664835bddb63c30e3afe6c2abcab0205d24f79
-MD5 72a4abf46f006da53971067cd1f0e19e boost-1.33.1-r1.ebuild 5496
-RMD160 e0704732d45ce76bf28311c6652196c95156b0cd boost-1.33.1-r1.ebuild 5496
-SHA256 bb82071d79e4f1da3761718df9664835bddb63c30e3afe6c2abcab0205d24f79 boost-1.33.1-r1.ebuild 5496
+EBUILD boost-1.33.1-r1.ebuild 7016 RMD160 dc825f5f030292e48c938b53b937bc2f49642b26 SHA1 95fc60aa2f8d57dcbee1e9ee159ba010bc09d300 SHA256 8a248c612a4934ad163d34018c9a0f086fb70b6a94adef4998770668f81cb0b9
+MD5 0f05eb17be46da180ff4620f141a041e boost-1.33.1-r1.ebuild 7016
+RMD160 dc825f5f030292e48c938b53b937bc2f49642b26 boost-1.33.1-r1.ebuild 7016
+SHA256 8a248c612a4934ad163d34018c9a0f086fb70b6a94adef4998770668f81cb0b9 boost-1.33.1-r1.ebuild 7016
 EBUILD boost-1.33.1.ebuild 5698 RMD160 6c77b00c3027e82a9753419446d57fd489b93a5e SHA1 a9485dbd6b1c576d1d0723389fb2aaa4c13bb3f3 SHA256 40ca99406b69fc646969eade68e3363279218df5fce358ec9d7ad98b289dc0f5
 MD5 85e241bdaa449cd9fd1f1dfd99915f64 boost-1.33.1.ebuild 5698
 RMD160 6c77b00c3027e82a9753419446d57fd489b93a5e boost-1.33.1.ebuild 5698
 SHA256 40ca99406b69fc646969eade68e3363279218df5fce358ec9d7ad98b289dc0f5 boost-1.33.1.ebuild 5698
-EBUILD boost-1.34_pre20061214.ebuild 3894 RMD160 40ea9af1aa31c914657bf91a7ca582added1644d SHA1 89c60a3f0ad2a5af4854dec2a2ffb5c7c75e6baa SHA256 0f62fbc36c404dc2d33bb2aa14ddd240bd2790778bb71f6cbbca9b32dd61c401
-MD5 88d8c7d72f0784d8a274f8d4f5a8198a boost-1.34_pre20061214.ebuild 3894
-RMD160 40ea9af1aa31c914657bf91a7ca582added1644d boost-1.34_pre20061214.ebuild 3894
-SHA256 0f62fbc36c404dc2d33bb2aa14ddd240bd2790778bb71f6cbbca9b32dd61c401 boost-1.34_pre20061214.ebuild 3894
-MISC ChangeLog 14500 RMD160 836405f3010bbad86cf048a0c2f77a51b96f1999 SHA1 3db08a67c0a1114a297e00de8129d51afe96eaf0 SHA256 4224ebea1da5c48533df9da223fa6f7efdce757c543a605c2e8306659d04d7c0
-MD5 e27c70ef9f8f566e9fade0e9a3943e9b ChangeLog 14500
-RMD160 836405f3010bbad86cf048a0c2f77a51b96f1999 ChangeLog 14500
-SHA256 4224ebea1da5c48533df9da223fa6f7efdce757c543a605c2e8306659d04d7c0 ChangeLog 14500
+EBUILD boost-1.34_pre20061214.ebuild 3851 RMD160 fe475d7c04c74b975262c602288def1c34223e7f SHA1 69f3b827170f9cff95ab7949a02af9538bf14ae7 SHA256 cbf5b683dad117032b4e17e91ebc29f7d908caa95af0febd00e07bde876bd038
+MD5 f37a63a2720f7dd8e0075f6eed86d3d9 boost-1.34_pre20061214.ebuild 3851
+RMD160 fe475d7c04c74b975262c602288def1c34223e7f boost-1.34_pre20061214.ebuild 3851
+SHA256 cbf5b683dad117032b4e17e91ebc29f7d908caa95af0febd00e07bde876bd038 boost-1.34_pre20061214.ebuild 3851
+MISC ChangeLog 14701 RMD160 0451619dc2c2993c9614e1743f0cf886b5146c1a SHA1 4f18f5ab19de5f8a3ebeae8e167e0653d10bf581 SHA256 faf387dae1f6c5edc0837768140363b06bd055c8a5cf9f00c2f2e514e8df33b4
+MD5 ef9101ef0da84ce63752289191602ebe ChangeLog 14701
+RMD160 0451619dc2c2993c9614e1743f0cf886b5146c1a ChangeLog 14701
+SHA256 faf387dae1f6c5edc0837768140363b06bd055c8a5cf9f00c2f2e514e8df33b4 ChangeLog 14701
 MISC metadata.xml 349 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd SHA1 042144f72d878c355a55ad72a5212b2c2db88b9a SHA256 17524a0d3400af3c713289c5cf1f713cf63619264b9c6b535be3e2d543512cf6
 MD5 b0f631e883fed00f233ff27ce7ceb93d metadata.xml 349
 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd metadata.xml 349
@@ -44,10 +41,3 @@ SHA256 81d215f8a743fe6c248ca79c782decf96967f883a5e015840cdea311556a278b files/di
 MD5 4d2c7622840a8822a22de0b6b476a878 files/digest-boost-1.34_pre20061214 277
 RMD160 9a9df1d0836e4228bb0555168feaec083d916c49 files/digest-boost-1.34_pre20061214 277
 SHA256 06642f8f05261ead16839bb8350548064c469dba0f16992c748e9a3c2b0b0f46 files/digest-boost-1.34_pre20061214 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFF2DUW6Xxn2nLwtdQRAtQ+AJ4zyuQeOKzCZfy9KlCzYjztZsuMCgCgmZu0
-A3FFBIXIKf+YU+NwowT6iSw=
-=Flof
------END PGP SIGNATURE-----

diff --git a/dev-libs/boost/boost-1.33.1-r1.ebuild b/dev-libs/boost/boost-1.33.1-r1.ebuild
index 52fb158d43b9bb041fb5ab948cb7892dc3478844..7000bb6cbc9bedc85b3e6a20a8b0c694461f4edc 100644 (file)
--- a/dev-libs/boost/boost-1.33.1-r1.ebuild
+++ b/dev-libs/boost/boost-1.33.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.33.1-r1.ebuild,v 1.14 2007/02/18 11:15:23 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.33.1-r1.ebuild,v 1.15 2007/02/20 20:32:25 dev-zero Exp $
 
 inherit eutils distutils multilib python versionator
 
@@ -82,7 +82,7 @@ pkg_setup() {
        fi
 
        if use icu ; then
-               ADDITIONAL_OPTIONS="-sHAVE_ICU=1 -sICU_PATH=${ROOT}/usr"
+               ADDITIONAL_OPTIONS="-sHAVE_ICU=1 -sICU_PATH=/usr"
        fi
 
 }
@@ -219,4 +219,50 @@ src_install () {
                cd "${S}"/tools/build/jam_src/bin.*/
                dobin bjam || die "bjam install failed"
        fi
+
+       if has test ${FEATURES} ; then
+               cd "${S}/status"
+               elog "Tests enabled, installing the output to:"
+               elog "  ${ROOT}usr/share/doc/${PF}/status"
+               elog "The results are in"
+               elog "  ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
+               docinto status
+               sed -i -e 's|../boost.png|boost.png|' *.html
+               dohtml *.{html,gif} ../boost.png
+               dodoc regress.log
+       fi
+}
+
+src_test() {
+       ewarn "This test might take a couple of hours even on a recent machine"
+       ewarn "and you need 2 GB free space in your temp directory."
+       ebeep
+
+       elog "It is possible to provide a regression_comment file"
+       elog "which might be useful it you intend to send the generated"
+       elog "regression results table to the boost-developers."
+       elog "Just export a variable BOOST_COMMENT_PATH before starting"
+       elog "the merge containing the full path to such a file."
+       elog "If you don't know what's this all about, just ignore it."
+
+       if [ -n ${BOOST_COMMENT_PATH} ] ; then
+               elog "Creating default comment file..."
+               cat > comment.html <<- __EOF__
+                       <p>Tests are run on Gentoo Linux.</p>
+               __EOF__
+               BOOST_COMMENT_PATH="$(pwd)/comment.html"
+       fi
+
+
+       cd "${S}/tools/regression"
+       sed -i \
+               -e "s|\(boost_root\)=.*|\1=\"${S}\"|" \
+               -e "s|\(toolset\)=.*|\1=\"${BOOST_TOOLSET}\"|" \
+               -e "s|\(test_tools\)=.*|\1=\"${BOOST_TOOLSET}\"|" \
+               -e "s|\(comment_path\)=.*|\1=\"${BOOST_COMMENT_PATH}\"|" \
+               run_tests.sh || die "sed failed"
+       . run_tests.sh || die "tests failed"
+
+       elog "You have to check the test output yourself"
+       elog "to see whether all tests succeeded."
 }

diff --git a/dev-libs/boost/boost-1.34_pre20061214.ebuild b/dev-libs/boost/boost-1.34_pre20061214.ebuild
index 4deea05625cac3afa2031c6213002c2fe3772108..3f20e9bc9aeeb627561e43ba1d68dcb77055b6e9 100644 (file)
--- a/dev-libs/boost/boost-1.34_pre20061214.ebuild
+++ b/dev-libs/boost/boost-1.34_pre20061214.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34_pre20061214.ebuild,v 1.3 2007/02/10 12:38:14 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34_pre20061214.ebuild,v 1.4 2007/02/20 20:32:25 dev-zero Exp $
 
 inherit distutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -47,7 +47,7 @@ generate_options() {
        OPTIONS="${OPTIONS} optimization=none"
        OPTIONS="${OPTIONS} threading=single,multi"
 
-       use icu && OPTIONS="${OPTIONS} -sHAVE_ICU=1 -sICU_PATH=\"${ROOT}/usr\""
+       use icu && OPTIONS="${OPTIONS} -sHAVE_ICU=1 -sICU_PATH=/usr"
 
 }
 
@@ -73,7 +73,7 @@ generate_userconfig() {
 import toolset : using ;
 import toolset : flags ;
 using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-using python : ${PYVER} : ${ROOT}usr : ${ROOT}usr/include/python${PYVER} : ${ROOT}usr/lib/python${PYVER} ;
+using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;
 __EOF__
 
 }
@@ -86,7 +86,7 @@ src_compile() {
        generate_options
 
        export BOOST_ROOT=${S}
-       export BOOST_BUILD_PATH=${ROOT}/usr/share/boost-build
+       export BOOST_BUILD_PATH=/usr/share/boost-build
 
        # Note: The line "debug-symbols=on" only adds '-g' to compiler and linker invocation
        # and prevents boost-build from stripping the libraries/binaries
@@ -123,7 +123,7 @@ src_install () {
        generate_options
 
        export BOOST_ROOT=${S}
-       export BOOST_BUILD_PATH=${ROOT}/usr/share/boost-build
+       export BOOST_BUILD_PATH=/usr/share/boost-build
 
        for linkoption in ${LINK_OPTIONS} ; do
                bjam \