| 1 |
commit: 0cc2490adecc540fd1c69ae6f9205ec550efdd9e |
| 2 |
Author: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 1 15:33:42 2016 +0000 |
| 4 |
Commit: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 1 15:51:03 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc2490a |
| 7 |
|
| 8 |
app-admin/elektra: Drop old. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
app-admin/elektra/Manifest | 3 - |
| 13 |
app-admin/elektra/elektra-0.8.3-r3.ebuild | 92 ---------------------- |
| 14 |
app-admin/elektra/elektra-0.8.6.ebuild | 69 ---------------- |
| 15 |
app-admin/elektra/elektra-0.8.7.ebuild | 86 -------------------- |
| 16 |
.../elektra-0.8.3-fix-yajl-if-user-config.patch | 31 -------- |
| 17 |
.../files/elektra-0.8.3-introduce-attributes.patch | 27 ------- |
| 18 |
.../elektra-0.8.7-conditional-glob-tests.patch | 21 ----- |
| 19 |
7 files changed, 329 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest |
| 22 |
index d7821bf..99ae60f 100644 |
| 23 |
--- a/app-admin/elektra/Manifest |
| 24 |
+++ b/app-admin/elektra/Manifest |
| 25 |
@@ -1,6 +1,3 @@ |
| 26 |
DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d |
| 27 |
DIST elektra-0.8.12.tar.gz 2102450 SHA256 562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea WHIRLPOOL 6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da |
| 28 |
DIST elektra-0.8.15.tar.gz 2338297 SHA256 6a406986cecb8d4a44485ced118ee803bc039b0824b72298e123b4dd47eb0b22 SHA512 86a408dd546b33e3b437f92f415de7aee6a235189f9eab0762b3f44ab4c453ee369a53de10a9f5b0df1b446460b12c57c6b8b77c282648ec2a49f2328d9af13d WHIRLPOOL c4f77903f9340c665f4c484c0b700b048358691873031ae5e62e63f0acf9a5fc5efb3c307331712497c59172ad202780280abfa8b717f523fabda73564a0005e |
| 29 |
-DIST elektra-0.8.3.tar.gz 1092409 SHA256 48fab82a6b1e8f0038c43ae9ade4da25b697d0aa74e39b7b94056ab7febc4be1 SHA512 e298c0515515a3a59fe28e695fd347ce775465d95f95f8d08c54e0223baf24300ec7e876d35fd3a07f2348290fdc7f740557333b26e847d09b4c41df63a1d886 WHIRLPOOL 64673416e96cc0a8f3ffbfc3f88525de3bc1270b381d0642b59f0a4f9d49db5cb296bd10a2839bc2baea82f58dcb6416ada1031553d378cba858d8f94df2d3b9 |
| 30 |
-DIST elektra-0.8.6.tar.gz 1188337 SHA256 e815cf69b070c339784472841aa0ee0b169fab7c78f41cbbd7044f53fa9ed216 SHA512 4df585e07ab461b924a506a8c58bcfbe55e6c1df72710bfdc13760559054ffef6b92f8da94c08f2d8f6a7a7692983d0e92d4ffa98506fcbfc166a71bf989e488 WHIRLPOOL b0dfa2841dcef35e03dfa04e5613576d5d8d74586e959c538399adbebf2d4d4842b15e912845c07f5c309614e33217b112124ec0971accf9fa4e521e1283732a |
| 31 |
-DIST elektra-0.8.7.tar.gz 1566800 SHA256 698ebd41d540eb0c6427c17c13a6a0f03eef94655fbd40655c9b42d612ea1c9b SHA512 37b34abeb392e170f89a97f825153f925d7b11ea980832cb8f1bf8dbd8b098f8bd553b3998728ef84ce4f4c53ea1f420824984fe670f6752c1b50e98821eb07e WHIRLPOOL 7f3f290f9064488fd1c9927a76d3f9e235e144b1ebe91a02b392ee468b2bcc4881906a71b88822a75ac1506200c3c8d5857c31f35bdc8f9832eae67c2647a768 |
| 32 |
|
| 33 |
diff --git a/app-admin/elektra/elektra-0.8.3-r3.ebuild b/app-admin/elektra/elektra-0.8.3-r3.ebuild |
| 34 |
deleted file mode 100644 |
| 35 |
index 9d53dc6..0000000 |
| 36 |
--- a/app-admin/elektra/elektra-0.8.3-r3.ebuild |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,92 +0,0 @@ |
| 39 |
-# Copyright 1999-2014 Gentoo Foundation |
| 40 |
-# Distributed under the terms of the GNU General Public License v2 |
| 41 |
-# $Id$ |
| 42 |
- |
| 43 |
-EAPI=5 |
| 44 |
- |
| 45 |
-inherit cmake-multilib eutils |
| 46 |
- |
| 47 |
-DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism" |
| 48 |
-HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra" |
| 49 |
-SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz" |
| 50 |
- |
| 51 |
-LICENSE="BSD" |
| 52 |
-SLOT="0" |
| 53 |
-KEYWORDS="~amd64 ~x86" |
| 54 |
-IUSE="dbus doc examples iconv inifile simpleini static-libs syslog tcl test xml yajl" |
| 55 |
- |
| 56 |
-RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] |
| 57 |
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
| 58 |
- iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) |
| 59 |
- yajl? ( |
| 60 |
- <dev-libs/yajl-2[${MULTILIB_USEDEP}] |
| 61 |
- >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] |
| 62 |
- )" |
| 63 |
-DEPEND="${RDEPEND} |
| 64 |
- sys-devel/libtool |
| 65 |
- doc? ( app-doc/doxygen )" |
| 66 |
- |
| 67 |
-# tries to write to user's home directory (and doesn't respect HOME) |
| 68 |
-RESTRICT="test" |
| 69 |
- |
| 70 |
-src_prepare() { |
| 71 |
- #fix QA issues with upstream patches |
| 72 |
- epatch "${FILESDIR}/${P}-introduce-attributes.patch" |
| 73 |
- epatch "${FILESDIR}/${P}-fix-yajl-if-user-config.patch" |
| 74 |
- |
| 75 |
- #move doc files to correct location |
| 76 |
- sed -e "s/elektra-api/${PF}/" \ |
| 77 |
- -i cmake/ElektraCache.cmake || die |
| 78 |
- |
| 79 |
- cmake-utils_src_prepare |
| 80 |
-} |
| 81 |
- |
| 82 |
-multilib_src_configure() { |
| 83 |
- local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation" |
| 84 |
- |
| 85 |
- use dbus && my_plugins+=";dbus" |
| 86 |
- use doc && my_plugins+=";doc" |
| 87 |
- use iconv && my_plugins+=";iconv" |
| 88 |
- use inifile && my_plugins+=";simpleini" |
| 89 |
- use syslog && my_plugins+=";syslog" |
| 90 |
- use tcl && my_plugins+=";tcl" |
| 91 |
- use xml && my_plugins+=";xmltool" |
| 92 |
- use yajl && my_plugins+=";yajl" |
| 93 |
- |
| 94 |
- mycmakeargs=( |
| 95 |
- "-DPLUGINS=${my_plugins}" |
| 96 |
- "-DLATEX_COMPILER=OFF" |
| 97 |
- "-DTARGET_CMAKE_FOLDER=share/cmake/Modules" |
| 98 |
- $(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \ |
| 99 |
- || echo -DBUILD_DOCUMENTATION=OFF) |
| 100 |
- $(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \ |
| 101 |
- || echo -DBUILD_EXAMPLES=OFF) |
| 102 |
- $(cmake-utils_use static-libs BUILD_STATIC) |
| 103 |
- $(cmake-utils_use test BUILD_TESTING) |
| 104 |
- ) |
| 105 |
- |
| 106 |
- cmake-utils_src_configure |
| 107 |
-} |
| 108 |
- |
| 109 |
-src_compile() { |
| 110 |
- dodir /usr/share/man/man3 |
| 111 |
- cmake-multilib_src_compile |
| 112 |
-} |
| 113 |
- |
| 114 |
-multilib_src_install() { |
| 115 |
- cmake-utils_src_install |
| 116 |
- |
| 117 |
- if multilib_is_native_abi && use doc; then |
| 118 |
- rm -rf "${D}/usr/share/doc/${PF}/man" || die |
| 119 |
- cd doc/man/man3 || die |
| 120 |
- local my_f |
| 121 |
- for my_f in *.3 ; do |
| 122 |
- newman ${my_f} ${PN}-${my_f} |
| 123 |
- elog "installed /usr/share/man/man3/${my_f} as ${PN}-${my_f}" |
| 124 |
- done |
| 125 |
- fi |
| 126 |
-} |
| 127 |
- |
| 128 |
-multilib_src_install_all() { |
| 129 |
- dodoc doc/{AUTHORS,CHANGES,NEWS,README,todo/TODO} |
| 130 |
-} |
| 131 |
|
| 132 |
diff --git a/app-admin/elektra/elektra-0.8.6.ebuild b/app-admin/elektra/elektra-0.8.6.ebuild |
| 133 |
deleted file mode 100644 |
| 134 |
index b16fd29..0000000 |
| 135 |
--- a/app-admin/elektra/elektra-0.8.6.ebuild |
| 136 |
+++ /dev/null |
| 137 |
@@ -1,69 +0,0 @@ |
| 138 |
-# Copyright 1999-2014 Gentoo Foundation |
| 139 |
-# Distributed under the terms of the GNU General Public License v2 |
| 140 |
-# $Id$ |
| 141 |
- |
| 142 |
-EAPI=5 |
| 143 |
- |
| 144 |
-inherit cmake-multilib eutils |
| 145 |
- |
| 146 |
-DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism" |
| 147 |
-HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra" |
| 148 |
-SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz" |
| 149 |
- |
| 150 |
-LICENSE="BSD" |
| 151 |
-SLOT="0" |
| 152 |
-KEYWORDS="~amd64 ~x86" |
| 153 |
-IUSE="dbus doc examples iconv simpleini static-libs syslog tcl test +uname xml yajl" |
| 154 |
- |
| 155 |
-RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] |
| 156 |
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
| 157 |
- iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) |
| 158 |
- uname? ( sys-apps/coreutils ) |
| 159 |
- yajl? ( |
| 160 |
- <dev-libs/yajl-2[${MULTILIB_USEDEP}] |
| 161 |
- >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] |
| 162 |
- )" |
| 163 |
-DEPEND="${RDEPEND} |
| 164 |
- sys-devel/libtool |
| 165 |
- doc? ( app-doc/doxygen )" |
| 166 |
- |
| 167 |
-DOCS="doc/AUTHORS doc/CHANGES doc/NEWS doc/README doc/todo/TODO" |
| 168 |
-# tries to write to user's home directory (and doesn't respect HOME) |
| 169 |
-RESTRICT="test" |
| 170 |
- |
| 171 |
-src_prepare() { |
| 172 |
- |
| 173 |
- #move doc files to correct location |
| 174 |
- sed -e "s/elektra-api/${PF}/" \ |
| 175 |
- -i cmake/ElektraCache.cmake || die |
| 176 |
- |
| 177 |
- cmake-utils_src_prepare |
| 178 |
-} |
| 179 |
- |
| 180 |
-multilib_src_configure() { |
| 181 |
- local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation" |
| 182 |
- |
| 183 |
- use dbus && my_plugins+=";dbus" |
| 184 |
- use doc && my_plugins+=";doc" |
| 185 |
- use iconv && my_plugins+=";iconv" |
| 186 |
- use simpleini && my_plugins+=";simpleini" |
| 187 |
- use syslog && my_plugins+=";syslog" |
| 188 |
- use tcl && my_plugins+=";tcl" |
| 189 |
- use uname && my_plugins+=";uname" |
| 190 |
- use xml && my_plugins+=";xmltool" |
| 191 |
- use yajl && my_plugins+=";yajl" |
| 192 |
- |
| 193 |
- mycmakeargs=( |
| 194 |
- "-DPLUGINS=${my_plugins}" |
| 195 |
- "-DLATEX_COMPILER=OFF" |
| 196 |
- "-DTARGET_CMAKE_FOLDER=share/cmake/Modules" |
| 197 |
- $(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \ |
| 198 |
- || echo -DBUILD_DOCUMENTATION=OFF) |
| 199 |
- $(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \ |
| 200 |
- || echo -DBUILD_EXAMPLES=OFF) |
| 201 |
- $(cmake-utils_use static-libs BUILD_STATIC) |
| 202 |
- $(cmake-utils_use test BUILD_TESTING) |
| 203 |
- ) |
| 204 |
- |
| 205 |
- cmake-utils_src_configure |
| 206 |
-} |
| 207 |
|
| 208 |
diff --git a/app-admin/elektra/elektra-0.8.7.ebuild b/app-admin/elektra/elektra-0.8.7.ebuild |
| 209 |
deleted file mode 100644 |
| 210 |
index 3ba336f..0000000 |
| 211 |
--- a/app-admin/elektra/elektra-0.8.7.ebuild |
| 212 |
+++ /dev/null |
| 213 |
@@ -1,86 +0,0 @@ |
| 214 |
-# Copyright 1999-2015 Gentoo Foundation |
| 215 |
-# Distributed under the terms of the GNU General Public License v2 |
| 216 |
-# $Id$ |
| 217 |
- |
| 218 |
-EAPI=5 |
| 219 |
- |
| 220 |
-inherit cmake-multilib eutils |
| 221 |
- |
| 222 |
-DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism" |
| 223 |
-HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra" |
| 224 |
-SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz" |
| 225 |
- |
| 226 |
-LICENSE="BSD" |
| 227 |
-SLOT="0/${PV}" |
| 228 |
-KEYWORDS="~amd64 ~x86" |
| 229 |
-IUSE="dbus doc examples iconv ini keytometa simpleini static-libs syslog tcl test +uname xml yajl" |
| 230 |
- |
| 231 |
-RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] |
| 232 |
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
| 233 |
- iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) |
| 234 |
- uname? ( sys-apps/coreutils ) |
| 235 |
- yajl? ( |
| 236 |
- <dev-libs/yajl-2[${MULTILIB_USEDEP}] |
| 237 |
- >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] |
| 238 |
- )" |
| 239 |
-DEPEND="${RDEPEND} |
| 240 |
- sys-devel/libtool |
| 241 |
- doc? ( app-doc/doxygen )" |
| 242 |
- |
| 243 |
-DOCS="README.md doc/AUTHORS doc/CHANGES doc/NEWS doc/todo/TODO" |
| 244 |
-# tries to write to user's home directory (and doesn't respect HOME) |
| 245 |
-RESTRICT="test" |
| 246 |
- |
| 247 |
-src_prepare() { |
| 248 |
- epatch "${FILESDIR}/${P}-conditional-glob-tests.patch" |
| 249 |
- |
| 250 |
- einfo remove bundled libs |
| 251 |
- # TODO: Remove bundled inih from src/plugins/ini (add to portage): |
| 252 |
- # https://code.google.com/p/inih/ |
| 253 |
- rm -rf src/external || die |
| 254 |
- |
| 255 |
- local tests="augeas fstab hosts ini yajl" |
| 256 |
- if ! use test ; then |
| 257 |
- einfo remove test data |
| 258 |
- for test in ${tests}; do |
| 259 |
- sed -e '/TARGET_TEST_DATA_FOLDER/ s/^#*/#/' \ |
| 260 |
- -i src/plugins/${test}/CMakeLists.txt || die |
| 261 |
- done |
| 262 |
- fi |
| 263 |
- |
| 264 |
- #move doc files to correct location |
| 265 |
- sed -e "s/elektra-api/${PF}/" \ |
| 266 |
- -i cmake/ElektraCache.cmake || die |
| 267 |
- |
| 268 |
- cmake-utils_src_prepare |
| 269 |
-} |
| 270 |
- |
| 271 |
-multilib_src_configure() { |
| 272 |
- local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation" |
| 273 |
- |
| 274 |
- use dbus && my_plugins+=";dbus" |
| 275 |
- use iconv && my_plugins+=";iconv" |
| 276 |
- use ini && my_plugins+=";ini" #bundles inih |
| 277 |
- use keytometa && my_plugins+=";keytometa" |
| 278 |
- use simpleini && my_plugins+=";simpleini" |
| 279 |
- use syslog && my_plugins+=";syslog" |
| 280 |
- use tcl && my_plugins+=";tcl" |
| 281 |
- use uname && my_plugins+=";uname" |
| 282 |
- use xml && my_plugins+=";xmltool" |
| 283 |
- use yajl && my_plugins+=";yajl" |
| 284 |
- |
| 285 |
- mycmakeargs=( |
| 286 |
- "-DPLUGINS=${my_plugins}" |
| 287 |
- "-DLATEX_COMPILER=OFF" |
| 288 |
- "-DTARGET_CMAKE_FOLDER=share/cmake/Modules" |
| 289 |
- $(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \ |
| 290 |
- || echo -DBUILD_DOCUMENTATION=OFF) |
| 291 |
- $(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \ |
| 292 |
- || echo -DBUILD_EXAMPLES=OFF) |
| 293 |
- $(cmake-utils_use static-libs BUILD_STATIC) |
| 294 |
- $(cmake-utils_use test BUILD_TESTING) |
| 295 |
- $(cmake-utils_use test ENABLE_TESTING) |
| 296 |
- ) |
| 297 |
- |
| 298 |
- cmake-utils_src_configure |
| 299 |
-} |
| 300 |
|
| 301 |
diff --git a/app-admin/elektra/files/elektra-0.8.3-fix-yajl-if-user-config.patch b/app-admin/elektra/files/elektra-0.8.3-fix-yajl-if-user-config.patch |
| 302 |
deleted file mode 100644 |
| 303 |
index 9577f1e..0000000 |
| 304 |
--- a/app-admin/elektra/files/elektra-0.8.3-fix-yajl-if-user-config.patch |
| 305 |
+++ /dev/null |
| 306 |
@@ -1,31 +0,0 @@ |
| 307 |
---- a/src/plugins/yajl/yajl.c |
| 308 |
-+++ b/src/plugins/yajl/yajl.c |
| 309 |
-@@ -23,6 +23,10 @@ |
| 310 |
- ***************************************************************************/ |
| 311 |
- |
| 312 |
- |
| 313 |
-+#ifndef HAVE_KDBCONFIG |
| 314 |
-+# include "kdbconfig.h" |
| 315 |
-+#endif |
| 316 |
-+ |
| 317 |
- #include "yajl.h" |
| 318 |
- |
| 319 |
- #include <kdberrors.h> |
| 320 |
-@@ -340,7 +344,7 @@ |
| 321 |
- KeySet *config= elektraPluginGetConfig(handle); |
| 322 |
- |
| 323 |
- // ksClear (returned); |
| 324 |
-- if (keyIsUser(parentKey)) |
| 325 |
-+ if (!strncmp(keyName(parentKey), "user", 4)) |
| 326 |
- { |
| 327 |
- const Key * lookup = ksLookupByName(config, "/user_path", 0); |
| 328 |
- if (!lookup) |
| 329 |
-@@ -422,7 +426,7 @@ |
| 330 |
- return 1; /* success */ |
| 331 |
- } |
| 332 |
- |
| 333 |
--int elektraYajlSet(Plugin *handle, KeySet *returned, Key *parentKey) |
| 334 |
-+int elektraYajlSet(Plugin *handle ELEKTRA_UNUSED, KeySet *returned, Key *parentKey) |
| 335 |
- { |
| 336 |
- yajl_gen_config conf = { 1, " " }; |
| 337 |
- yajl_gen g = yajl_gen_alloc(&conf, NULL); |
| 338 |
|
| 339 |
diff --git a/app-admin/elektra/files/elektra-0.8.3-introduce-attributes.patch b/app-admin/elektra/files/elektra-0.8.3-introduce-attributes.patch |
| 340 |
deleted file mode 100644 |
| 341 |
index b970544..0000000 |
| 342 |
--- a/app-admin/elektra/files/elektra-0.8.3-introduce-attributes.patch |
| 343 |
+++ /dev/null |
| 344 |
@@ -1,27 +0,0 @@ |
| 345 |
---- a/src/include/CMakeLists.txt |
| 346 |
-+++ b/src/include/CMakeLists.txt |
| 347 |
-@@ -22,6 +22,9 @@ |
| 348 |
- check_include_file(time.h HAVE_TIME_H) |
| 349 |
- check_include_file(unistd.h HAVE_UNISTD_H) |
| 350 |
- |
| 351 |
-+set (ELEKTRA_DEPRECATED "__attribute__ ((deprecated))") |
| 352 |
-+set (ELEKTRA_UNUSED "__attribute__ ((unused))") |
| 353 |
-+ |
| 354 |
- configure_file ( |
| 355 |
- "${CMAKE_CURRENT_SOURCE_DIR}/kdb.h" |
| 356 |
- "${CMAKE_CURRENT_BINARY_DIR}/kdb.h" |
| 357 |
---- a/src/include/kdbconfig.h |
| 358 |
-+++ b/src/include/kdbconfig.h |
| 359 |
-@@ -30,6 +30,12 @@ |
| 360 |
- * to search for user configuration. */ |
| 361 |
- #define KDB_DB_HOME "@KDB_DB_HOME@" |
| 362 |
- |
| 363 |
-+/** Declares a parameter as unused. */ |
| 364 |
-+#define ELEKTRA_UNUSED @ELEKTRA_UNUSED@ |
| 365 |
-+ |
| 366 |
-+/** Declares an API as deprecated. */ |
| 367 |
-+#define ELEKTRA_DEPRECATED @ELEKTRA_DEPRECATED@ |
| 368 |
-+ |
| 369 |
- /* disable debug output messages */ |
| 370 |
- #define DEBUG @DEBUG@ |
| 371 |
- |
| 372 |
|
| 373 |
diff --git a/app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch b/app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch |
| 374 |
deleted file mode 100644 |
| 375 |
index 16cc0f8..0000000 |
| 376 |
--- a/app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch |
| 377 |
+++ /dev/null |
| 378 |
@@ -1,21 +0,0 @@ |
| 379 |
---- elektra-0.87/src/libtools/tests/CMakeLists.txt |
| 380 |
-+++ elektra-0.87/src/libtools/tests/CMakeLists.txt |
| 381 |
-@@ -4,10 +4,12 @@ |
| 382 |
- add_cppheaders (HDR_FILES) |
| 383 |
- add_toolheaders(HDR_FILES) |
| 384 |
- |
| 385 |
--include (LibAddTest) |
| 386 |
-+if (ENABLE_TESTING) |
| 387 |
-+ include (LibAddTest) |
| 388 |
- |
| 389 |
--file (GLOB TESTS testtool_*.cpp) |
| 390 |
--foreach (file ${TESTS}) |
| 391 |
-- get_filename_component (name ${file} NAME_WE) |
| 392 |
-- add_gtest (${name}) |
| 393 |
--endforeach (file ${TESTS}) |
| 394 |
-+ file (GLOB TESTS testtool_*.cpp) |
| 395 |
-+ foreach (file ${TESTS}) |
| 396 |
-+ get_filename_component (name ${file} NAME_WE) |
| 397 |
-+ add_gtest (${name}) |
| 398 |
-+ endforeach (file ${TESTS}) |
| 399 |
-+endif (ENABLE_TESTING) |
Archives