[gentoo-commits] gentoo-x86 commit in dev-python/cgal-python: ChangeLog cgal-python-0.9.4_beta1.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/02/26 00:30:38

  Modified:             ChangeLog cgal-python-0.9.4_beta1.ebuild
  Log:
  Link to CGAL, mpfr and gmp (if cgal was built with USE="gmp") wrt #306887, thanks to Kamil Kisiel for reporting.
  (Portage version: 2.2_rc63/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  dev-python/cgal-python/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cgal-python/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cgal-python/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cgal-python/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/cgal-python/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	10 Jan 2010 10:36:37 -0000	1.2
+++ ChangeLog	26 Feb 2010 00:30:37 -0000	1.3
@@ -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@g.o>
+  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)
 



1.2                  dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild?r1=1.1&r2=1.2

Index: cgal-python-0.9.4_beta1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/cgal-python/cgal-python-0.9.4_beta1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cgal-python-0.9.4_beta1.ebuild	10 Jan 2010 10:36:37 -0000	1.1
+++ cgal-python-0.9.4_beta1.ebuild	26 Feb 2010 00:30:37 -0000	1.2
@@ -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 @@
 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" \