1 |
commit: 065fb013c767a2f6b3229091b64e92199270c78a |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 27 00:32:34 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 27 00:32:34 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=065fb013 |
7 |
|
8 |
sci-libs/dmlc-core: update EAPI 6 -> 8 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/833305 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
...0719.ebuild => dmlc-core-0_p20170719-r1.ebuild} | 45 +++++++++++++--------- |
14 |
1 file changed, 27 insertions(+), 18 deletions(-) |
15 |
|
16 |
diff --git a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild b/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild |
17 |
similarity index 72% |
18 |
rename from sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild |
19 |
rename to sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild |
20 |
index c8f88ae4220d..991dc719c890 100644 |
21 |
--- a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild |
22 |
+++ b/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild |
23 |
@@ -1,9 +1,9 @@ |
24 |
# Copyright 1999-2022 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI=6 |
28 |
+EAPI=8 |
29 |
|
30 |
-inherit toolchain-funcs cmake-utils |
31 |
+inherit cmake toolchain-funcs |
32 |
|
33 |
DESCRIPTION="Common bricks library for building distributed machine learning" |
34 |
HOMEPAGE="https://github.com/dmlc/dmlc-core" |
35 |
@@ -12,10 +12,11 @@ if [[ ${PV} == *9999* ]] ; then |
36 |
EGIT_REPO_URI="https://github.com/dmlc/${PN}.git" |
37 |
inherit git-r3 |
38 |
else |
39 |
- EGIT_COMMIT="54db57d5d1b2a7b93319053011802888b827a539" |
40 |
+ MY_COMMIT="54db57d5d1b2a7b93319053011802888b827a539" |
41 |
inherit vcs-snapshot |
42 |
+ SRC_URI="https://github.com/dmlc/dmlc-core/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" |
43 |
+ |
44 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
45 |
- SRC_URI="https://github.com/dmlc/dmlc-core/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
46 |
fi |
47 |
|
48 |
LICENSE="Apache-2.0" |
49 |
@@ -28,9 +29,11 @@ RESTRICT="!test? ( test )" |
50 |
|
51 |
RDEPEND="net-misc/curl[ssl]" |
52 |
DEPEND="${RDEPEND} |
53 |
- doc? ( app-doc/doxygen ) |
54 |
- test? ( dev-cpp/gtest ) |
55 |
-" |
56 |
+ test? ( dev-cpp/gtest )" |
57 |
+BDEPEND="doc? ( |
58 |
+ app-doc/doxygen |
59 |
+ dev-texlive/texlive-fontutils |
60 |
+ )" |
61 |
|
62 |
PATCHES=( "${FILESDIR}"/${PN}-install-dirs.patch ) |
63 |
|
64 |
@@ -43,13 +46,15 @@ pkg_setup() { |
65 |
} |
66 |
|
67 |
src_prepare() { |
68 |
- cmake-utils_src_prepare |
69 |
- # respect user flags (SSE2 does nothing more than adding -msse2) |
70 |
- # also doc install everything so remove |
71 |
+ cmake_src_prepare |
72 |
+ |
73 |
+ # Respect user flags (SSE2 does nothing more than adding -msse2) |
74 |
+ # Also doc installs everything, so remove |
75 |
sed -e '/-O3/d' \ |
76 |
-e '/check_cxx.*SSE2/d' \ |
77 |
-i CMakeLists.txt || die |
78 |
- # all these hacks below to allow testing |
79 |
+ |
80 |
+ # All these hacks below to allow testing |
81 |
sed -e 's|-O3||' -e 's|-lm|-lm -L$(LD_LIBRARY_PATH) -ldmlc|g' -i Makefile || die |
82 |
sed -e "s|libdmlc.a||g" \ |
83 |
-i test/dmlc_test.mk test/unittest/dmlc_unittest.mk || die |
84 |
@@ -66,15 +71,16 @@ src_prepare() { |
85 |
|
86 |
src_configure() { |
87 |
local mycmakeargs=( |
88 |
- -DBUILD_SHARED_LIBS=ON |
89 |
- -DUSE_S3="$(usex s3)" |
90 |
- -DUSE_OPENMP="$(usex openmp)" |
91 |
+ -DUSE_S3=$(usex s3) |
92 |
+ -DUSE_OPENMP=$(usex openmp) |
93 |
) |
94 |
- cmake-utils_src_configure |
95 |
+ |
96 |
+ cmake_src_configure |
97 |
} |
98 |
|
99 |
src_compile() { |
100 |
- cmake-utils_src_compile |
101 |
+ cmake_src_compile |
102 |
+ |
103 |
if use doc; then |
104 |
doxygen doc/Doxyfile || die |
105 |
fi |
106 |
@@ -82,13 +88,16 @@ src_compile() { |
107 |
|
108 |
src_test() { |
109 |
tc-export CXX |
110 |
- export LD_LIBRARY_PATH="${BUILD_DIR}" |
111 |
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}" |
112 |
+ |
113 |
emake test |
114 |
+ |
115 |
test/unittest/dmlc_unittest || die |
116 |
} |
117 |
|
118 |
src_install() { |
119 |
- cmake-utils_src_install |
120 |
+ cmake_src_install |
121 |
+ |
122 |
if use doc; then |
123 |
dodoc -r doc/doxygen/html |
124 |
docompress -x /usr/share/doc/${PF}/html |