1 |
commit: 04bcd9c79ab6e156328aec4cc50fd6e77d6e3ebd |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 14 10:38:27 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 14 13:35:05 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04bcd9c7 |
7 |
|
8 |
sci-libs/voro++: EAPI-6 bump |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
sci-libs/voro++/files/voro++-0.4.6-cmake.patch | 8 ++++---- |
14 |
sci-libs/voro++/voro++-0.4.6-r1.ebuild | 13 ++++++------- |
15 |
2 files changed, 10 insertions(+), 11 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/voro++/files/voro++-0.4.6-cmake.patch b/sci-libs/voro++/files/voro++-0.4.6-cmake.patch |
18 |
index 375d58f6474..c848748c5cf 100644 |
19 |
--- a/sci-libs/voro++/files/voro++-0.4.6-cmake.patch |
20 |
+++ b/sci-libs/voro++/files/voro++-0.4.6-cmake.patch |
21 |
@@ -1,7 +1,7 @@ |
22 |
Index: CMakeLists.txt |
23 |
=================================================================== |
24 |
---- CMakeLists.txt (revision 0) |
25 |
-+++ CMakeLists.txt (working copy) |
26 |
+--- a/CMakeLists.txt (revision 0) |
27 |
++++ b/CMakeLists.txt (working copy) |
28 |
@@ -0,0 +1,109 @@ |
29 |
+cmake_minimum_required(VERSION 2.6) |
30 |
+ |
31 |
@@ -114,8 +114,8 @@ Index: CMakeLists.txt |
32 |
+add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) |
33 |
Index: CMakeModules/cmake_uninstall.cmake.in |
34 |
=================================================================== |
35 |
---- CMakeModules/cmake_uninstall.cmake.in (revision 0) |
36 |
-+++ CMakeModules/cmake_uninstall.cmake.in (working copy) |
37 |
+--- a/CMakeModules/cmake_uninstall.cmake.in (revision 0) |
38 |
++++ b/CMakeModules/cmake_uninstall.cmake.in (working copy) |
39 |
@@ -0,0 +1,22 @@ |
40 |
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") |
41 |
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") |
42 |
|
43 |
diff --git a/sci-libs/voro++/voro++-0.4.6-r1.ebuild b/sci-libs/voro++/voro++-0.4.6-r1.ebuild |
44 |
index 1f1aa5a860a..203bee51e02 100644 |
45 |
--- a/sci-libs/voro++/voro++-0.4.6-r1.ebuild |
46 |
+++ b/sci-libs/voro++/voro++-0.4.6-r1.ebuild |
47 |
@@ -1,9 +1,9 @@ |
48 |
-# Copyright 1999-2014 Gentoo Foundation |
49 |
+# Copyright 1999-2018 Gentoo Authors |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
|
52 |
-EAPI=5 |
53 |
+EAPI=6 |
54 |
|
55 |
-inherit cmake-utils multilib |
56 |
+inherit cmake-utils |
57 |
|
58 |
DESCRIPTION="A 3D Voronoi cell software library" |
59 |
HOMEPAGE="http://math.lbl.gov/voro++/" |
60 |
@@ -14,12 +14,11 @@ SLOT="0" |
61 |
KEYWORDS="amd64 x86" |
62 |
IUSE="" |
63 |
|
64 |
-DEPEND="" |
65 |
-RDEPEND="${DEPEND}" |
66 |
- |
67 |
PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) |
68 |
|
69 |
src_configure() { |
70 |
- mycmakeargs=( -DLIB=$(get_libdir) ) |
71 |
+ local mycmakeargs=( |
72 |
+ -DLIB=$(get_libdir) |
73 |
+ ) |
74 |
cmake-utils_src_configure |
75 |
} |