[gentoo-commits] repo/gentoo:master commit in: sci-libs/armadillo/ - gentoo-commits

From:	"Andreas Hüttel" <dilfridge@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sci-libs/armadillo/
Date:	Fri, 13 Oct 2017 09:21:53
Message-Id:	`1507886469.2c6cb458fc33275af6abadf0a2fe904c92d6e972.dilfridge@gentoo`

1

commit:     2c6cb458fc33275af6abadf0a2fe904c92d6e972

2

Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>

3

AuthorDate: Fri Oct 13 09:21:09 2017 +0000

4

Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>

5

CommitDate: Fri Oct 13 09:21:09 2017 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6cb458

7

8

sci-libs/armadillo: Version bump

9

10

Package-Manager: Portage-2.3.11, Repoman-2.3.3

11

12

 sci-libs/armadillo/Manifest                 |   1 +

13

 sci-libs/armadillo/armadillo-8.200.0.ebuild | 143 ++++++++++++++++++++++++++++

14

 2 files changed, 144 insertions(+)

15

16

diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest

17

index 71d654213ce..5a00f490383 100644

18

--- a/sci-libs/armadillo/Manifest

19

+++ b/sci-libs/armadillo/Manifest

20

@@ -2,3 +2,4 @@ DIST armadillo-6.200.3.tar.gz 5442342 SHA256 4e436704a3b0824be6286ffa7c71c91ef78

21

 DIST armadillo-7.800.2.tar.xz 4001664 SHA256 efd70600ab6f30449d90a3e58ff7499937985209bb0a03ce4e322474dbf11fe3 SHA512 bd6a718d9aff5d87ae3bb792405e634e58249e74c8b49e31e6c3a1d77f7537b3e2f04f9fb10fc34279673126a1069cd43e991fb03fdf82ce77a00541ab6bd2fc WHIRLPOOL 93b4459dc941634b9bf4290f7bd839bc8a872091a52c7f554ad7ba6b2d01891e7290fe0bccf442d602927094369050da375690ec8931bcce33270893b3f56342

22

 DIST armadillo-7.950.0.tar.xz 4022536 SHA256 da89281959d48c60ce546dd370ef712ec1e24714e1e9afadad17dd2fbbc5876e SHA512 e92d5f75000a978381aa279485f35371388ae0812d1116fb79cc902a68037ef96a48aa5954598959e9c88ab74d569d7b6984537f8514e4cc507e07ec8fe3d26b WHIRLPOOL 0d824ee675cc76dded450de7d93e01c33e2baea295b9c6067e45a536fcbbf46490228a639df573695ef099bfe8b02c19f2f1c575e9bbe6314f52c30fa3a575f0

23

 DIST armadillo-7.950.1.tar.xz 4022716 SHA256 a32da32a0ea420b8397a53e4b40ed279c1a5fc791dd492a2ced81ffb14ad0d1b SHA512 e061a09ba45359c6a1d422cbb1586b2c1d3d5edaec8a0a885030c4aa3295eb5b90b45df6e4d5bec6ca57d290020a33afc8ed9a940a08b3ec0f0736a278b0484d WHIRLPOOL 52cb30d1086eb59851fd4ec3bb11f67067b6aeb0cecc2b9fda3860f3b888d1871df58fdc876a63b63eecad33142aa41488753f524b771b34b7d44926fbf7aea7

24

+DIST armadillo-8.200.0.tar.xz 4456824 SHA256 998d4c689fe5c18e393a5d129aa5d1fd649592ae1a94e0c280d3f88e01526aa8 SHA512 d7b49e79a40a50de99c3b227eada7d628bd325aaab5bc4b016c0bd957475fc042518edf88e2f749fa8851d54d3e2269c705175afde3942fa3818f8a7f931d0b9 WHIRLPOOL 5e1491f19ea099df37c45fd10f85dc59701f72869a631e18168a5367fd65ee83520c29619d3118eeece6e2eda52e28a71c27c71769f6b14ecfc354a2009d1353

25

26

diff --git a/sci-libs/armadillo/armadillo-8.200.0.ebuild b/sci-libs/armadillo/armadillo-8.200.0.ebuild

27

new file mode 100644

28

index 00000000000..dccb43520ea

29

--- /dev/null

30

+++ b/sci-libs/armadillo/armadillo-8.200.0.ebuild

31

@@ -0,0 +1,143 @@

32

+# Copyright 1999-2017 Gentoo Foundation

33

+# Distributed under the terms of the GNU General Public License v2

