From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B7D1A1381F3 for ; Thu, 5 Sep 2013 06:23:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51B62E0CFD; Thu, 5 Sep 2013 06:23:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B939FE0CFD for ; Thu, 5 Sep 2013 06:23:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9FD9D33EA07 for ; Thu, 5 Sep 2013 06:23:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 56D2BE545C for ; Thu, 5 Sep 2013 06:23:10 +0000 (UTC) From: "Kacper Kowalik" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kacper Kowalik" Message-ID: <1377124992.38140f79a7c2686029f955748296e39209d53949.xarthisius@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: / X-VCS-Repository: proj/sci X-VCS-Committer: xarthisius X-VCS-Committer-Name: Kacper Kowalik X-VCS-Revision: 38140f79a7c2686029f955748296e39209d53949 X-VCS-Branch: master Date: Thu, 5 Sep 2013 06:23:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 11ed9aec-c681-4c65-94b1-c70eaad75ea3 X-Archives-Hash: 14ba6d883ef0573139a12c1a615f1987 commit: 38140f79a7c2686029f955748296e39209d53949 Author: TheChymera mail ru> AuthorDate: Wed Aug 21 22:43:12 2013 +0000 Commit: Kacper Kowalik gentoo org> CommitDate: Wed Aug 21 22:43:12 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=38140f79 Merge branch 'master' of https://github.com/TheChymera/sci Conflicts: sci-libs/scikits_image/scikits_image-9999.ebuild dev-lang/vtune/ChangeLog | 4 + dev-lang/vtune/Manifest | 7 +- ...9.295420.ebuild => vtune-13.1.10.298370.ebuild} | 26 +- dev-lang/vtune/vtune-13.1.4.270817.ebuild | 38 -- eclass/intel-sdp.eclass | 29 +- profiles/package.mask | 5 - sci-biology/psychopy/Manifest | 1 + sci-chemistry/pymol/ChangeLog | 3 + sci-chemistry/pymol/pymol-9999.ebuild | 1 + sci-libs/avogadro-libs/ChangeLog | 10 + sci-libs/avogadro-libs/Manifest | 1 + sci-libs/avogadro-libs/avogadro-libs-0.6.0.ebuild | 41 ++ .../coot => sci-libs/avogadro-libs}/metadata.xml | 4 +- sci-libs/chemkit/ChangeLog | 10 + sci-libs/chemkit/Manifest | 1 + sci-libs/chemkit/chemkit-0.1.ebuild | 55 +++ .../coot => sci-libs/chemkit}/metadata.xml | 4 +- sci-libs/dealii/Manifest | 2 + sci-libs/dealii/dealii-8.0.0.ebuild | 1 + sci-libs/dealii/dealii-9999.ebuild | 128 +++++ sci-libs/dealii/metadata.xml | 28 ++ sci-libs/nibabel/nibabel-9999.ebuild | 40 ++ sci-libs/nipy/Manifest | 1 + sci-libs/nipy/nipy-0.3.0.ebuild | 37 ++ sci-libs/nipy/nipy-9999.ebuild | 34 ++ sci-libs/nipype/nipype-9999.ebuild | 26 + sci-libs/openblas/ChangeLog | 8 + sci-libs/openblas/Manifest | 3 +- sci-libs/openblas/files/openblas-aliasing.patch | 11 - .../openblas/files/openblas-sharedlibs-0.2.patch | 45 -- sci-libs/openblas/metadata.xml | 1 - sci-libs/openblas/openblas-0.2.6.ebuild | 1 - sci-libs/openblas/openblas-0.2.7.ebuild | 127 +++++ sci-libs/openblas/openblas-9999.ebuild | 148 +++--- sci-libs/p4est/Manifest | 1 + sci-libs/p4est/files/p4est-libtool-fix.patch | 59 +++ sci-libs/p4est/metadata.xml | 15 + sci-libs/p4est/p4est-0.3.4.1.ebuild | 71 +++ sci-libs/scikits_image/scikits_image-9999.ebuild | 4 + sci-visualization/paraview/ChangeLog | 156 ------ sci-visualization/paraview/Manifest | 3 - .../paraview/files/paraview-3.10.1-gcc46.patch | 20 - .../paraview/files/paraview-3.12.0-gcc46.patch | 10 - .../paraview/files/paraview-3.12.0-protobuf.patch | 53 --- .../files/paraview-3.14.1-ffmpeg-noinstall.patch | 27 -- .../paraview/files/paraview-3.14.1-gcc-4.7.patch | 28 -- .../paraview/files/paraview-3.14.1-mpi4py.patch | 15 - .../files/paraview-3.14.1-python-exit.patch | 46 -- .../files/paraview-3.14.1-removesqlite.patch | 526 --------------------- .../paraview/files/paraview-3.14.1-vtknetcd.patch | 97 ---- .../files/paraview-3.14.1-xdmf-linking.patch | 16 - .../paraview/files/paraview-3.8.0-h5part.patch | 12 - .../files/paraview-3.8.0-installpath.patch | 33 -- ...araview-3.8.0-pointsprite-example-install.patch | 9 - .../files/paraview-3.8.0-pointsprite-example.patch | 25 - .../paraview/files/paraview-3.8.0-xdmf-bc.patch | 13 - .../files/paraview-3.8.0-xdmf-cstring.patch | 10 - .../paraview/files/vtk-5.6.0-cg-path.patch | 36 -- .../paraview/files/vtk-5.6.0-libpng14.patch | 22 - .../paraview/files/vtk-5.6.0-odbc.patch | 12 - .../paraview/files/vtk-5.6.1-ffmpeg.patch | 42 -- .../paraview/files/vtk-5.6.1-libav-0.8.patch | 66 --- .../paraview/files/vtk-boost1.49.patch | 27 -- sci-visualization/paraview/metadata.xml | 22 - sci-visualization/paraview/paraview-3.10.1.ebuild | 214 --------- sci-visualization/paraview/paraview-3.12.0.ebuild | 214 --------- .../paraview/paraview-3.14.1-r4.ebuild | 254 ---------- virtual/cblas/ChangeLog | 6 +- virtual/cblas/cblas-2.0.ebuild | 6 +- 69 files changed, 824 insertions(+), 2227 deletions(-) diff --cc sci-libs/scikits_image/scikits_image-9999.ebuild index 9515834,46a02c1..9c92ac4 --- a/sci-libs/scikits_image/scikits_image-9999.ebuild +++ b/sci-libs/scikits_image/scikits_image-9999.ebuild @@@ -42,9 -42,7 +42,13 @@@ S="${WORKDIR}/${MYPN}-${PV} DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt ) python_test() { ++<<<<<<< HEAD + distutils_install_for_testing.py \ + install --root="${T}/test-${EPYTHON}" \ + --no-compile || die "install test failed" ++======= + distutils_install_for_testing.py ++>>>>>>> e20cf96b7230e5bd7e2d5a7531754a84ba6a67df cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die echo "backend: Agg" > matplotlibrc MPLCONFIGDIR=. PYTHONPATH=. nosetests-"${EPYTHON}" || die