1 |
commit: a1faf530837d0e986c2a75abd905aef5b26b51b9 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Dec 11 00:48:52 2015 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 22 17:04:34 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1faf530 |
7 |
|
8 |
dev-util/mdds: 1.1.0 version bump, bug 572616 |
9 |
|
10 |
mdds:1 installs side-by-side with mdds:0. At this point, LibreOffice live |
11 |
both depends on mdds:1 and through libixion-0.9* indirectly pulls in :0. |
12 |
|
13 |
Package-Manager: portage-2.2.24 |
14 |
|
15 |
dev-util/mdds/Manifest | 1 + |
16 |
.../mdds/{mdds-9999.ebuild => mdds-1.1.0.ebuild} | 25 ++++++++++++++-------- |
17 |
dev-util/mdds/mdds-9999.ebuild | 25 ++++++++++++++-------- |
18 |
dev-util/mdds/metadata.xml | 3 +++ |
19 |
4 files changed, 36 insertions(+), 18 deletions(-) |
20 |
|
21 |
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest |
22 |
index cd58451..405c02e 100644 |
23 |
--- a/dev-util/mdds/Manifest |
24 |
+++ b/dev-util/mdds/Manifest |
25 |
@@ -1,3 +1,4 @@ |
26 |
+DIST mdds-1.1.0.tar.bz2 258691 SHA256 4253ab93fe8bb579321a50e247f1f800191ab99fe2d8c6c181741b8bd3fb161f SHA512 928cb6dffacdb2fe9e67dde094bbd8191137cb58402172d0fc99ed8c7aa6069668c6b1f06e515366a0843325ea051e8e0650aa2142cbc94b107a748a399d7a47 WHIRLPOOL 79ec5589ad682712244cc235c8ec7f9626208526b43839f07fff9dfc96509e232fccce801664b2c50b00dcde656cb78e8ac1e5db2fde7c807bc5507af410a83b |
27 |
DIST mdds_0.10.3.tar.bz2 151389 SHA256 db10932dbe7e9b5b9b3f513bc8165ab7e29c3bf75702b3c3cfff6956c521e0c2 SHA512 52be0fe4eedc8a44f61944e078d8f0d2490bfea27451c5d4772b6d46d71562702d3b90b34c5721d8bdf6de2ea32a4a9126e310614bb36e0d573c047dfc9f3fcb WHIRLPOOL 17a461cf01f286ccb0e8b351e627dc870db5676a3698cf99f1520b01562138a8d74fa99ccca901d81b5f354abf95ff35d2a7957a3bf2dae16d92aee12e62f8b1 |
28 |
DIST mdds_0.11.2.tar.bz2 154444 SHA256 cd0a0dc8b35d6582efad6898546c86714eb058696ba26b0e7f8914faa002a5ab SHA512 b0e00d50be9b8319dabfe7e607849af27a52be9b46d770849b919444b905bf198d99edcefe1be15e6018b79839443b3a709fe22b84ac11e2267f02bec5139633 WHIRLPOOL a505c4b746c7ffefe3ea74fd0eb7c2ae46b4c598e1136cf9e9cfe44a4c48db2bb1b84528a5f0a86cc1b7a5c9d5b7d82522bd7836ed5e4de61d9664a863e1b014 |
29 |
DIST mdds_0.12.0.tar.bz2 152285 SHA256 2a22de23ca828886625120e9d40fccd6333458a1934a13d2c982b6f9403e5981 SHA512 462f6e3701eb7cce872ce0a76d826886eedccf5ca20293d03744b6d6d5ff1ef16770c6abce1c9118829e252e90783e206d281006d0d4e7e9b328ed9ae37264c1 WHIRLPOOL f86314644d80ae1b75a4cc1af6ebc4a3df3b65eac4244abc0fbf69893020509abae3be7e758d90a07eafffb866d67dcb75968b38a411e747d7f361a7d2905f0b |
30 |
|
31 |
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-1.1.0.ebuild |
32 |
similarity index 67% |
33 |
copy from dev-util/mdds/mdds-9999.ebuild |
34 |
copy to dev-util/mdds/mdds-1.1.0.ebuild |
35 |
index e0db995..754707a 100644 |
36 |
--- a/dev-util/mdds/mdds-9999.ebuild |
37 |
+++ b/dev-util/mdds/mdds-1.1.0.ebuild |
38 |
@@ -1,8 +1,8 @@ |
39 |
-# Copyright 1999-2015 Gentoo Foundation |
40 |
+# Copyright 1999-2016 Gentoo Foundation |
41 |
# Distributed under the terms of the GNU General Public License v2 |
42 |
# $Id$ |
43 |
|
44 |
-EAPI=5 |
45 |
+EAPI=6 |
46 |
|
47 |
EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git" |
48 |
[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools" |
49 |
@@ -11,27 +11,34 @@ inherit eutils toolchain-funcs ${GITECLASS} |
50 |
|
51 |
DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm" |
52 |
HOMEPAGE="https://gitlab.com/mdds/mdds" |
53 |
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2" |
54 |
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2" |
55 |
|
56 |
LICENSE="MIT" |
57 |
-SLOT="0/${PV}" |
58 |
-IUSE="" |
59 |
+SLOT="1/${PV}" |
60 |
+IUSE="doc valgrind" |
61 |
|
62 |
[[ ${PV} == 9999 ]] || \ |
63 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
64 |
|
65 |
-DEPEND="dev-libs/boost:=" |
66 |
-RDEPEND="${DEPEND}" |
67 |
+COMMON_DEPEND="dev-libs/boost:=" |
68 |
+DEPEND="${COMMON_DEPEND} |
69 |
+ doc? ( |
70 |
+ app-doc/doxygen |
71 |
+ dev-python/sphinx |
72 |
+ )" |
73 |
+RDEPEND="${COMMON_DEPEND}" |
74 |
|
75 |
-[[ ${PV} == 9999 ]] || S=${WORKDIR}/${P/-/_} |
76 |
+DOCS=() # buildsystem installs docs |
77 |
|
78 |
src_prepare(){ |
79 |
+ eapply_user |
80 |
[[ ${PV} == 9999 ]] && eautoreconf |
81 |
} |
82 |
|
83 |
src_configure() { |
84 |
econf \ |
85 |
- --with-hash-container=boost \ |
86 |
+ $(use_enable doc docs) \ |
87 |
+ $(use_enable valgrind memory_tests) \ |
88 |
--docdir="${EPREFIX}/usr/share/doc/${PF}" |
89 |
} |
90 |
|
91 |
|
92 |
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild |
93 |
index e0db995..754707a 100644 |
94 |
--- a/dev-util/mdds/mdds-9999.ebuild |
95 |
+++ b/dev-util/mdds/mdds-9999.ebuild |
96 |
@@ -1,8 +1,8 @@ |
97 |
-# Copyright 1999-2015 Gentoo Foundation |
98 |
+# Copyright 1999-2016 Gentoo Foundation |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
# $Id$ |
101 |
|
102 |
-EAPI=5 |
103 |
+EAPI=6 |
104 |
|
105 |
EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git" |
106 |
[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools" |
107 |
@@ -11,27 +11,34 @@ inherit eutils toolchain-funcs ${GITECLASS} |
108 |
|
109 |
DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm" |
110 |
HOMEPAGE="https://gitlab.com/mdds/mdds" |
111 |
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2" |
112 |
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2" |
113 |
|
114 |
LICENSE="MIT" |
115 |
-SLOT="0/${PV}" |
116 |
-IUSE="" |
117 |
+SLOT="1/${PV}" |
118 |
+IUSE="doc valgrind" |
119 |
|
120 |
[[ ${PV} == 9999 ]] || \ |
121 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
122 |
|
123 |
-DEPEND="dev-libs/boost:=" |
124 |
-RDEPEND="${DEPEND}" |
125 |
+COMMON_DEPEND="dev-libs/boost:=" |
126 |
+DEPEND="${COMMON_DEPEND} |
127 |
+ doc? ( |
128 |
+ app-doc/doxygen |
129 |
+ dev-python/sphinx |
130 |
+ )" |
131 |
+RDEPEND="${COMMON_DEPEND}" |
132 |
|
133 |
-[[ ${PV} == 9999 ]] || S=${WORKDIR}/${P/-/_} |
134 |
+DOCS=() # buildsystem installs docs |
135 |
|
136 |
src_prepare(){ |
137 |
+ eapply_user |
138 |
[[ ${PV} == 9999 ]] && eautoreconf |
139 |
} |
140 |
|
141 |
src_configure() { |
142 |
econf \ |
143 |
- --with-hash-container=boost \ |
144 |
+ $(use_enable doc docs) \ |
145 |
+ $(use_enable valgrind memory_tests) \ |
146 |
--docdir="${EPREFIX}/usr/share/doc/${PF}" |
147 |
} |
148 |
|
149 |
|
150 |
diff --git a/dev-util/mdds/metadata.xml b/dev-util/mdds/metadata.xml |
151 |
index 4bf2727..c054dfb 100644 |
152 |
--- a/dev-util/mdds/metadata.xml |
153 |
+++ b/dev-util/mdds/metadata.xml |
154 |
@@ -8,4 +8,7 @@ |
155 |
<upstream> |
156 |
<remote-id type="google-code">multidimalgorithm</remote-id> |
157 |
</upstream> |
158 |
+ <use> |
159 |
+ <flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag> |
160 |
+ </use> |
161 |
</pkgmetadata> |