work around for boost_python-mt

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

3 files changed, 10 insertions, 97 deletions

diff --git a/sci-physics/camfr/ChangeLog b/sci-physics/camfr/ChangeLog
index 1d84f524016d..5524a9ef71ba 100644
--- a/sci-physics/camfr/ChangeLog
+++ b/sci-physics/camfr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/camfr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.23 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.24 2012/08/07 05:43:12 bicatali Exp $
+
+  07 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -camfr-20070717-r2.ebuild,
+  camfr-20070717-r3.ebuild:
+  work around for boost_python-mt
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> camfr-20070717-r2.ebuild,
   camfr-20070717-r3.ebuild:
@@ -108,4 +112,3 @@
 
   05 Apr 2005; Peter Bienstman <pbienst@gentoo.org> :
   Initial import. Closes bug 36560.
-
diff --git a/sci-physics/camfr/camfr-20070717-r2.ebuild b/sci-physics/camfr/camfr-20070717-r2.ebuild
deleted file mode 100644
index e81189d0c6cc..000000000000
--- a/sci-physics/camfr/camfr-20070717-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717-r2.ebuild,v 1.6 2012/05/04 07:55:34 jdhore Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="tk"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils fortran-2 distutils toolchain-funcs
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="true"
-
-DESCRIPTION="Full vectorial Maxwell solver based on eigenmode expansion"
-HOMEPAGE="http://camfr.sourceforge.net/"
-SRC_URI="mirror://sourceforge/camfr/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/fortran
-
-	dev-libs/blitz
-	<dev-libs/boost-1.48[python]
-	dev-python/imaging[tk]
-	dev-python/matplotlib
-	sci-libs/scipy
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/scons-0.98"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-S="${WORKDIR}/${P/-/_}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-python.patch
-	cp "${FILESDIR}"/machine_cfg.py.gentoo machine_cfg.py || die
-	python_copy_sources
-
-	preparation() {
-		local libfort
-		local lapack_libs=
-		local lapack_libdirs=
-		# Configure to compile against selected python version
-		cat <<-EOF >> machine_cfg.py
-			include_dirs = []
-			include_dirs.append("$(python_get_includedir)")
-			include_dirs.append("$(python_get_sitedir)")
-		EOF
-
-		for x in $(pkg-config --libs-only-l lapack); do
-			lapack_libs="${lapack_libs}, \"${x#-l}\""
-		done
-		for x in $(pkg-config --libs-only-L lapack); do
-			lapack_libdirs="${lapack_libdirs}, \"${x#-L}\""
-		done
-		case "$(tc-getF77)" in
-			*gfortran) libfort=gfortran ;;
-			*g77) libfort=g2c ;;
-		esac
-		cat <<-EOF >> machine_cfg.py
-			library_dirs = [${lapack_libdirs#,}]
-			libs = ["boost_python", "${libfort}", "blitz"${lapack_libs}]
-		EOF
-	}
-	python_execute_function -s preparation
-	export F77=$(tc-getF77)
-}
-
-src_test() {
-	testing() {
-		# trick to avoid X in testing (bug #229753)
-		echo "backend : Agg" > matplotlibrc
-		PYTHONPATH=".:visualisation" "$(PYTHON)" testsuite/camfr_test.py
-		rm -f matplotlibrc
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	distutils_src_install
-	dodoc docs/camfr.pdf || die "doc install failed"
-}
diff --git a/sci-physics/camfr/camfr-20070717-r3.ebuild b/sci-physics/camfr/camfr-20070717-r3.ebuild
index 29684076afde..477e98219ae5 100644
--- a/sci-physics/camfr/camfr-20070717-r3.ebuild
+++ b/sci-physics/camfr/camfr-20070717-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717-r3.ebuild,v 1.2 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717-r3.ebuild,v 1.3 2012/08/07 05:43:12 bicatali Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/camfr/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/fortran
@@ -47,8 +47,8 @@ src_prepare() {
 		# Configure to compile against selected python version
 		cat <<-EOF >> machine_cfg.py
 			include_dirs = []
-			include_dirs.append("$(python_get_includedir)")
-			include_dirs.append("$(python_get_sitedir)")
+			include_dirs.append("${EPREFIX}/$(python_get_includedir)")
+			include_dirs.append("${EPREFIX}/$(python_get_sitedir)")
 		EOF
 		local x
 		for x in $(pkg-config --libs-only-l lapack); do
@@ -59,7 +59,7 @@ src_prepare() {
 		done
 		cat <<-EOF >> machine_cfg.py
 			library_dirs = [${lapack_libdirs#,}]
-			libs = ["boost_python-${PYTHON_ABI}", "blitz"${lapack_libs}]
+			libs = ["boost_python-${PYTHON_ABI}-mt", "blitz"${lapack_libs}]
 		EOF
 	}
 	python_execute_function -s preparation