1 |
commit: bbfb176d2d634bfd8747e014b8006d2fd0e98b4a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 30 17:04:30 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 31 22:40:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbfb176d |
7 |
|
8 |
dev-util/mdds: 1.7.0 version bump |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-util/mdds/Manifest | 1 + |
14 |
dev-util/mdds/files/mdds-1.7.0-bashism.patch | 75 ++++++++++++++++++++++ |
15 |
.../mdds/{mdds-9999.ebuild => mdds-1.7.0.ebuild} | 14 ++-- |
16 |
dev-util/mdds/mdds-9999.ebuild | 5 +- |
17 |
4 files changed, 86 insertions(+), 9 deletions(-) |
18 |
|
19 |
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest |
20 |
index efa7eb91720..4483da3da7c 100644 |
21 |
--- a/dev-util/mdds/Manifest |
22 |
+++ b/dev-util/mdds/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST mdds-1.6.0.tar.bz2 350406 BLAKE2B 70a99d779f318140f37bb3f873f1845c153f389a9e671a4d9ee4d1f0e762db312d536392061923c3c02494df6945a5a7743480eca1020d9cda6f3495888d7b00 SHA512 7c66894748e998f24374a5c6ea342ae2736e4bdba53be89510a1674690517ed7303786e1290fcfa26b07f236788c192ad29790129c228074397ab43699cdb290 |
25 |
+DIST mdds-1.7.0.tar.xz 313220 BLAKE2B 02ab09ad1338223da2911c05fc8d67c9d0d5414d1dcedac066dc95a2b0853f3801347c9791a5fc5700d666933be78efc52f735453769f9f2123ce06eca1fa67f SHA512 ac2bfe5186d499a79f4379c1dc7cc869bbbd9a59d4943399409dd4dd1ef7e3567a993deda5d5a06ad67dbd94b0a534439805837f2f405c5aca0aeb197178291a |
26 |
|
27 |
diff --git a/dev-util/mdds/files/mdds-1.7.0-bashism.patch b/dev-util/mdds/files/mdds-1.7.0-bashism.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..3e94f32e8f8 |
30 |
--- /dev/null |
31 |
+++ b/dev-util/mdds/files/mdds-1.7.0-bashism.patch |
32 |
@@ -0,0 +1,75 @@ |
33 |
+From 65da7c25f4d8204b1379a0afb46d82dc1b263ab0 Mon Sep 17 00:00:00 2001 |
34 |
+From: Andreas Sturmlechner <asturm@g.o> |
35 |
+Date: Thu, 28 May 2020 18:36:07 +0200 |
36 |
+Subject: [PATCH] Fix bashisms in configure.ac |
37 |
+ |
38 |
+--- |
39 |
+ configure.ac | 14 +++++++------- |
40 |
+ 1 file changed, 7 insertions(+), 7 deletions(-) |
41 |
+ |
42 |
+diff --git a/configure.ac b/configure.ac |
43 |
+index 00ab937..2282165 100644 |
44 |
+--- a/configure.ac |
45 |
++++ b/configure.ac |
46 |
+@@ -32,7 +32,7 @@ AC_ARG_ENABLE(debug-stdcxx, |
47 |
+ ] |
48 |
+ ,debug_stdcxx=yes) |
49 |
+ |
50 |
+-AS_IF([test x"$debug_stdcxx" == "xyes"], [ |
51 |
++AS_IF([test x"$debug_stdcxx" = "xyes"], [ |
52 |
+ CXXFLAGS="$CXXFLAGS -D_GLIBCXX_DEBUG" |
53 |
+ ]) |
54 |
+ |
55 |
+@@ -42,7 +42,7 @@ AC_ARG_ENABLE(release-tests, |
56 |
+ ] |
57 |
+ ,release_tests=yes) |
58 |
+ |
59 |
+-AS_IF([test x"$release_tests" == "xyes"], [ |
60 |
++AS_IF([test x"$release_tests" = "xyes"], [ |
61 |
+ CXXFLAGS="$CXXFLAGS -DNDEBUG -O2" |
62 |
+ ]) |
63 |
+ |
64 |
+@@ -56,11 +56,11 @@ AC_ARG_ENABLE(loop-unrolling, |
65 |
+ [enable_loop_unrolling="$enableval"],[enable_loop_unrolling=yes] |
66 |
+ ) |
67 |
+ |
68 |
+-AS_IF([test x"$enable_loop_unrolling" == "xno"], [ |
69 |
++AS_IF([test x"$enable_loop_unrolling" = "xno"], [ |
70 |
+ CXXFLAGS="$CXXFLAGS -DMDDS_LOOP_UNROLLING=0" |
71 |
+ ]) |
72 |
+ |
73 |
+-AS_IF([test x"$enable_gcov" == "xyes"], [ |
74 |
++AS_IF([test x"$enable_gcov" = "xyes"], [ |
75 |
+ CXXFLAGS="$CXXFLAGS --coverage -O0" |
76 |
+ ]) |
77 |
+ |
78 |
+@@ -69,7 +69,7 @@ AC_ARG_ENABLE(openmp, |
79 |
+ [enable_openmp="$enableval"],[enable_openmp=yes] |
80 |
+ ) |
81 |
+ |
82 |
+-AS_IF([test x"$enable_openmp" == "xyes"], [ |
83 |
++AS_IF([test x"$enable_openmp" = "xyes"], [ |
84 |
+ CXXFLAGS="$CXXFLAGS -fopenmp -DMDDS_USE_OPENMP=1" |
85 |
+ LDFLAGS="$LDFLAGS -fopenmp" |
86 |
+ ]) |
87 |
+@@ -79,7 +79,7 @@ AC_ARG_ENABLE(sanitizer-coverage, |
88 |
+ [enable_sanitizer_coverage="$enableval"],[enable_sanitizer_coverage=no] |
89 |
+ ) |
90 |
+ |
91 |
+-AS_IF([test x"$enable_sanitizer_coverage" == "xyes"], [ |
92 |
++AS_IF([test x"$enable_sanitizer_coverage" = "xyes"], [ |
93 |
+ CXXFLAGS="$CXXFLAGS -fprofile-instr-generate -fcoverage-mapping -O0" |
94 |
+ ]) |
95 |
+ |
96 |
+@@ -122,7 +122,7 @@ AC_ARG_ENABLE([werror], |
97 |
+ [enable_werror="$enableval"], |
98 |
+ [enable_werror=no] |
99 |
+ ) |
100 |
+-AS_IF([test x"$enable_werror" == "xyes"], [ |
101 |
++AS_IF([test x"$enable_werror" = "xyes"], [ |
102 |
+ CXXFLAGS="$CXXFLAGS -Werror" |
103 |
+ ]) |
104 |
+ |
105 |
+-- |
106 |
+2.26.2 |
107 |
+ |
108 |
|
109 |
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-1.7.0.ebuild |
110 |
similarity index 76% |
111 |
copy from dev-util/mdds/mdds-9999.ebuild |
112 |
copy to dev-util/mdds/mdds-1.7.0.ebuild |
113 |
index 64e78d4d68f..56bc179c30b 100644 |
114 |
--- a/dev-util/mdds/mdds-9999.ebuild |
115 |
+++ b/dev-util/mdds/mdds-1.7.0.ebuild |
116 |
@@ -3,20 +3,20 @@ |
117 |
|
118 |
EAPI=7 |
119 |
|
120 |
-if [[ ${PV} == *9999 ]]; then |
121 |
+if [[ ${PV} == *9999* ]]; then |
122 |
EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git" |
123 |
inherit git-r3 |
124 |
else |
125 |
- SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2" |
126 |
+ SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz" |
127 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
128 |
fi |
129 |
inherit autotools toolchain-funcs |
130 |
|
131 |
-DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm" |
132 |
+DESCRIPTION="Collection of multi-dimensional data structure and indexing algorithm" |
133 |
HOMEPAGE="https://gitlab.com/mdds/mdds" |
134 |
|
135 |
LICENSE="MIT" |
136 |
-SLOT="1/${PV%.*}" # Check API version on version bumps! |
137 |
+SLOT="1/1.5" # Check API version on version bumps! |
138 |
IUSE="doc openmp valgrind test" |
139 |
RESTRICT="!test? ( test )" |
140 |
|
141 |
@@ -30,7 +30,10 @@ BDEPEND=" |
142 |
DEPEND="dev-libs/boost:=" |
143 |
RDEPEND="${DEPEND}" |
144 |
|
145 |
-PATCHES=( "${FILESDIR}/${PN}-1.5.0-buildsystem.patch" ) |
146 |
+PATCHES=( |
147 |
+ "${FILESDIR}/${PN}-1.5.0-buildsystem.patch" |
148 |
+ "${FILESDIR}/${P}-bashism.patch" # bug 723094 |
149 |
+) |
150 |
|
151 |
pkg_pretend() { |
152 |
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
153 |
@@ -60,6 +63,5 @@ src_configure() { |
154 |
|
155 |
src_test() { |
156 |
tc-export CXX |
157 |
- |
158 |
default |
159 |
} |
160 |
|
161 |
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild |
162 |
index 64e78d4d68f..37a5d872833 100644 |
163 |
--- a/dev-util/mdds/mdds-9999.ebuild |
164 |
+++ b/dev-util/mdds/mdds-9999.ebuild |
165 |
@@ -7,12 +7,12 @@ if [[ ${PV} == *9999 ]]; then |
166 |
EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git" |
167 |
inherit git-r3 |
168 |
else |
169 |
- SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2" |
170 |
+ SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz" |
171 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
172 |
fi |
173 |
inherit autotools toolchain-funcs |
174 |
|
175 |
-DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm" |
176 |
+DESCRIPTION="Collection of multi-dimensional data structure and indexing algorithm" |
177 |
HOMEPAGE="https://gitlab.com/mdds/mdds" |
178 |
|
179 |
LICENSE="MIT" |
180 |
@@ -60,6 +60,5 @@ src_configure() { |
181 |
|
182 |
src_test() { |
183 |
tc-export CXX |
184 |
- |
185 |
default |
186 |
} |