34

+

35

+EAPI=6

36

+

37

+CMAKE_IN_SOURCE_BUILD=1

38

+

39

+inherit cmake-utils toolchain-funcs multilib eutils

40

+

41

+DESCRIPTION="Streamlined C++ linear algebra library"

42

+HOMEPAGE="http://arma.sourceforge.net/"

43

+SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"

44

+

45

+LICENSE="Apache-2.0"

46

+SLOT="0/8"

47

+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"

48

+IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"

49

+REQUIRED_USE="test? ( lapack )"

50

+

51

+#	atlas? ( sci-libs/atlas[lapack] )

52

+

53

+RDEPEND="

54

+	dev-libs/boost

55

+	arpack? ( sci-libs/arpack )

56

+	blas? ( virtual/blas )

57

+	lapack? ( virtual/lapack )

58

+	superlu? ( >=sci-libs/superlu-5.2 )

59

+"

60

+

61

+DEPEND="${RDEPEND}

62

+	arpack? ( virtual/pkgconfig )

63

+	blas? ( virtual/pkgconfig )

64

+	hdf5? ( sci-libs/hdf5 )

65

+	lapack? ( virtual/pkgconfig )

66

+	mkl? ( sci-libs/mkl )

67

+	tbb? ( dev-cpp/tbb )"

68

+PDEPEND="${RDEPEND}

69

+	hdf5? ( sci-libs/hdf5 )

70

+	mkl? ( sci-libs/mkl )

71

+	tbb? ( dev-cpp/tbb )"

72

+

73

+src_prepare() {

74

+	# avoid the automagic cmake macros

75

+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die

76

+	cmake-utils_src_prepare

77

+}

78

+

79

+src_configure() {

80

+	local mycmakeargs=(

81

+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"

82

+		-DARMA_EXTRA_DEBUG="$(usex debug)"

83

+		-DARMA_USE_MKL_ALLOC="$(usex mkl)"

84

+		-DARMA_USE_TBB_ALLOC="$(usex tbb)"

85

+	)

86

+	if use arpack; then

87

+		mycmakeargs+=(

88

+			-DARPACK_FOUND=ON

89

+			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"

90

+		)

91

+	else

92

+		mycmakeargs+=(

93

+			-DARPACK_FOUND=OFF

94

+		)

95

+	fi

96

+#	if use atlas; then

97

+#		local c=atlas-cblas l=atlas-clapack

98

+#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads

99

+#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads

100

+#		mycmakeargs+=(

101

+#			-DCBLAS_FOUND=ON

102

+#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"

103

+#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"

104

+#			-DCLAPACK_FOUND=ON

105

+#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"

106

+#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"

107

+#		)

108

+#	fi

109

+	if use blas; then

110

+		mycmakeargs+=(

111

+			-DBLAS_FOUND=ON

112

+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"

113

+		)

114

+	else

115

+		mycmakeargs+=(

116

+			-DBLAS_FOUND=OFF

117

+		)

118

+	fi

119

+	if use hdf5; then

120

+		mycmakeargs+=(

121

+			-DHDF5_FOUND=ON

122

+			-DHDF5_LIBRARIES="-lhdf5"

123

+		)

124

+	else

125

+		mycmakeargs+=(

126

+			-DHDF5_FOUND=OFF

127

+		)

128

+	fi

129

+	if use lapack; then

130

+		mycmakeargs+=(

131

+			-DLAPACK_FOUND=ON

132

+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"

133

+		)

134

+	else

135

+		mycmakeargs+=(

136

+			-DLAPACK_FOUND=OFF

137

+		)

138

+	fi

139

+	if use superlu; then

140

+		mycmakeargs+=(

141

+			-DSuperLU_FOUND=ON

142

+			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"

143

+			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"

144

+		)

145

+	else

146

+		mycmakeargs+=(

147

+			-DSuperLU_FOUND=OFF

148

+		)

149

+	fi

150

+

151

+	cmake-utils_src_configure

152

+}

153

+

154

+src_test() {

155

+	pushd examples > /dev/null

156

+	emake \

157

+		CXX="$(tc-getCXX)" \

158

+		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \

159

+		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"

160

+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die

161

+	emake clean

162

+	popd > /dev/null

163

+}

164

+

165

