projects / shuber-gentoo-overlay.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 830b5e8)
cgal-ipelets: Add 4.6.1, fix c++11 build flags
authorStefan Huber <shuber@sthu.org>
Sun, 24 Jan 2016 15:17:52 +0000 (16:17 +0100)
committerStefan Huber <shuber@sthu.org>
Sun, 24 Jan 2016 15:17:52 +0000 (16:17 +0100)
media-gfx/cgal-ipelets/Manifest patch | blob | history
media-gfx/cgal-ipelets/cgal-ipelets-4.3.ebuild patch | blob | history
media-gfx/cgal-ipelets/cgal-ipelets-4.6.1.ebuild [moved from media-gfx/cgal-ipelets/cgal-ipelets-4.1.ebuild with 63% similarity] patch | blob | history
media-gfx/cgal-ipelets/files/c++11.patch [new file with mode: 0644] patch | blob

diff --git a/media-gfx/cgal-ipelets/Manifest b/media-gfx/cgal-ipelets/Manifest
index d191d1c6a2d85d3844ceffcec720a73d08260d13..c8c65eb4534f0e2a7a27584e06cd2a0a1f97a850 100644 (file)
--- a/media-gfx/cgal-ipelets/Manifest
+++ b/media-gfx/cgal-ipelets/Manifest
@@ -1,4 +1,5 @@
-DIST CGAL-4.1.tar.xz 9972676 SHA256 83038ceb6c4f76a88ddf8c3b02d628144c5271677184689f4ae95f79061ab50e SHA512 fc96f72ea88121fcb40051c9d73830c54ffbebc2456d4269b2ad950767bab7ae96c1417230d88a252d20ddb9b9106c188c0369f062cb5d9d3ded0b268471a400 WHIRLPOOL 120de86898373b52b472ac2538ae5f6b8393b42c7d3e29396464318c77a9d2af1b2a1011d18e2268e6fe563089d032ac09f5d3c207dc57e0ce5f535e8fe129ab
+AUX c++11.patch 487 SHA256 9a842b988e05c8e6556314e7889467d314c172c502aa178c828fa4de6a547c88 SHA512 5e611b87c7f57380cdbd6ab50dddc28b5c671f5a1701c9505b7d8fdbc9384faecfd19e54f184231852f9f6334dd99092679521fce01518d1c381021541e48b58 WHIRLPOOL 724049beccb36b41fb5c23916a705743aff97ddb0ff6fceb2210ed9844fa6eadffaa4c9dd987a60a647d8687539818d578001bc20f2bab182e9c1393dec510b9
 DIST CGAL-4.3.tar.xz 10108992 SHA256 cc475885b4ca4b15ab5d446c0e554b7b69f6980969bc3a8c5b83f8da4ee1bb04 SHA512 dcf329232f6511be6b7eecef7afbfd505529385cb29a3717b762068a3dac52b3706b1d55c6e30b677c6cf2f99aae937de7d730d30cc33680fc39df0f0ff76e70 WHIRLPOOL 862d5bc3387afa1b6702974b7fab3b7d4c35334023eb813bb52a6c7092d6f89104db8c7b851fd7ebb7dfdd38392f9d6459e9afab34bf237b0484f7d395035873
 DIST CGAL-4.3.tar.xz 10108992 SHA256 cc475885b4ca4b15ab5d446c0e554b7b69f6980969bc3a8c5b83f8da4ee1bb04 SHA512 dcf329232f6511be6b7eecef7afbfd505529385cb29a3717b762068a3dac52b3706b1d55c6e30b677c6cf2f99aae937de7d730d30cc33680fc39df0f0ff76e70 WHIRLPOOL 862d5bc3387afa1b6702974b7fab3b7d4c35334023eb813bb52a6c7092d6f89104db8c7b851fd7ebb7dfdd38392f9d6459e9afab34bf237b0484f7d395035873
