Link to CGAL, mpfr and gmp (if cgal was built with USE="gmp") wrt #306887, thanks to Kamil Kisiel for reporting.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 142 insertions, 6 deletions

diff --git a/dev-python/cgal-python/ChangeLog b/dev-python/cgal-python/ChangeLog
index 310ba829816f..9452f7a5b11c 100644
--- a/dev-python/cgal-python/ChangeLog
+++ b/dev-python/cgal-python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cgal-python
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cgal-python/ChangeLog,v 1.2 2010/01/10 10:36:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgal-python/ChangeLog,v 1.3 2010/02/26 00:30:37 ssuominen Exp $
+
+  26 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  cgal-python-0.9.4_beta1.ebuild,
+  +files/cgal-python-0.9.4_beta1-linking.patch:
+  Link to CGAL, mpfr and gmp (if cgal was built with USE="gmp") wrt #306887,
+  thanks to Kamil Kisiel for reporting.
 
 *cgal-python-0.9.4_beta1 (10 Jan 2010)
 
diff --git a/dev-python/cgal-python/Manifest b/dev-python/cgal-python/Manifest
index 38287cc6abf6..b79da410389d 100644
--- a/dev-python/cgal-python/Manifest
+++ b/dev-python/cgal-python/Manifest
@@ -1,4 +1,5 @@
+AUX cgal-python-0.9.4_beta1-linking.patch 7106 RMD160 1e26eb5d4e521b848221f954c5d834bef9eac46c SHA1 0c165b90b9ec9435d51941b1d7e91be6a64ae107 SHA256 b84955d1335b79fc35a3e08883b13706783103c386929dfcd74bf1b71381f335
 DIST cgal-python-0.9.4-beta1.tgz 145677 RMD160 e6288d3257f19d7313ea2f05e7edcfcb771fc303 SHA1 dea8cbb418d3998fa64032594cfdcf1665d54455 SHA256 fad61d54dd57309ae7877fc9ef94085935baf5c22d1d2ee85c8c8e319c60f8c8
-EBUILD cgal-python-0.9.4_beta1.ebuild 1199 RMD160 c63ccda9f7be0b756692b96764411821919b6eae SHA1 ca1fa9e175a1d70c2a4ae2cfe5932fbc65594699 SHA256 3046895ba32d72fe9d66279cded83a1011580a5b51e9dde55b2e744074213101
-MISC ChangeLog 557 RMD160 348274dfcdcb4d933a68e5d0735539e17ea0b23b SHA1 fd7d0387a8a15dd1a783a4e7125dacd1967940d2 SHA256 9f7127128f0e4976b5d983ae8dcf4740b852586b4a8f1284ccd70098f39e6cce
+EBUILD cgal-python-0.9.4_beta1.ebuild 1410 RMD160 13080f33dcac45465b27211bb0e47a06cbe8c7e3 SHA1 0e3a115c4185e3462444833d75cedba04193e489 SHA256 1da439f94d2e43b0966f300c0fca3f6a93d8bafccba4ca4dfa949888784d74d7
+MISC ChangeLog 811 RMD160 edc19703326ac645a58e1e392ce609c2071ce09d SHA1 7d41085d3fbf20907d1f92e8c8d4b5046807336e SHA256 8c2128bd1bd0ffbeb26ad798c9ad5e3255bb34dfcde889c09338ca759fd55e6a
 MISC metadata.xml 169 RMD160 e1db75ae5d177dffc400468c7d76a7e1fe41876d SHA1 0c953712f9b97d5ab3f95ae71997ffbc96c4007d SHA256 36837b011d26f0b83477c7a8632cb0099aedbcba5a3e45c61f20292e079f6180
diff --git a/dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild b/dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild
index 77b8f4fb1f93..f613e056519c 100644
--- a/dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild
+++ b/dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild,v 1.1 2010/01/10 10:36:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild,v 1.2 2010/02/26 00:30:37 ssuominen Exp $
 
 EAPI=2
-inherit toolchain-funcs python
+inherit eutils toolchain-funcs python
 
 MY_P=${P/_/-}
 
@@ -16,11 +16,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND=">=sci-mathematics/cgal-3.5.1"
+DEPEND="dev-libs/mpfr
+	>=sci-mathematics/cgal-3.5.1"
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-linking.patch
+
+	if has_version sci-mathematics/cgal[gmp]; then
+		sed -i \
+			-e 's:$(CGAL_LDFLAGS):-lgmp $(CGAL_LDFLAGS):' \
+			bindings/makefile.inc || die
+	fi
+
 	python_version
 	sed -i \
 		-e "s:-I../.. -O2:-I/usr/include/python${PYVER} -I../..:g" \
