Adapt new boost python scheme, bug #401391

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 99 insertions, 11 deletions

diff --git a/sci-physics/camfr/ChangeLog b/sci-physics/camfr/ChangeLog
index 0d5e25d645db..e80aa392beee 100644
--- a/sci-physics/camfr/ChangeLog
+++ b/sci-physics/camfr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/camfr
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.21 2011/06/21 14:41:10 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.22 2012/01/30 01:45:42 bicatali Exp $
+
+*camfr-20070717-r3 (30 Jan 2012)
+
+  30 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  camfr-20070717-r2.ebuild, +camfr-20070717-r3.ebuild:
+  Adapt new boost python scheme, bug #401391
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> camfr-20070717-r2.ebuild:
   Add dependency on virtual/fortran
diff --git a/sci-physics/camfr/Manifest b/sci-physics/camfr/Manifest
index b9178bccd23a..4e1b39def08e 100644
--- a/sci-physics/camfr/Manifest
+++ b/sci-physics/camfr/Manifest
@@ -5,13 +5,14 @@ AUX camfr-20070717-gcc43.patch 391 RMD160 4addf806c2d8ddb5ee5dbd2cc1b02381dbf3f6
 AUX camfr-20070717-python.patch 766 RMD160 1b8539c4977e5486da3439eb504196987fbe4a2f SHA1 a0c261d1f95ff4ccb84cb27bbd6c23b2ff47440f SHA256 ac025ae363a54789421ed759d4267854e6141a5d0ebb52c9c859439384cb15f7
 AUX machine_cfg.py.gentoo 638 RMD160 9a2016338d094e1b1d32444bd2ed281cfca1551e SHA1 96084ebc5ae03698b52a1b9a82899869f43c2532 SHA256 8942256f99ad1432d7092cb616727ffd6ef82834435e185f9b9863e420bf08f0
 DIST camfr-20070717.tgz 763070 RMD160 4e4237188caecd4dca3980b9cab381479e6382bc SHA1 7838482db8557b365dac51769950d49746397e29 SHA256 f675ba7d58947076c0679c8760c9282e2efc82828bec67de90567fd8a4f135de
-EBUILD camfr-20070717-r2.ebuild 2195 RMD160 c852f8f0a02f96a4e15785ebe23ae5db8de644bf SHA1 b8ff5740635af3ad8eef1f877c7cc571490f9555 SHA256 985f24f3241177696f0ef67307b9d8554aa09f8f4c9baa430777c1985bc07b84
-MISC ChangeLog 3529 RMD160 58f7fcf2bdc937448eeb308cf0f66cd589c1403d SHA1 4e3f51d6c593b82556df996f3760c0e32934b257 SHA256 e765439aa8dbafb65025ff7adadeeb47f00d58865a2acafa220491af290991ef
+EBUILD camfr-20070717-r2.ebuild 2205 RMD160 f1b81c15e5ff9f30291e02b0511272c0ec262294 SHA1 55e092903fa6fa85a2059e2e2b1f88bba87cf2c3 SHA256 0a189002d9dd33e474c903fab02f57e6bb268368b42e1438b2795fb43f94e2b5
+EBUILD camfr-20070717-r3.ebuild 2028 RMD160 72a7f0be9f44386d4ca7b84854c677385baf4042 SHA1 b533fbac53ba2bd758efea939d06756eee5838e3 SHA256 3267f64d0b6f9dc268b442f2bb6cca8385adb4fed7c3660737e3f015d3977d51
+MISC ChangeLog 3723 RMD160 5254ab1d7512bcfc641eb53dd04ffb0c25c9ed57 SHA1 b1e481085821c9a3723958045a4fd08ecf11bc61 SHA256 19062f26aea75dc682aea392ed6259df797c0d45c213c034e0b254ab83b70a13
 MISC metadata.xml 164 RMD160 6e4c63a6f70f174f40277eed39ac05fba4a49566 SHA1 e1af6f2028e69dee3c76e7e85353a144c83d3383 SHA256 9eddaccbdd2f6b3f93213d72782f07518dff1625fd8d63faf61dc97bd328b5e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4ArYsACgkQgAnW8HDreRYPVwCdHQ/KnhEPi4xCnCHS6h5QZLql
-PUgAnjYjzWBr5EiOAQ63TGiW0vfgJJbo
-=hgXp
+iEYEARECAAYFAk8l9k8ACgkQ1ycZbhPLE2DltQCfeongxrRd+o3Q16HTCYZZO7cR
+CMUAoKD2ZbxHP+je7mzexSm9IOzSvH33
+=whgQ
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/camfr/camfr-20070717-r2.ebuild b/sci-physics/camfr/camfr-20070717-r2.ebuild
index 16754c01f749..d4152176414f 100644
--- a/sci-physics/camfr/camfr-20070717-r2.ebuild
+++ b/sci-physics/camfr/camfr-20070717-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4 2011/06/21 14:41:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717-r2.ebuild,v 1.5 2012/01/30 01:45:42 bicatali Exp $
 
 EAPI=2
 
@@ -25,7 +25,7 @@ RDEPEND="
 	virtual/fortran
 
 	dev-libs/blitz
-	dev-libs/boost[python]
+	<dev-libs/boost-1.48[python]
 	dev-python/imaging[tk]
 	dev-python/matplotlib
 	sci-libs/scipy
diff --git a/sci-physics/camfr/camfr-20070717-r3.ebuild b/sci-physics/camfr/camfr-20070717-r3.ebuild
new file mode 100644
index 000000000000..2c50a3119b73
--- /dev/null
+++ b/sci-physics/camfr/camfr-20070717-r3.ebuild
@@ -0,0 +1,81 @@
+# 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.1 2012/01/30 01:45:42 bicatali Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="tk"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils fortran-2 distutils
+
+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}
+	dev-util/pkgconfig
+	dev-util/scons"
+
+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 lapack_libs 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
+		local x
+		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
+		cat <<-EOF >> machine_cfg.py
+			library_dirs = [${lapack_libdirs#,}]
+			libs = ["boost_python-${PYTHON_ABI}", "blitz"${lapack_libs}]
+		EOF
+	}
+	python_execute_function -s preparation
+}
+
+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
+}