-EBUILD cgal-ipelets-4.1.ebuild 603 SHA256 278c73bc18eacad07d6033d88342db373d26b903a49b6e1e02ee632ac52f4f9c SHA512 f02c01b0f827824b65be21e41c0598306ef6a3dbe6580971b0df7b00d91181eef4f0ac5748c09813d6b8a5d8f89f8de7a8c7066957ff298445c6f0f2e5845949 WHIRLPOOL 7b6d713f9c003a73104a8ed11f9a69977716ce84ca93e67eed0410a96b72637907248230c8240dc85be910a169fb5d043531d8de2c4f076d9b6646fd1828aa7b
-EBUILD cgal-ipelets-4.3.ebuild 603 SHA256 278c73bc18eacad07d6033d88342db373d26b903a49b6e1e02ee632ac52f4f9c SHA512 f02c01b0f827824b65be21e41c0598306ef6a3dbe6580971b0df7b00d91181eef4f0ac5748c09813d6b8a5d8f89f8de7a8c7066957ff298445c6f0f2e5845949 WHIRLPOOL 7b6d713f9c003a73104a8ed11f9a69977716ce84ca93e67eed0410a96b72637907248230c8240dc85be910a169fb5d043531d8de2c4f076d9b6646fd1828aa7b
+DIST CGAL-4.6.1.tar.xz 12014652 SHA256 33bd82871ccbaf16dc509f78f3f91dd35d44197cad64bffa63a1671a1812351a SHA512 4227ea03c23f3858a47e0559bc0a3df34e447e18e2b053048378c479b9b7fa2a157cf9aa546d7659a1d4d640218944fe1104a21769144cdfdc8a5144299f4b61 WHIRLPOOL 309deea6268d036b14796b411a7dcdbe75433a6d5eb2296387b05f2957e538cce6e6fe0b23be3921a500eae74db954058ed57aeef8759e44f4038d2fbab884f7
+EBUILD cgal-ipelets-4.3.ebuild 599 SHA256 b9bf9332f784c8d85ecfa34be7f2a4f74e08ceedf12d18a98f9dc1d7bb061149 SHA512 741b6de812971b0553c0b322cd536d218d2ea2ced41067cd27df1631f7006fbb948048723afd330504f938bea4a9cde841bb0351a6c2bb15cb980119af487b07 WHIRLPOOL 05944ca3e72b8ef254119a41373b54b835acfca5a1524e8c9202da893f45e928dc58d54132df4340986be984eba365a968acee0f612d3c07d446dfdb540eae5a
+EBUILD cgal-ipelets-4.6.1.ebuild 667 SHA256 27cd2b5e92de458e833e7bb8e81966752c59b6d78d3368c199bb6b24e0a6c6e7 SHA512 157aea423195e5ac0511ec470e02bcad0fc792f74b6542f6f7f20b0d011c85c60fbc3c886cafc2621e0976e055b1c02d3a633f2a468805d8dcf96e0b2957ee29 WHIRLPOOL 888df06621a864e935115a31bb734ef5c5cd05042ae741fc27870d46817d261b5405b445fba5b15d7b45d1b1d57f9760b025766384152e41c7af15067cbc0bdc
diff --git a/media-gfx/cgal-ipelets/cgal-ipelets-4.3.ebuild b/media-gfx/cgal-ipelets/cgal-ipelets-4.3.ebuild
index 1b250c7e5e293a7ec4a4db2a86a2b1aa6a25d950..22e58151b1ed61cc1e8e1deaab5318e69c4db4d6 100644 (file)
--- a/media-gfx/cgal-ipelets/cgal-ipelets-4.3.ebuild
+++ b/media-gfx/cgal-ipelets/cgal-ipelets-4.3.ebuild
@@ -7,13 +7,13 @@ CMAKE_BUILD_TYPE=Release
 
 inherit base multilib cmake-utils
 
 
 inherit base multilib cmake-utils
 