diff --git a/dev-python/cgal-python/files/cgal-python-0.9.4_beta1-linking.patch b/dev-python/cgal-python/files/cgal-python-0.9.4_beta1-linking.patch
new file mode 100644
index 000000000000..e3d83c75d159
--- /dev/null
+++ b/dev-python/cgal-python/files/cgal-python-0.9.4_beta1-linking.patch
@@ -0,0 +1,120 @@
+diff -ur cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_2/Makefile cgal-python-0.9.4-beta1/bindings/Alpha_shapes_2/Makefile
+--- cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_2/Makefile	2009-03-17 16:34:46.000000000 +0200
++++ cgal-python-0.9.4-beta1/bindings/Alpha_shapes_2/Makefile	2010-02-26 01:40:39.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ all: $(OBJ_of_Kernel_module) $(OBJ_of_Triangulation_2_module) 
+ 	@echo 'Creating a Python modules'
+-	@g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so
++	@g++ $(LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so $(CGAL_PYTHON_LDFLAGS)
+ 	@echo '$(Kernel_module) module is created in ./$(Kernel_module)/$(Kernel_module).so'
+ 
+ .cpp.o:
+diff -ur cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_3/Makefile cgal-python-0.9.4-beta1/bindings/Alpha_shapes_3/Makefile
+--- cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_3/Makefile	2009-03-17 16:34:46.000000000 +0200
++++ cgal-python-0.9.4-beta1/bindings/Alpha_shapes_3/Makefile	2010-02-26 01:40:22.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ all: $(OBJ_of_Kernel_module) $(OBJ_of_Triangulation_3_module) 
+ 	@echo 'Creating a Python modules'
+-	@g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so
++	@g++ $(LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so $(CGAL_PYTHON_LDFLAGS)
+ 	@echo '$(Kernel_module) module is created in ./$(Kernel_module)/$(Kernel_module).so'
+ 
+ .cpp.o:
+diff -ur cgal-python-0.9.4-beta1.orig/bindings/Convex_hull_2/Makefile cgal-python-0.9.4-beta1/bindings/Convex_hull_2/Makefile
+--- cgal-python-0.9.4-beta1.orig/bindings/Convex_hull_2/Makefile	2009-03-17 16:34:46.000000000 +0200
++++ cgal-python-0.9.4-beta1/bindings/Convex_hull_2/Makefile	2010-02-26 01:41:08.000000000 +0200
+@@ -11,7 +11,7 @@
+ 
+ all: $(OBJ_of_Convex_hull_module) $(OBJ_of_Triangulation_2_module) 
+ 	@echo 'Creating a Python modules'
+-	@g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Convex_hull_module)  -o $(Convex_hull_module).so
++	@g++ $(LDFLAGS) $(OBJ_of_Convex_hull_module)  -o $(Convex_hull_module).so $(CGAL_PYTHON_LDFLAGS)
+ 	@echo '$(Convex_hull_module) module is created in ./$(Convex_hull_module)/$(Convex_hull_module).so'
+ 
+ .cpp.o:
+diff -ur cgal-python-0.9.4-beta1.orig/bindings/Geometric_Optimisation/Makefile cgal-python-0.9.4-beta1/bindings/Geometric_Optimisation/Makefile
+--- cgal-python-0.9.4-beta1.orig/bindings/Geometric_Optimisation/Makefile	2009-03-17 16:34:47.000000000 +0200
++++ cgal-python-0.9.4-beta1/bindings/Geometric_Optimisation/Makefile	2010-02-26 01:41:49.000000000 +0200
+@@ -15,7 +15,7 @@
+ 
+ all: $(OBJ_of_Optimisation_module) 
+ 	@echo 'Creating a Python modules'
+-	@g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Optimisation_module)  -o $(Optimisation_module).so
++	@g++ $(LDFLAGS) $(OBJ_of_Optimisation_module)  -o $(Optimisation_module).so $(CGAL_PYTHON_LDFLAGS)
+ 	@echo '$(Optimisation_module) module is created in ./$(Optimisation_module)/$(Optimisation_module).so'
+ 
+ .cpp.o:
+diff -ur cgal-python-0.9.4-beta1.orig/bindings/Kernel/Makefile cgal-python-0.9.4-beta1/bindings/Kernel/Makefile
+--- cgal-python-0.9.4-beta1.orig/bindings/Kernel/Makefile	2009-03-17 16:34:46.000000000 +0200
++++ cgal-python-0.9.4-beta1/bindings/Kernel/Makefile	2010-02-26 01:39:57.000000000 +0200
+@@ -41,7 +41,7 @@
+ 
+ all: $(OBJ_of_Kernel_module) 
+ 	@echo 'Creating a Python modules'
+-	@g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Kernel_module)  -o $(Kernel_module).so
++	@g++ $(LDFLAGS) $(OBJ_of_Kernel_module)  -o $(Kernel_module).so $(CGAL_PYTHON_LDFLAGS)
+ 	@echo 'Kernel is created in ./$(Kernel_module)/'
+ 
+ .cpp.o:
+diff -ur cgal-python-0.9.4-beta1.orig/bindings/makefile.inc cgal-python-0.9.4-beta1/bindings/makefile.inc
+--- cgal-python-0.9.4-beta1.orig/bindings/makefile.inc	2009-03-17 16:34:47.000000000 +0200
++++ cgal-python-0.9.4-beta1/bindings/makefile.inc	2010-02-26 01:48:10.000000000 +0200
+@@ -9,7 +9,6 @@
+ # as it would prefer, e.g. -lpython2.4 on FC5.
+ LDOPT=`(uname | grep Darwin > /dev/null) && echo "-dynamiclib -lpython" || echo "-shared"`
+ 
+-CGAL_PYTHON_LDFLAGS=$(LDOPT) -lboost_python $(LDFLAGS) $(CGAL_LDFLAGS)
+-
++CGAL_PYTHON_LDFLAGS=$(LDOPT) -lboost_python -lCGAL -lCGAL_Core -lmpfr $(CGAL_LDFLAGS)
+ 
+ CGAL_PYTHON_CXXFLAGS=-fPIC -DCGAL_DONT_USE_LAZY_KERNEL $(CXXFLAGS) $(CPPFLAGS) $(CGAL_CXXFLAGS) -I../.. -O2
+diff -ur cgal-python-0.9.4-beta1.orig/bindings/Mesh_2/Makefile cgal-python-0.9.4-beta1/bindings/Mesh_2/Makefile
+--- cgal-python-0.9.4-beta1.orig/bindings/Mesh_2/Makefile	2009-03-17 16:34:47.000000000 +0200
++++ cgal-python-0.9.4-beta1/bindings/Mesh_2/Makefile	2010-02-26 01:40:53.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ all:$(OBJ_of_Mesh_2_module) 
+ 	@echo 'Creating a Python modules'
+-	@g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Mesh_2_module) -o $(Mesh_2_module).so
++	@g++ $(LDFLAGS) $(OBJ_of_Mesh_2_module) -o $(Mesh_2_module).so $(CGAL_PYTHON_LDFLAGS)
+ 	@echo '$(Mesh_2_module) module is created in ./$(Mesh_2_module)/$(Mesh_2_module).so'
+ 
+ .cpp.o:
+diff -ur cgal-python-0.9.4-beta1.orig/bindings/Polyhedron/Makefile cgal-python-0.9.4-beta1/bindings/Polyhedron/Makefile
+--- cgal-python-0.9.4-beta1.orig/bindings/Polyhedron/Makefile	2009-03-17 16:34:46.000000000 +0200
++++ cgal-python-0.9.4-beta1/bindings/Polyhedron/Makefile	2010-02-26 01:41:38.000000000 +0200
+@@ -13,7 +13,7 @@
+ 
+ all:$(OBJ_of_Polyhedron_module) 
+ 	@echo 'Creating a Python modules'
+-	@g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Polyhedron_module)  -o $(Polyhedron_module).so
++	@g++ $(LDFLAGS) $(OBJ_of_Polyhedron_module)  -o $(Polyhedron_module).so $(CGAL_PYTHON_LDFLAGS)
+ 	@echo '$(Polyhedron_module) module is created in ./$(Polyhedron_module)/$(Polyhedron_module).so'
+ 
+ .cpp.o:
+diff -ur cgal-python-0.9.4-beta1.orig/bindings/Triangulations_2/Makefile cgal-python-0.9.4-beta1/bindings/Triangulations_2/Makefile
+--- cgal-python-0.9.4-beta1.orig/bindings/Triangulations_2/Makefile	2009-03-17 16:34:46.000000000 +0200
++++ cgal-python-0.9.4-beta1/bindings/Triangulations_2/Makefile	2010-02-26 01:41:24.000000000 +0200
+@@ -17,7 +17,7 @@
+ 	
+ all:$(OBJ_of_Triangulation_2_module) 
+ 	@echo 'Creating a Python modules'
+-	@g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Triangulation_2_module)  -o $(Triangulation_2_module).so
++	@g++ $(LDFLAGS) $(OBJ_of_Triangulation_2_module)  -o $(Triangulation_2_module).so $(CGAL_PYTHON_LDFLAGS)
+ 	@echo '$(Triangulation_2_module) module is created in ./$(Triangulation_2_module)/$(Triangulation_2_module).so'
+ 
+ .cpp.o:
+diff -ur cgal-python-0.9.4-beta1.orig/bindings/Triangulations_3/Makefile cgal-python-0.9.4-beta1/bindings/Triangulations_3/Makefile
+--- cgal-python-0.9.4-beta1.orig/bindings/Triangulations_3/Makefile	2009-03-17 16:34:46.000000000 +0200
++++ cgal-python-0.9.4-beta1/bindings/Triangulations_3/Makefile	2010-02-26 01:39:41.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ all:$(OBJ_of_Triangulation_3_module) 
+ 	@echo 'Creating a Python modules'
+-	@g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Triangulation_3_module)  -o $(Triangulation_3_module).so
++	@g++ $(LDFLAGS) $(OBJ_of_Triangulation_3_module)  -o $(Triangulation_3_module).so $(CGAL_PYTHON_LDFLAGS)
+ 	@echo '$(Triangulation_3_module) module is created in ./$(Triangulation_3_module)/$(Triangulation_3_module).so'
+ 
+ .cpp.o: