Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/
Date: Sun, 06 Nov 2016 10:29:46
Message-Id: 1478428151.b9c488b57bb2c47ea6cdb4352c8f7910d419a30a.soap@gentoo
1 commit: b9c488b57bb2c47ea6cdb4352c8f7910d419a30a
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sun Nov 6 10:26:27 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 6 10:29:11 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c488b5
7
8 app-admin/elektra: Version bump to 0.8.16, EAPI 6
9
10 Indent metadata.xml, sort use desc
11
12 Package-Manager: portage-2.2.28
13 Closes: https://github.com/gentoo/gentoo/pull/1656
14
15 Signed-off-by: David Seifert <soap <AT> gentoo.org>
16
17 app-admin/elektra/Manifest | 1 +
18 .../{elektra-9999.ebuild => elektra-0.8.16.ebuild} | 50 +++++++++++-----------
19 app-admin/elektra/elektra-9999.ebuild | 39 ++++++++---------
20 app-admin/elektra/metadata.xml | 24 +++++------
21 4 files changed, 58 insertions(+), 56 deletions(-)
22
23 diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
24 index 99ae60f..02d6e91 100644
25 --- a/app-admin/elektra/Manifest
26 +++ b/app-admin/elektra/Manifest
27 @@ -1,3 +1,4 @@
28 DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
29 DIST elektra-0.8.12.tar.gz 2102450 SHA256 562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea WHIRLPOOL 6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da
30 DIST elektra-0.8.15.tar.gz 2338297 SHA256 6a406986cecb8d4a44485ced118ee803bc039b0824b72298e123b4dd47eb0b22 SHA512 86a408dd546b33e3b437f92f415de7aee6a235189f9eab0762b3f44ab4c453ee369a53de10a9f5b0df1b446460b12c57c6b8b77c282648ec2a49f2328d9af13d WHIRLPOOL c4f77903f9340c665f4c484c0b700b048358691873031ae5e62e63f0acf9a5fc5efb3c307331712497c59172ad202780280abfa8b717f523fabda73564a0005e
31 +DIST elektra-0.8.16.tar.gz 2405443 SHA256 3cf0624eb027e533192ca9d612618df3d38ec3674c9cd20474f04ff269fad77e SHA512 b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326 WHIRLPOOL 3230dbe2f613b5eee71c01ce7afeac3cca02ffbf45cba7a9300f8f3347d5d4c3baf0f8339ecaaaeb3ca747523229292738f1e94660187c1a9c23b4aaa02f0b6f
32
33 diff --git a/app-admin/elektra/elektra-9999.ebuild b/app-admin/elektra/elektra-0.8.16.ebuild
34 similarity index 74%
35 copy from app-admin/elektra/elektra-9999.ebuild
36 copy to app-admin/elektra/elektra-0.8.16.ebuild
37 index d19d1c4..2a67535 100644
38 --- a/app-admin/elektra/elektra-9999.ebuild
39 +++ b/app-admin/elektra/elektra-0.8.16.ebuild
40 @@ -2,17 +2,17 @@
41 # Distributed under the terms of the GNU General Public License v2
42 # $Id$
43
44 -EAPI=5
45 +EAPI=6
46
47 -inherit cmake-multilib eutils java-pkg-opt-2 git-r3
48 +inherit cmake-multilib eutils java-pkg-opt-2
49
50 DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
51 HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra"
52 -EGIT_REPO_URI="git://github.com/ElektraInitiative/libelektra.git"
53 +SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
54
55 LICENSE="BSD"
56 SLOT="0/${PV}"
57 -KEYWORDS=""
58 +KEYWORDS="~amd64 ~x86"
59 PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
60 IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
61
62 @@ -23,10 +23,10 @@ RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
63 iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
64 java? ( >=virtual/jdk-1.8.0 )
65 qt5? (
66 - >=dev-qt/qtdeclarative-5.3:5
67 - >=dev-qt/qtgui-5.3:5
68 - >=dev-qt/qttest-5.3:5
69 - >=dev-qt/qtwidgets-5.3:5
70 + dev-qt/qtdeclarative:5
71 + dev-qt/qtgui:5
72 + dev-qt/qttest:5
73 + dev-qt/qtwidgets:5
74 )
75 uname? ( sys-apps/coreutils )
76 systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
77 @@ -41,7 +41,10 @@ RESTRICT="test"
78
79 MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
80
81 -PATCHES=( "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch )
82 +PATCHES=(
83 + "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch
84 + "${FILESDIR}/${PN}"-0.8.15-gcc-5.4.0.patch
85 +)
86
87 src_prepare() {
88 cmake-utils_src_prepare
89 @@ -56,8 +59,8 @@ src_prepare() {
90 -i cmake/ElektraCache.cmake || die
91
92 # avoid useless build time, nothing ends up installed
93 - comment_add_subdirectory benchmarks
94 - comment_add_subdirectory examples
95 + cmake_comment_add_subdirectory benchmarks
96 + cmake_comment_add_subdirectory examples
97 }
98
99 multilib_src_configure() {
100 @@ -96,17 +99,16 @@ multilib_src_configure() {
101 use qt5 && my_tools+=";qt-gui"
102 fi
103
104 - mycmakeargs=(
105 - "-DBUILD_SHARED=ON"
106 - "-DPLUGINS=${my_plugins}"
107 - "-DTOOLS=${my_tools}"
108 - "-DLATEX_COMPILER=OFF"
109 - "-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
110 - $(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
111 - || echo -DBUILD_DOCUMENTATION=OFF)
112 - $(cmake-utils_use static-libs BUILD_STATIC)
113 - $(cmake-utils_use test BUILD_TESTING)
114 - $(cmake-utils_use test ENABLE_TESTING)
115 + local mycmakeargs=(
116 + -DBUILD_PDF=OFF
117 + -DBUILD_SHARED=ON
118 + -DBUILD_STATIC=$(usex static-libs)
119 + -DBUILD_TESTING=$(usex test)
120 + -DENABLE_TESTING=$(usex test)
121 + -DPLUGINS=${my_plugins}
122 + -DTOOLS=${my_tools}
123 + -DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
124 + -DTARGET_CMAKE_FOLDER=share/cmake/Modules
125 )
126
127 cmake-utils_src_configure
128 @@ -114,7 +116,7 @@ multilib_src_configure() {
129
130 multilib_src_install_all() {
131 einfo remove test_data
132 - rm -rvf "${D}/usr/share/${PN}" || die "Failed to remove test_data"
133 + rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
134 einfo remove tool_exec
135 - rm -rvf "${D}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
136 + rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
137 }
138
139 diff --git a/app-admin/elektra/elektra-9999.ebuild b/app-admin/elektra/elektra-9999.ebuild
140 index d19d1c4..6ce1c40 100644
141 --- a/app-admin/elektra/elektra-9999.ebuild
142 +++ b/app-admin/elektra/elektra-9999.ebuild
143 @@ -2,7 +2,7 @@
144 # Distributed under the terms of the GNU General Public License v2
145 # $Id$
146
147 -EAPI=5
148 +EAPI=6
149
150 inherit cmake-multilib eutils java-pkg-opt-2 git-r3
151
152 @@ -23,10 +23,10 @@ RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
153 iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
154 java? ( >=virtual/jdk-1.8.0 )
155 qt5? (
156 - >=dev-qt/qtdeclarative-5.3:5
157 - >=dev-qt/qtgui-5.3:5
158 - >=dev-qt/qttest-5.3:5
159 - >=dev-qt/qtwidgets-5.3:5
160 + dev-qt/qtdeclarative:5
161 + dev-qt/qtgui:5
162 + dev-qt/qttest:5
163 + dev-qt/qtwidgets:5
164 )
165 uname? ( sys-apps/coreutils )
166 systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
167 @@ -56,8 +56,8 @@ src_prepare() {
168 -i cmake/ElektraCache.cmake || die
169
170 # avoid useless build time, nothing ends up installed
171 - comment_add_subdirectory benchmarks
172 - comment_add_subdirectory examples
173 + cmake_comment_add_subdirectory benchmarks
174 + cmake_comment_add_subdirectory examples
175 }
176
177 multilib_src_configure() {
178 @@ -96,17 +96,16 @@ multilib_src_configure() {
179 use qt5 && my_tools+=";qt-gui"
180 fi
181
182 - mycmakeargs=(
183 - "-DBUILD_SHARED=ON"
184 - "-DPLUGINS=${my_plugins}"
185 - "-DTOOLS=${my_tools}"
186 - "-DLATEX_COMPILER=OFF"
187 - "-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
188 - $(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
189 - || echo -DBUILD_DOCUMENTATION=OFF)
190 - $(cmake-utils_use static-libs BUILD_STATIC)
191 - $(cmake-utils_use test BUILD_TESTING)
192 - $(cmake-utils_use test ENABLE_TESTING)
193 + local mycmakeargs=(
194 + -DBUILD_PDF=OFF
195 + -DBUILD_SHARED=ON
196 + -DBUILD_STATIC=$(usex static-libs)
197 + -DBUILD_TESTING=$(usex test)
198 + -DENABLE_TESTING=$(usex test)
199 + -DPLUGINS=${my_plugins}
200 + -DTOOLS=${my_tools}
201 + -DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
202 + -DTARGET_CMAKE_FOLDER=share/cmake/Modules
203 )
204
205 cmake-utils_src_configure
206 @@ -114,7 +113,7 @@ multilib_src_configure() {
207
208 multilib_src_install_all() {
209 einfo remove test_data
210 - rm -rvf "${D}/usr/share/${PN}" || die "Failed to remove test_data"
211 + rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
212 einfo remove tool_exec
213 - rm -rvf "${D}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
214 + rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
215 }
216
217 diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
218 index 59b713e..05fc888 100644
219 --- a/app-admin/elektra/metadata.xml
220 +++ b/app-admin/elektra/metadata.xml
221 @@ -1,16 +1,16 @@
222 <?xml version="1.0" encoding="UTF-8"?>
223 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
224 <pkgmetadata>
225 -<maintainer type="person">
226 -<email>xmw@g.o</email>
227 -<name>Michael Weber</name>
228 -</maintainer>
229 -<use>
230 - <flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
231 - <flag name="ini">Enable new, advanced ini support</flag>
232 - <flag name="gcov">Enable coverage support</flag>
233 - <flag name="simpleini">Enable simpleini support</flag>
234 - <flag name="uname">Enable uname information for the key database</flag>
235 - <flag name="yajl">Enable yajl support</flag>
236 -</use>
237 + <maintainer type="person">
238 + <email>xmw@g.o</email>
239 + <name>Michael Weber</name>
240 + </maintainer>
241 + <use>
242 + <flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
243 + <flag name="gcov">Enable coverage support</flag>
244 + <flag name="ini">Enable new, advanced ini support</flag>
245 + <flag name="simpleini">Enable simpleini support</flag>
246 + <flag name="uname">Enable uname information for the key database</flag>
247 + <flag name="yajl">Enable yajl support</flag>
248 + </use>
249 </pkgmetadata>
Report Message
Find on MARC Find on Google Groups