keyword amd64-linux x86-linux

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

6 files changed, 13 insertions, 175 deletions

diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog
index baca9df38b9b..9a0cd9857176 100644
--- a/sci-mathematics/cgal/ChangeLog
+++ b/sci-mathematics/cgal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/cgal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.17 2012/07/07 12:44:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.18 2012/08/09 18:06:20 bicatali Exp $
+
+  09 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -cgal-3.9.ebuild,
+  -cgal-4.0.ebuild, -files/cgal-4.0-gcc47.patch, cgal-4.0.2.ebuild:
+  keyword amd64-linux x86-linux
 
 *cgal-4.0.2 (07 Jul 2012)
 
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 7e59a1f02b1a..478932a954cd 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,22 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX cgal-4.0-gcc47.patch 502 SHA256 33fc60b21d6899908125af0aa4ee9d2c35d3fe978d7be9d0821efd15be3adbaa SHA512 78694ab472a2a21c98309c3e81023ec84e581a4ad5416ae322adea0377449368aaf35cec17d051701ae92587464cc5209f521b9ed56a7d7d3241da40983ed0a4 WHIRLPOOL 57b9e4141f899416bf6ef9558b243cccf107021c68a98f8fa3a6a3e32c40b8f565cf97a13f810164310b7a59e0bf155a1efc13ace7e690edddf46dc68369081a
-DIST CGAL-3.9-doc_html.tar.xz 17943040 SHA256 5f22c62365540a036fa66e18a3abe55fc4f5cb36a60717711c54029c032f8120
-DIST CGAL-3.9.tar.xz 9853500 SHA256 a5d50f3788b1acd34a20ef84c071f8eb66eeacc5e12760292d6f7c0ff041022c
-DIST CGAL-4.0-doc_html.tar.xz 18465688 SHA256 247501ba4fdcaf459ceb3066f79a9cba8cae27d7b5ddd622b3409f20a8e9a244
 DIST CGAL-4.0.2-doc_html.tar.xz 18465432 SHA256 64b0faa9e0aab427a0d1a608d2cb5f176eb9a2b1420ac55e3a35f9c4f3a51595 SHA512 12c915bab8659ca0ae6fb9b0eee7da9942c805c7c86c1402d394250cf3160cec7c11040b087a261c2e76bcdec1c78bf6f0f273e81636d938ba50d8ab7c106560 WHIRLPOOL fa1445c0cd6fc4ddb7c4d840f01c29a10b165e6dd047749f7365fc57daf96a9b794e7904133788bf9958279fea541931462225565bfe571bdb5573cb4b31d57a
 DIST CGAL-4.0.2.tar.xz 9899924 SHA256 02d6c8acbb9775b779d0a89e249319e31f54eda18bcfa6b5cdb993d1004efe08 SHA512 d15798f5da178a53d205516588626a4887d04cd03210c100fcc26c989b82c14c90860250a8aec8ca56b801a1e7080eb845220b0077f225b7e5fe8bbd57de3df5 WHIRLPOOL 31cc66c1cc1ac0b79c4638fbacf6596e95f4f1af9ea5a549622c6aa8b91203f1e9f0e33b44e9b9112d97d6183d516f21ff7c3ff525458a552f02764e19c41747
