Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/mdds/, dev-util/mdds/files/
Date: Fri, 26 May 2017 20:30:55
Message-Id: 1495830638.bd10ea30b77a28eade20300c9cca89b4d53d2107.asturm@gentoo
1 commit: bd10ea30b77a28eade20300c9cca89b4d53d2107
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 26 20:06:15 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri May 26 20:30:38 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd10ea30
7
8 dev-util/mdds: 1.2.3 version bump
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.1
11
12 dev-util/mdds/Manifest | 1 +
13 dev-util/mdds/files/mdds-1.2.3-buildsystem.patch | 36 ++++++++++++++++++++++
14 .../mdds/{mdds-9999.ebuild => mdds-1.2.3.ebuild} | 10 +++---
15 dev-util/mdds/mdds-9999.ebuild | 10 +++---
16 4 files changed, 47 insertions(+), 10 deletions(-)
17
18 diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
19 index 409a9f87dc7..4fdbfae649d 100644
20 --- a/dev-util/mdds/Manifest
21 +++ b/dev-util/mdds/Manifest
22 @@ -1 +1,2 @@
23 DIST mdds-1.2.2.tar.bz2 286185 SHA256 141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d SHA512 552cb1b65c03cd18eb679c95821e47c1151e1b3015043de4b3a7bc14d27734772fa4d80fd90ab48998d0bc75385a3d29c4dd7ce826cf84b012685573c623bf01 WHIRLPOOL f0b24a886ad6b275267603b73a95c3b83ce14808f90daa0e680babec966a52de19349ac0991d76b9279818897f783d1768ece74f5f1be1157fa8bff94e5e8a5a
24 +DIST mdds-1.2.3.tar.bz2 287079 SHA256 402fec18256f95b89517d54d85f00bce1faa6e517cb3d7c98a720fddd063354f SHA512 e5935fd99a53df124532cfc8e46349b2ef9ca79f5f184ca2da941c9a77e66ee40e11478e520bf9cb62e1bcea4b69deab5088265e1b89fda04417130aab227c3d WHIRLPOOL 88e154f3e1141d09736a8a9d5b4adf3612cea95a82773f59053d8e83f7fec3a0c292f5453df92627f31ac7e12b2f702dc281c959e7f219de91f2a1acc15cc7b4
25
26 diff --git a/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch b/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch
27 new file mode 100644
28 index 00000000000..89b45d826e0
29 --- /dev/null
30 +++ b/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch
31 @@ -0,0 +1,36 @@
32 +We want to install (not all of) those files manually.
33 +
34 +--- a/Makefile.am 2017-05-24 23:59:15.000000000 +0200
35 ++++ b/Makefile.am 2017-05-26 21:52:01.184258647 +0200
36 +@@ -4,16 +4,12 @@
37 +
38 + AM_CPPFLAGS = -I$(top_srcdir)/include
39 +
40 +-dist_doc_DATA = AUTHORS README.md
41 +-nodist_doc_DATA = VERSION
42 + nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
43 +
44 + DISTCLEANFILES = misc/mdds-@API_VERSION@.pc
45 +
46 + EXTRA_DIST = \
47 + autogen.sh \
48 +- CHANGELOG \
49 +- LICENSE \
50 + doc/conf.py \
51 + doc/doxygen.conf \
52 + doc/flat_segment_tree.rst \
53 +@@ -151,14 +147,6 @@
54 + trie_map_test_mem.mem
55 + endif
56 +
57 +-install-data-local:
58 +- $(MKDIR_P) $(DESTDIR)$(docdir)
59 +- $(INSTALL_DATA) $(top_srcdir)/LICENSE $(DESTDIR)$(docdir)/COPYING
60 +- $(INSTALL_DATA) $(top_srcdir)/CHANGELOG $(DESTDIR)$(docdir)/NEWS
61 +-
62 +-uninstall-local:
63 +- rm -f $(DESTDIR)$(docdir)/COPYING $(DESTDIR)$(docdir)/NEWS
64 +-
65 + if BUILD_DOCS
66 + html-local:
67 + (cd doc && $(DOXYGEN) doxygen.conf)
68
69 diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-1.2.3.ebuild
70 similarity index 79%
71 copy from dev-util/mdds/mdds-9999.ebuild
72 copy to dev-util/mdds/mdds-1.2.3.ebuild
73 index cbc8fcb3af6..2205550deef 100644
74 --- a/dev-util/mdds/mdds-9999.ebuild
75 +++ b/dev-util/mdds/mdds-1.2.3.ebuild
76 @@ -1,12 +1,12 @@
77 -# Copyright 1999-2016 Gentoo Foundation
78 +# Copyright 1999-2017 Gentoo Foundation
79 # Distributed under the terms of the GNU General Public License v2
80
81 EAPI=6
82
83 EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
84 -[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
85 +[[ ${PV} == 9999 ]] && GITECLASS="git-r3"
86
87 -inherit toolchain-funcs ${GITECLASS}
88 +inherit autotools toolchain-funcs ${GITECLASS}
89
90 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
91 HOMEPAGE="https://gitlab.com/mdds/mdds"
92 @@ -27,11 +27,11 @@ DEPEND="${RDEPEND}
93 )
94 "
95
96 -DOCS=() # buildsystem installs docs
97 +PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
98
99 src_prepare(){
100 default
101 - [[ ${PV} == 9999 ]] && eautoreconf
102 + eautoreconf
103 }
104
105 src_configure() {
106
107 diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
108 index cbc8fcb3af6..e87dc4be509 100644
109 --- a/dev-util/mdds/mdds-9999.ebuild
110 +++ b/dev-util/mdds/mdds-9999.ebuild
111 @@ -1,12 +1,12 @@
112 -# Copyright 1999-2016 Gentoo Foundation
113 +# Copyright 1999-2017 Gentoo Foundation
114 # Distributed under the terms of the GNU General Public License v2
115
116 EAPI=6
117
118 EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
119 -[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
120 +[[ ${PV} == 9999 ]] && GITECLASS="git-r3"
121
122 -inherit toolchain-funcs ${GITECLASS}
123 +inherit autotools toolchain-funcs ${GITECLASS}
124
125 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
126 HOMEPAGE="https://gitlab.com/mdds/mdds"
127 @@ -27,11 +27,11 @@ DEPEND="${RDEPEND}
128 )
129 "
130
131 -DOCS=() # buildsystem installs docs
132 +PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
133
134 src_prepare(){
135 default
136 - [[ ${PV} == 9999 ]] && eautoreconf
137 + eautoreconf
138 }
139
140 src_configure() {