Revbump to cmakeargs variable name, adjust policy for cmake-3.3 and fix subdir walking (bugs 556258, 556130). Add slot on mpfr.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 117 insertions, 8 deletions

diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog
index 60dba5855761..cfc2b5d793c0 100644
--- a/sci-mathematics/cgal/ChangeLog
+++ b/sci-mathematics/cgal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/cgal
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.26 2015/02/22 11:15:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.27 2015/08/08 10:42:39 xmw Exp $
+
+*cgal-4.3-r1 (08 Aug 2015)
+
+  08 Aug 2015; Michael Weber <xmw@gentoo.org> +cgal-4.3-r1.ebuild,
+  +files/cgal-4.3-cmake-3.3.patch, cgal-4.3.ebuild:
+  Revbump to cmakeargs variable name, adjust policy for cmake-3.3 and fix subdir
+  walking (bugs 556258, 556130). Add slot on mpfr.
 
   22 Feb 2015; Pacho Ramos <pacho@gentoo.org> cgal-4.3.ebuild:
   amd64/x86 stable, bug #540522
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 3b7a4446ba0f..c2f73629603c 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cgal-4.3-cmake-3.3.patch 979 SHA256 91280138cdbed8e1e159574b2554e64ac441cc1b93f914be7ce2a618d7e9fe19 SHA512 4a471e27a9dbad5412f4e414d8c55850e29bf97a106a0f49317431aa067b8c2b0600feadb72efb61456c1a265f21cf84237d447a36c86927a33e5ad3bd775169 WHIRLPOOL 578e843e73c3533979fc46937928bf031fde4c4c86c752776727b687e64de9b8932257195354cf9ad04261318ff2324ad118882789aec80a776ade7e3ca09a18
 DIST CGAL-4.3-doc_html.tar.xz 15582924 SHA256 dd28989ee950178b3f22d8b14111510312586c1a2c0b29a73a2a14d7d7eb5059 SHA512 41125ab3b5135ae539365e6c128f79119a679292e734e1669cc43a35996363951f5a5d494f8c25c3b1eab75a69137ed51bf7b65ad6d47e56756212565ec245ec WHIRLPOOL 961c4fea224e2c94a65a7dd07b16326159e9fe95f9176abd0cc96be3cb53060c076a80d5efd2d9c640c2aa2eea0d3d06ce64839961906a588706647830849972
 DIST CGAL-4.3.tar.xz 10108992 SHA256 cc475885b4ca4b15ab5d446c0e554b7b69f6980969bc3a8c5b83f8da4ee1bb04 SHA512 dcf329232f6511be6b7eecef7afbfd505529385cb29a3717b762068a3dac52b3706b1d55c6e30b677c6cf2f99aae937de7d730d30cc33680fc39df0f0ff76e70 WHIRLPOOL 862d5bc3387afa1b6702974b7fab3b7d4c35334023eb813bb52a6c7092d6f89104db8c7b851fd7ebb7dfdd38392f9d6459e9afab34bf237b0484f7d395035873
-EBUILD cgal-4.3.ebuild 1636 SHA256 ee2eea2e27dea60e582ef380827bb2f602668f44315d35827ff4b5a81cf1af3d SHA512 18d6ca10506de6dbaf3c448a0216411667c51ac551aeef758a4abd1ee4cb1d10d2fa88cefec801998220027bd6ec173b2dd3d3a73439a9cae0b46ccdc572b8ed WHIRLPOOL 1b5596eab87b0317d7d924d68572592564d2015d267bb96ab5df6f126df0c3394f7577780ccce730e10e9a038ed8555b458e58e4c578c9b6996d377c05275c42
-MISC ChangeLog 4004 SHA256 3c9ca2fd1b8c0899b6bfed13f0a1c404f77aae4381d344b34bd2b6c5a52985a5 SHA512 eb4810256aba6520c5c5520acb431d6c1af01bf46d49fc375fc8ab95da5ecec6136c1d422e3c405c1bf04d23dc813b2a13e5ce2abbdc5aee4e83f2df2dc2c5e6 WHIRLPOOL c24269ea61b5912b13e091b1059381287bb3c49021819d3695a46e5bd1d077afbf7dc9349de7304ab58c6eb7c0d6fb8020b19f6d66219eae89b28efbe4181c60
+EBUILD cgal-4.3-r1.ebuild 1684 SHA256 27ae6492f7703c7466bf4c17cb0dc000f201eb128d7c9ced2dcbd2f13a4e23d5 SHA512 3166140608b182fae827f48e5f081b04ac712c5cb3bfd80b4c1c6bd9e8dd8df7ae3a9a77947f87cf873aeda5ea731543bed36f32eec0b0bfa5d548d309a90b8e WHIRLPOOL 3c93651a019d7f4ef49a5d8be8e46fa32b8f2afa5c4587d0f4a7d34bc1c9a44d3a754435cb44e87787159d5221304735926487deec90efdaead979b828786f35
+EBUILD cgal-4.3.ebuild 1636 SHA256 ac459bbd233c75f3759809f9dbe45d5de02eeb974e635a7de023fea29934da7a SHA512 6e615e89cbd5f463abf597d30bb2b6ef240a4db2d1091beb09a0be6c459f429516c5c0b120243f30819c2079db420d3310af804c12dd0450f19761e89a7f84fc WHIRLPOOL 6bdf6dbd9bb7c54ee7868baec07e1a1edd54d2d16fabc8f7c04a08fb43f3b5dd68e2a43733f119193aa0c3ca6161dac4436b08a6c9f1b00cadce57f22d6462cd
+MISC ChangeLog 4282 SHA256 f068a1355f58efa38dbe352fa4ba5f50fdab5d354161ca813e0c81d10993232a SHA512 26f6d1eae0092f0a6ac493f90bf2730722552042c85dace7ee225988c37cc2685f2898ca64ef907939683ed8dc5c8b5d4e6a3d6c915dc184b00888ebebaf514f WHIRLPOOL f98e48c7dd30c682b9fcce392054ba227a251c7f8c70b0078a65331d9510493181e25cb4d40c0b4e6b54ba35b267f3271c12a2c5e5855f2eaae012749346c997
 MISC metadata.xml 1071 SHA256 b319d51a60c4ff895e7dd83c1b1967d5087cd163805bffb1fbe6263cb5142a73 SHA512 670809d80b718af57f63affea3d2338ba23b4d4efb3dd6598d8ac2de6fd800469d8c8d89fb67737f19460f5a8d4bb537a08f644c1e03d7d5d5d12c0676103a39 WHIRLPOOL 969166498b785e4dce0d9767ee3ff278d335ed3076907d9887859659ea32a43565e0391a68f87d61eac1fa063a8129444f1b2000528d8b8ac26ed3032969798e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTpukUACgkQCaWpQKGI+9QwjQCfXZfOS+PweD32SkL0HV+WZ+kl