-CGAL_P=CGAL-${PV}
-PID=31639
-DPID=31647
+MY_P=CGAL-${PV}
+PID=32995
 
 DESCRIPTION="Ipe addons shipped with the CGAL library"
 HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/"
 
 DESCRIPTION="Ipe addons shipped with the CGAL library"
 HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${PID}/${CGAL_P}.tar.xz"
+SRC_URI="http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz"
+
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0"
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0"
@@ -21,10 +21,15 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
 IUSE=""
 
 DEPEND="
-       media-gfx/ipe
-       sci-mathematics/cgal
+       <=media-gfx/ipe-7.1
+       =sci-mathematics/cgal-4.3*
        "
 RDEPEND="${DEPEND}"
 
 
        "
 RDEPEND="${DEPEND}"
 
 
-S="${WORKDIR}/${CGAL_P}/demo/CGAL_ipelets"
+S="${WORKDIR}/${MY_P}/demo/CGAL_ipelets"
+
+src_prepare() {
+       cmake-utils_src_prepare
+       epatch ${FILESDIR}/c++11.patch
+}
diff --git a/media-gfx/cgal-ipelets/cgal-ipelets-4.1.ebuild b/media-gfx/cgal-ipelets/cgal-ipelets-4.6.1.ebuild
similarity index 63%
rename from media-gfx/cgal-ipelets/cgal-ipelets-4.1.ebuild
rename to media-gfx/cgal-ipelets/cgal-ipelets-4.6.1.ebuild
index 1b250c7e5e293a7ec4a4db2a86a2b1aa6a25d950..3943b483d65e0cbe39bd698edcebde70ecd39791 100644 (file)
--- a/media-gfx/cgal-ipelets/cgal-ipelets-4.1.ebuild
+++ b/media-gfx/cgal-ipelets/cgal-ipelets-4.6.1.ebuild
@@ -7,13 +7,12 @@ CMAKE_BUILD_TYPE=Release
 
 inherit base multilib cmake-utils
 
 
 inherit base multilib cmake-utils
 
-CGAL_P=CGAL-${PV}
-PID=31639
-DPID=31647
+MY_P=CGAL-${PV}
+PID=34900
 
 DESCRIPTION="Ipe addons shipped with the CGAL library"
 HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/"
 
 DESCRIPTION="Ipe addons shipped with the CGAL library"
 HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${PID}/${CGAL_P}.tar.xz"
+SRC_URI="http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0"
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0"
@@ -22,9 +21,13 @@ IUSE=""
 
 DEPEND="
        media-gfx/ipe
 
 DEPEND="
        media-gfx/ipe
-       sci-mathematics/cgal
+       =sci-mathematics/cgal-4.6*
        "
 RDEPEND="${DEPEND}"
 
        "
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${MY_P}/demo/CGAL_ipelets"
 
 
-S="${WORKDIR}/${CGAL_P}/demo/CGAL_ipelets"
+src_prepare() {
+       cmake-utils_src_prepare
+       epatch ${FILESDIR}/c++11.patch
+}
diff --git a/media-gfx/cgal-ipelets/files/c++11.patch b/media-gfx/cgal-ipelets/files/c++11.patch
new file mode 100644 (file)
index 0000000..5e8f4f1
--- /dev/null
+++ b/media-gfx/cgal-ipelets/files/c++11.patch
@@ -0,0 +1,11 @@
+--- demo/CGAL_ipelets/CMakeLists.txt   2016-01-24 16:00:03.071470747 +0100
++++ demo/CGAL_ipelets/CMakeLists.txt   2016-01-24 15:59:39.377947184 +0100
+@@ -118,6 +118,8 @@ if ( CGAL_FOUND )
+       message(STATUS "Set Ipelets install dir: ${IPELET_INSTALL_DIR}")
+     endif()
+ 
++      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++
+     foreach(IPELET ${CGAL_IPELETS})
+       add_library(CGAL_${IPELET} MODULE ${IPELET}.cpp)
+       add_to_cached_list(CGAL_EXECUTABLE_TARGETS CGAL_${IPELET})
Stefan Huber's gentoo overlay.