-DIST CGAL-4.0.tar.xz 9875796 SHA256 a64f0d4b387b9db4cb76410776b93b4c6c86d1b0c5d049ed00386951ca72a5f3
-EBUILD cgal-3.9.ebuild 1813 SHA256 7ac762d0bc0ead47c586c9a2eaed3133d3b8409394df6e38da5bdbbc9131de00 SHA512 07c89e89e6e1919d0a6d74c40c5a9144d07c79c7eb9dc54e35c26d7173a148ae96b04c8ee0be30c37927d021eaaac02299d83f06ecffd28e0a931a6c45b1faca WHIRLPOOL d0fce674de82aeb7483c9c7f32e49b9793be2ad0a3ea6a399bfa34f00f7788d5b49fb31c9a4c74c528f43b83a0c146499ffae20ec13bd7cb714993851304c3ba
-EBUILD cgal-4.0.2.ebuild 1590 SHA256 7820839a09479747030cdd7a7979ca099ed40ada2723b130205fd5ce766aa206 SHA512 b8f193d3af64e27e2d342757ca4b63ff681c8ceb6e059d8f90df248cd4fd8ae343ecca0b6cefc865fea673feb29bd1c9b4ae5623b3870de956b4394bd74e4141 WHIRLPOOL 2664dd2bf4d379dc6b0dfc6da8c71c3b6f28d53ecfaa999fc0529529e790330152c54e343d17cc252f4a8b37ed64854cd04b662b453153429fd24d0e8a1c62a5
-EBUILD cgal-4.0.ebuild 1696 SHA256 aabbe1ac5b55fbc9d495f1b4ba6665d833d5b631de4654362a8ad97fc339167c SHA512 d5a90187d7299d7365b13b39d74df29c9e0f9ed5ecdd46f78ba1cf779d101e38fffb54f7b0ed420873259db520a7e29422540167755d1187540f6806c6330fca WHIRLPOOL 3acf12ffbb7c031dfcb4cf5c44185d74d16fd377b1b8033707e32005ac8b2f40af0323b0608dcc4c6bca3761a6ca68a3f9a41d70078855cc7cb7c1e26780eed1
-MISC ChangeLog 2818 SHA256 4987c3613b1b4c6358515d9bc81a91249d6478a93e450b0218fc2a4b6c7bbfcd SHA512 e5e56b0cb3930a8b0d8f5c96da377826b5f464f033272f2de19ed8a77c30985425ef954b46ba55e0cbc9174474e5b2b189248d142b394a8dd04712f178574ff5 WHIRLPOOL e4a03cb893cdcbfa841a217a2b54965af4e00e32fa5310b0e22a1ed17fb627d8fde21f9c7c717a6dcf9b3cb905d58b374163058f0fbf41ec93f6f22bdf7d2994
+EBUILD cgal-4.0.2.ebuild 1614 SHA256 b3a7672572f2fa09b22c13d78af280dfc9464c943a29d276723b21204b35297a SHA512 c96fddb8ea80d53bc562fc1dcc396cd1231ab75c7102334f7debf03094e71c4fa80e1d60833ee18e7770c2b01cdcd2a203411f1a9e3f21edfb4a9b52e15d5f91 WHIRLPOOL 5ab7ba0f27123b08b611c2a251070389d051cfabd025cf74261a530e1d7009839f5f67acbc8d21ae6624e27ba73defa232273bdab54a1e96444dc3d8ee5a57af
+MISC ChangeLog 2992 SHA256 bd9cd6ab125e423d2153f66e847356be25d6aaa8c3f4a3320965f0c4ce37cdf4 SHA512 294db78f0ff7d7466aa674cb1a1ef30759a63c548f63e33e67d563ab35fa99e228d23d8ed54810f95ee7bb276210bc563d46d628c895cb828f960e21e536b6d0 WHIRLPOOL 803bf45ceec1c19e49ba91a5775a94f041c46f4f807d2e40fa9634668e4ba0358d3c00ea7c71de377fa3e13342640ba851d6d3914bac80b36c50a43dca3e8ca3
 MISC metadata.xml 1049 SHA256 9b0ea9aa750cf2ca562d0b7e11e83f3b707455f7afb50052c35ca959d0966adb SHA512 c6c8ece5bfa13615311d9bcbcf848b9a24ca270586b70a218802ab797d0974886c09924c33d12386b07a161c1b12ed99f3bc792eb4984ed5ba990d20949db2b5 WHIRLPOOL 31e811dd9b0993f5d428e1fa548ce079622060a0195d0e71f1b2939c51564492b3dacc8843b5197d9f8be96488107cbdbf6f32431d04e8e76e96367c570198b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/4PB4ACgkQ1ycZbhPLE2D1bQCffFxniMXYDZKds817ENdS4bFc