-VA4AnAquo769iPfc5HMeljLdHdBHlrlq
-=ggnt
+iF4EAREIAAYFAlXF3SAACgkQknrdDGLu8JDAdgEAjW5yEMiZrGN08pUqSMYUYofp
+/NBSneExBT2n/OImn3UA/RCCZdLcngEJUqZ2ZL3oeYnxtphgBcD8kC+mMSHObmQF
+=I11d
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/cgal/cgal-4.3-r1.ebuild b/sci-mathematics/cgal/cgal-4.3-r1.ebuild
new file mode 100644
index 000000000000..1cafc470d9dd
--- /dev/null
+++ b/sci-mathematics/cgal/cgal-4.3-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.3-r1.ebuild,v 1.1 2015/08/08 10:42:39 xmw Exp $
+
+EAPI=5
+
+CMAKE_BUILD_TYPE=Release
+
+inherit multilib cmake-utils
+
+MY_P=CGAL-${PV}
+PID=32995
+DPID=33000
+
+DESCRIPTION="C++ library for geometric algorithms and data structures"
+HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/"
+SRC_URI="
+	http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz
+	doc? ( http://gforge.inria.fr/frs/download.php/${DPID}/${MY_P}-doc_html.tar.xz )"
+
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples +gmp mpfi qt4"
+
+RDEPEND="
+	dev-libs/boost
+	dev-libs/mpfr:0
+	sys-libs/zlib
+	x11-libs/libX11
+	virtual/glu
+	virtual/opengl
+	gmp? ( dev-libs/gmp[cxx] )
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)
+	mpfi? ( sci-libs/mpfi )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS CHANGES* README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cmake-3.3.patch
+
+	cmake-utils_src_prepare
+	sed \
+		-e '/install(FILES AUTHORS/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCGAL_INSTALL_LIB_DIR=$(get_libdir)
+		-DWITH_CGAL_Qt3=OFF
+		-DWITH_LEDA=OFF
+		$(cmake-utils_use_with gmp)
+		$(cmake-utils_use_with gmp GMPXX)
+		$(cmake-utils_use_with qt4 CGAL_Qt4)
+		$(cmake-utils_use_with mpfi)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${WORKDIR}"/doc_html/. )
+	cmake-utils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples demo
+	fi
+}
diff --git a/sci-mathematics/cgal/cgal-4.3.ebuild b/sci-mathematics/cgal/cgal-4.3.ebuild
index cff35e4a6796..dd4697b927a9 100644
--- a/sci-mathematics/cgal/cgal-4.3.ebuild
+++ b/sci-mathematics/cgal/cgal-4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.3.ebuild,v 1.4 2015/02/22 11:15:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.3.ebuild,v 1.5 2015/08/08 10:42:39 xmw Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ IUSE="doc examples +gmp mpfi qt4"
 
 RDEPEND="
 	dev-libs/boost
-	dev-libs/mpfr
+	dev-libs/mpfr:0
 	sys-libs/zlib
 	x11-libs/libX11
 	virtual/glu
diff --git a/sci-mathematics/cgal/files/cgal-4.3-cmake-3.3.patch b/sci-mathematics/cgal/files/cgal-4.3-cmake-3.3.patch
new file mode 100644
index 000000000000..b1490454e559
--- /dev/null
+++ b/sci-mathematics/cgal/files/cgal-4.3-cmake-3.3.patch
@@ -0,0 +1,24 @@
+--- CGAL-4.3/CMakeLists.txt
++++ CGAL-4.3/CMakeLists.txt
+@@ -19,6 +19,10 @@
+   cmake_policy(VERSION 2.6)
+ endif()
+ 
++if(POLICY  CMP0026)
++  cmake_policy(SET  CMP0026  OLD)
++endif()
++
+ #--------------------------------------------------------------------------------------------------
+ #
+ #                                    -= PACKAGE SETUP =-
+--- CGAL-4.3/src/CMakeLists.txt
++++ CGAL-4.3/src/CMakeLists.txt
+@@ -116,7 +116,7 @@
+   file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL_*/CMakeLists.txt)
+   foreach (libconfigfile ${CONFIGURED_LIBS_IN_PACKAGE})
+     string(REPLACE "${package}/src/" "" libconfigfile ${libconfigfile})
+-    string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
++    string(REPLACE "/CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
+     if (NOT ${CGAL_CONFIGURED_LIBRARY_NAME} STREQUAL "CGAL")
+ 
+      message(STATUS "Sources for CGAL component library '${CGAL_CONFIGURED_LIBRARY_NAME}' detected")