+src_install() {

166

+	cmake-utils_src_install

167

+	dodoc README.txt

168

+	use doc && dodoc *pdf *html

169

+	if use examples; then

170

+		insinto /usr/share/doc/${PF}/examples

171

+		doins -r examples/*

172

+		docompress -x /usr/share/doc/${PF}/examples

173

+	fi

174

+}

1	commit: 2c6cb458fc33275af6abadf0a2fe904c92d6e972
2	Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
3	AuthorDate: Fri Oct 13 09:21:09 2017 +0000
4	Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5	CommitDate: Fri Oct 13 09:21:09 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6cb458
7
8	sci-libs/armadillo: Version bump
9
10	Package-Manager: Portage-2.3.11, Repoman-2.3.3
11
12	sci-libs/armadillo/Manifest \| 1 +
13	sci-libs/armadillo/armadillo-8.200.0.ebuild \| 143 ++++++++++++++++++++++++++++
14	2 files changed, 144 insertions(+)
15
16	diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
17	index 71d654213ce..5a00f490383 100644
18	--- a/sci-libs/armadillo/Manifest
19	+++ b/sci-libs/armadillo/Manifest
20	@@ -2,3 +2,4 @@ DIST armadillo-6.200.3.tar.gz 5442342 SHA256 4e436704a3b0824be6286ffa7c71c91ef78
21	DIST armadillo-7.800.2.tar.xz 4001664 SHA256 efd70600ab6f30449d90a3e58ff7499937985209bb0a03ce4e322474dbf11fe3 SHA512 bd6a718d9aff5d87ae3bb792405e634e58249e74c8b49e31e6c3a1d77f7537b3e2f04f9fb10fc34279673126a1069cd43e991fb03fdf82ce77a00541ab6bd2fc WHIRLPOOL 93b4459dc941634b9bf4290f7bd839bc8a872091a52c7f554ad7ba6b2d01891e7290fe0bccf442d602927094369050da375690ec8931bcce33270893b3f56342
22	DIST armadillo-7.950.0.tar.xz 4022536 SHA256 da89281959d48c60ce546dd370ef712ec1e24714e1e9afadad17dd2fbbc5876e SHA512 e92d5f75000a978381aa279485f35371388ae0812d1116fb79cc902a68037ef96a48aa5954598959e9c88ab74d569d7b6984537f8514e4cc507e07ec8fe3d26b WHIRLPOOL 0d824ee675cc76dded450de7d93e01c33e2baea295b9c6067e45a536fcbbf46490228a639df573695ef099bfe8b02c19f2f1c575e9bbe6314f52c30fa3a575f0
23	DIST armadillo-7.950.1.tar.xz 4022716 SHA256 a32da32a0ea420b8397a53e4b40ed279c1a5fc791dd492a2ced81ffb14ad0d1b SHA512 e061a09ba45359c6a1d422cbb1586b2c1d3d5edaec8a0a885030c4aa3295eb5b90b45df6e4d5bec6ca57d290020a33afc8ed9a940a08b3ec0f0736a278b0484d WHIRLPOOL 52cb30d1086eb59851fd4ec3bb11f67067b6aeb0cecc2b9fda3860f3b888d1871df58fdc876a63b63eecad33142aa41488753f524b771b34b7d44926fbf7aea7
24	+DIST armadillo-8.200.0.tar.xz 4456824 SHA256 998d4c689fe5c18e393a5d129aa5d1fd649592ae1a94e0c280d3f88e01526aa8 SHA512 d7b49e79a40a50de99c3b227eada7d628bd325aaab5bc4b016c0bd957475fc042518edf88e2f749fa8851d54d3e2269c705175afde3942fa3818f8a7f931d0b9 WHIRLPOOL 5e1491f19ea099df37c45fd10f85dc59701f72869a631e18168a5367fd65ee83520c29619d3118eeece6e2eda52e28a71c27c71769f6b14ecfc354a2009d1353
25
26	diff --git a/sci-libs/armadillo/armadillo-8.200.0.ebuild b/sci-libs/armadillo/armadillo-8.200.0.ebuild
27	new file mode 100644
28	index 00000000000..dccb43520ea
29	--- /dev/null
30	+++ b/sci-libs/armadillo/armadillo-8.200.0.ebuild
31	@@ -0,0 +1,143 @@
32	+# Copyright 1999-2017 Gentoo Foundation
33	+# Distributed under the terms of the GNU General Public License v2
34	+
35	+EAPI=6
36	+
37	+CMAKE_IN_SOURCE_BUILD=1
38	+
39	+inherit cmake-utils toolchain-funcs multilib eutils
40	+
41	+DESCRIPTION="Streamlined C++ linear algebra library"
42	+HOMEPAGE="http://arma.sourceforge.net/"
43	+SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
44	+
45	+LICENSE="Apache-2.0"
46	+SLOT="0/8"
47	+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
48	+IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
49	+REQUIRED_USE="test? ( lapack )"
50	+
51	+# atlas? ( sci-libs/atlas[lapack] )
52	+
53	+RDEPEND="
54	+ dev-libs/boost
55	+ arpack? ( sci-libs/arpack )
56	+ blas? ( virtual/blas )
57	+ lapack? ( virtual/lapack )
58	+ superlu? ( >=sci-libs/superlu-5.2 )
59	+"
60	+
61	+DEPEND="${RDEPEND}
62	+ arpack? ( virtual/pkgconfig )
63	+ blas? ( virtual/pkgconfig )
64	+ hdf5? ( sci-libs/hdf5 )
65	+ lapack? ( virtual/pkgconfig )
66	+ mkl? ( sci-libs/mkl )
67	+ tbb? ( dev-cpp/tbb )"
68	+PDEPEND="${RDEPEND}
69	+ hdf5? ( sci-libs/hdf5 )
70	+ mkl? ( sci-libs/mkl )
71	+ tbb? ( dev-cpp/tbb )"
72	+
73	+src_prepare() {
74	+ # avoid the automagic cmake macros
75	+ sed -i -e '/ARMA_Find/d' CMakeLists.txt \|\| die
76	+ cmake-utils_src_prepare
77	+}
78	+
79	+src_configure() {
80	+ local mycmakeargs=(
81	+ -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
82	+ -DARMA_EXTRA_DEBUG="$(usex debug)"
83	+ -DARMA_USE_MKL_ALLOC="$(usex mkl)"
84	+ -DARMA_USE_TBB_ALLOC="$(usex tbb)"
85	+ )
86	+ if use arpack; then
87	+ mycmakeargs+=(
88	+ -DARPACK_FOUND=ON
89	+ -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
90	+ )
91	+ else
92	+ mycmakeargs+=(
93	+ -DARPACK_FOUND=OFF
94	+ )
95	+ fi
96	+# if use atlas; then
97	+# local c=atlas-cblas l=atlas-clapack
98	+# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
99	+# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
100	+# mycmakeargs+=(
101	+# -DCBLAS_FOUND=ON
102	+# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} \| sed 's/-I//')"
103	+# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
104	+# -DCLAPACK_FOUND=ON
105	+# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} \| sed 's/-I//')"
106	+# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
107	+# )
108	+# fi
109	+ if use blas; then
110	+ mycmakeargs+=(
111	+ -DBLAS_FOUND=ON
112	+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
113	+ )
114	+ else
115	+ mycmakeargs+=(
116	+ -DBLAS_FOUND=OFF
117	+ )
118	+ fi
119	+ if use hdf5; then
120	+ mycmakeargs+=(
121	+ -DHDF5_FOUND=ON
122	+ -DHDF5_LIBRARIES="-lhdf5"
123	+ )
124	+ else
125	+ mycmakeargs+=(
126	+ -DHDF5_FOUND=OFF
127	+ )
128	+ fi
129	+ if use lapack; then
130	+ mycmakeargs+=(
131	+ -DLAPACK_FOUND=ON
132	+ -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
133	+ )
134	+ else
135	+ mycmakeargs+=(
136	+ -DLAPACK_FOUND=OFF
137	+ )
138	+ fi
139	+ if use superlu; then
140	+ mycmakeargs+=(
141	+ -DSuperLU_FOUND=ON
142	+ -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
143	+ -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu \| awk '{print $1}' \| sed 's/-I//')"
144	+ )
145	+ else
146	+ mycmakeargs+=(
147	+ -DSuperLU_FOUND=OFF
148	+ )
149	+ fi
150	+
151	+ cmake-utils_src_configure
152	+}
153	+
154	+src_test() {
155	+ pushd examples > /dev/null
156	+ emake \
157	+ CXX="$(tc-getCXX)" \
158	+ CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
159	+ LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
160	+ LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 \|\| die
161	+ emake clean
162	+ popd > /dev/null
163	+}
164	+
165	+src_install() {
166	+ cmake-utils_src_install
167	+ dodoc README.txt
168	+ use doc && dodoc pdf html
169	+ if use examples; then
170	+ insinto /usr/share/doc/${PF}/examples
171	+ doins -r examples/*
172	+ docompress -x /usr/share/doc/${PF}/examples
173	+ fi
174	+}

Gentoo Archives: gentoo-commits