-MWMAnjgh+2D47A23Ec8eOL7LF8N0XQNL
-=rCxO
+iEYEAREIAAYFAlAj/CIACgkQ1ycZbhPLE2CVoACgm1Cum//WJNWaWh1u0XcWba5N
+k4oAn1rO+Xy8ljzFvx2qhMjvMHtEYebA
+=50Nh
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/cgal/cgal-3.9.ebuild b/sci-mathematics/cgal/cgal-3.9.ebuild
deleted file mode 100644
index 47dde121ae35..000000000000
--- a/sci-mathematics/cgal/cgal-3.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.9.ebuild,v 1.3 2012/05/04 07:46:50 jdhore Exp $
-
-EAPI=4
-CMAKE_BUILD_TYPE=Release
-inherit base multilib cmake-utils
-
-MY_P=CGAL-${PV}
-PID=29122
-DPID=29120
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="http://www.cgal.org/"
-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-2.1 MIT QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cxx doc examples +gmp lapack mpfi qt4"
-
-RDEPEND="dev-libs/boost
-	dev-libs/mpfr
-	sys-libs/zlib
-	x11-libs/libX11
-	virtual/opengl
-	gmp? ( dev-libs/gmp[cxx=] )
-	lapack? ( virtual/lapack )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4 )
-	mpfi? ( sci-libs/mpfi )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES* README"
-
-src_prepare() {
-	base_src_prepare
-	sed -i \
-		-e '/install(FILES AUTHORS/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs
-	if use gmp; then
-		mycmakeargs+=( $(cmake-utils_use_with cxx GMPXX) )
-	else
-		mycmakeargs+=( "-DWITH_GMPXX=OFF" )
-	fi
-	mycmakeargs+=(
-		"-DCGAL_INSTALL_LIB_DIR=$(get_libdir)"
-		"-DWITH_CGAL_Qt3=OFF"
-		"-DWITH_LEDA=OFF"
-		$(cmake-utils_use_with examples)
-		$(cmake-utils_use_with examples DEMOS)
-		$(cmake-utils_use_with gmp)
-		$(cmake-utils_use_with lapack CPACK)
-		$(cmake-utils_use_with qt4 CGAL_Qt4)
-		$(cmake-utils_use_with mpfi)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-mathematics/cgal/cgal-4.0.2.ebuild b/sci-mathematics/cgal/cgal-4.0.2.ebuild
index 846be0a8e0d8..ecc76bfd5110 100644
--- a/sci-mathematics/cgal/cgal-4.0.2.ebuild
+++ b/sci-mathematics/cgal/cgal-4.0.2.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-mathematics/cgal/cgal-4.0.2.ebuild,v 1.1 2012/07/07 12:44:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.0.2.ebuild,v 1.2 2012/08/09 18:06:20 bicatali Exp $
 
 EAPI=4
 CMAKE_BUILD_TYPE=Release
@@ -17,7 +17,7 @@ SRC_URI="http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples +gmp mpfi qt4"
 
 RDEPEND="dev-libs/boost
diff --git a/sci-mathematics/cgal/cgal-4.0.ebuild b/sci-mathematics/cgal/cgal-4.0.ebuild
deleted file mode 100644
index 73642255fb05..000000000000
--- a/sci-mathematics/cgal/cgal-4.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.0.ebuild,v 1.4 2012/05/10 17:48:10 bicatali Exp $
-
-EAPI=4
-CMAKE_BUILD_TYPE=Release
-inherit base multilib cmake-utils
-
-MY_P=CGAL-${PV}
-PID=30385
-DPID=30389
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="http://www.cgal.org/"
-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"
-IUSE="+cxx doc examples +gmp mpfi qt4"
-
-RDEPEND="dev-libs/boost
-	dev-libs/mpfr
-	sys-libs/zlib
-	x11-libs/libX11
-	virtual/opengl
-	gmp? ( dev-libs/gmp[cxx=] )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4 )
-	mpfi? ( sci-libs/mpfi )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES* README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-	base_src_prepare
-	sed -i \
-		-e '/install(FILES AUTHORS/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs
-	if use gmp; then
-		mycmakeargs+=( $(cmake-utils_use_with cxx GMPXX) )
-	else
-		mycmakeargs+=( "-DWITH_GMPXX=OFF" )
-	fi
-	mycmakeargs+=(
-		"-DCGAL_INSTALL_LIB_DIR=$(get_libdir)"
-		"-DWITH_CGAL_Qt3=OFF"
-		"-DWITH_LEDA=OFF"
-		$(cmake-utils_use_with gmp)
-		$(cmake-utils_use_with qt4 CGAL_Qt4)
-		$(cmake-utils_use_with mpfi)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples demo
-	fi
-}
diff --git a/sci-mathematics/cgal/files/cgal-4.0-gcc47.patch b/sci-mathematics/cgal/files/cgal-4.0-gcc47.patch
deleted file mode 100644
index a2ed0e488803..000000000000
--- a/sci-mathematics/cgal/files/cgal-4.0-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/CGAL/Mesh_2/Do_not_refine_edges.h.ori	2012-04-25 23:14:26.132198961 +0200
-+++ ./include/CGAL/Mesh_2/Do_not_refine_edges.h	2012-04-25 23:14:46.304953789 +0200
-@@ -80,7 +80,7 @@
-       const Face_handle& fh = eit->first;
-       const int& i = eit->second;
- 
--      if(fh->is_constrained(i) && !is_locally_conform(this->tr, fh, i, p))
-+      if(fh->is_constrained(i) && !this->is_locally_conform(this->tr, fh, i, p))
-       {
-         return CONFLICT_AND_ELEMENT_SHOULD_BE_DROPPED;
-       }