1 |
commit: a4e6c38c21bc3aa5530167ac9b9f9d1e0fe27809 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 29 09:06:11 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 29 09:06:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e6c38c |
7 |
|
8 |
app-admin/elektra: Drop 0.8.16-r1 |
9 |
|
10 |
It wasn't stable anyway. |
11 |
|
12 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
app-admin/elektra/Manifest | 1 - |
16 |
app-admin/elektra/elektra-0.8.16.ebuild | 121 --------------------- |
17 |
.../elektra-0.8.15-conditional-glob-tests.patch | 15 --- |
18 |
.../elektra/files/elektra-0.8.15-gcc-5.4.0.patch | 20 ---- |
19 |
4 files changed, 157 deletions(-) |
20 |
|
21 |
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest |
22 |
index 33752845bd6..98112946bd8 100644 |
23 |
--- a/app-admin/elektra/Manifest |
24 |
+++ b/app-admin/elektra/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST elektra-0.8.16.tar.gz 2405443 BLAKE2B 221f254b240f4f38fb0975749003f8b4c9fbfbd28df2b42b99c8e1fa7795cb4a1565b77cc424b6180abd481326ccab4c8f554749150e36f0ab01146aa72575f8 SHA512 b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326 |
27 |
DIST elektra-0.8.20.tar.gz 4740032 BLAKE2B e76ad93eadbbec9bb273da4f7bab5622d47deebdab6736c430543159c0754f3b96696954891962b60716d5b969e64bf5ef6886a6239abee8b98888aae09fcdd9 SHA512 11cc88329f84ad4d6337132d76479d26f2d9c12f7a939558a79ea96540129096ea0a26ffda3705c01a2c7c749453588bb1654a4c07cca3374e4076ce768c5848 |
28 |
|
29 |
diff --git a/app-admin/elektra/elektra-0.8.16.ebuild b/app-admin/elektra/elektra-0.8.16.ebuild |
30 |
deleted file mode 100644 |
31 |
index a87cd518643..00000000000 |
32 |
--- a/app-admin/elektra/elektra-0.8.16.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,121 +0,0 @@ |
35 |
-# Copyright 1999-2016 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-inherit cmake-multilib eutils java-pkg-opt-2 |
41 |
- |
42 |
-DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs" |
43 |
-HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra" |
44 |
-SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="BSD" |
47 |
-SLOT="0/${PV}" |
48 |
-KEYWORDS="~amd64 ~x86" |
49 |
-PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl"; |
50 |
-IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}" |
51 |
- |
52 |
-RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}] |
53 |
- >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] |
54 |
- augeas? ( app-admin/augeas ) |
55 |
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
56 |
- iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) |
57 |
- java? ( >=virtual/jdk-1.8.0 ) |
58 |
- qt5? ( |
59 |
- dev-qt/qtdeclarative:5 |
60 |
- dev-qt/qtgui:5 |
61 |
- dev-qt/qttest:5 |
62 |
- dev-qt/qtwidgets:5 |
63 |
- ) |
64 |
- uname? ( sys-apps/coreutils ) |
65 |
- systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] ) |
66 |
- yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )" |
67 |
-DEPEND="${RDEPEND} |
68 |
- doc? ( app-doc/doxygen ) |
69 |
- test? ( >=dev-cpp/gtest-1.7.0 )" |
70 |
- |
71 |
-DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO ) |
72 |
-# tries to write to user's home directory (and doesn't respect HOME) |
73 |
-RESTRICT="test" |
74 |
- |
75 |
-MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h ) |
76 |
- |
77 |
-PATCHES=( |
78 |
- "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch |
79 |
- "${FILESDIR}/${PN}"-0.8.15-gcc-5.4.0.patch |
80 |
-) |
81 |
- |
82 |
-src_prepare() { |
83 |
- cmake-utils_src_prepare |
84 |
- |
85 |
- einfo remove bundled libs |
86 |
- # TODO: Remove bundled inih from src/plugins/ini (add to portage): |
87 |
- # https://code.google.com/p/inih/ |
88 |
- rm -rf src/external || die |
89 |
- |
90 |
- # move doc files to correct location |
91 |
- sed -e "s/elektra-api/${PF}/" \ |
92 |
- -i cmake/ElektraCache.cmake || die |
93 |
- |
94 |
- # avoid useless build time, nothing ends up installed |
95 |
- cmake_comment_add_subdirectory benchmarks |
96 |
- cmake_comment_add_subdirectory examples |
97 |
-} |
98 |
- |
99 |
-multilib_src_configure() { |
100 |
- local my_plugins="ALL" |
101 |
- |
102 |
- if multilib_is_native_abi ; then |
103 |
- use augeas || my_plugins+=";-augeas" |
104 |
- use java || my_plugins+=";-jni" |
105 |
- else |
106 |
- my_plugins+=";-augeas;-jni" |
107 |
- fi |
108 |
- |
109 |
- use dbus || my_plugins+=";-dbus" |
110 |
- use iconv || my_plugins+=";-iconv" |
111 |
- use ini || my_plugins+=";-ini" # bundles inih |
112 |
- use simpleini || my_plugins+=";-simpleini" |
113 |
- use syslog || my_plugins+=";-syslog" |
114 |
- use systemd || my_plugins+=";-journald" |
115 |
- use tcl || my_plugins+=";-tcl" |
116 |
- use uname || my_plugins+=";-uname" |
117 |
- use xml || my_plugins+=";-xmltool" |
118 |
- use yajl || my_plugins+=";-yajl" |
119 |
- |
120 |
- # Disabling for good (?): |
121 |
- # counter - Only useful for debugging the plugin framework |
122 |
- # doc - Explaining basic makeup of a function //bug #514402 |
123 |
- # noresolver - Does not resolve, but can act as one |
124 |
- # template - Template for new plugin written in C |
125 |
- # wresolver - Resolver for non-POSIX, e.g. w32/w64 systems |
126 |
- my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver" |
127 |
- |
128 |
- local my_tools |
129 |
- |
130 |
- if multilib_is_native_abi ; then |
131 |
- my_tools="kdb" |
132 |
- use qt5 && my_tools+=";qt-gui" |
133 |
- fi |
134 |
- |
135 |
- local mycmakeargs=( |
136 |
- -DBUILD_PDF=OFF |
137 |
- -DBUILD_SHARED=ON |
138 |
- -DBUILD_STATIC=$(usex static-libs) |
139 |
- -DBUILD_TESTING=$(usex test) |
140 |
- -DENABLE_TESTING=$(usex test) |
141 |
- -DPLUGINS=${my_plugins} |
142 |
- -DTOOLS=${my_tools} |
143 |
- -DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no) |
144 |
- -DTARGET_CMAKE_FOLDER=share/cmake/Modules |
145 |
- ) |
146 |
- |
147 |
- cmake-utils_src_configure |
148 |
-} |
149 |
- |
150 |
-multilib_src_install_all() { |
151 |
- einfo remove test_data |
152 |
- rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data" |
153 |
- einfo remove tool_exec |
154 |
- rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec" |
155 |
-} |
156 |
|
157 |
diff --git a/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch b/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch |
158 |
deleted file mode 100644 |
159 |
index 413515e0560..00000000000 |
160 |
--- a/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch |
161 |
+++ /dev/null |
162 |
@@ -1,15 +0,0 @@ |
163 |
---- elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt |
164 |
-+++ elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt |
165 |
-@@ -4,6 +4,7 @@ |
166 |
- add_cppheaders (HDR_FILES) |
167 |
- add_toolheaders (HDR_FILES) |
168 |
- |
169 |
-+if (ENABLE_TESTING) |
170 |
- include (LibAddTest) |
171 |
- |
172 |
- file (GLOB TESTS testtool_*.cpp) |
173 |
-@@ -11,3 +12,4 @@ |
174 |
- get_filename_component (name ${file} NAME_WE) |
175 |
- add_gtest (${name} LINK_TOOLS) |
176 |
- endforeach (file ${TESTS}) |
177 |
-+endif (ENABLE_TESTING) |
178 |
|
179 |
diff --git a/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch |
180 |
deleted file mode 100644 |
181 |
index 9bab2a61c9f..00000000000 |
182 |
--- a/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch |
183 |
+++ /dev/null |
184 |
@@ -1,20 +0,0 @@ |
185 |
-commit 05c925972224afd3fa28f34b9a762364a38f6850 |
186 |
-Author: Markus Raab <elektra@×××××××××××.org> |
187 |
-Date: Tue May 3 14:25:54 2016 +0200 |
188 |
- |
189 |
- add vector kdbtimer |
190 |
- |
191 |
- fix http://build.libelektra.org:8080/job/elektra-gcc-configure-debian/lastFailedBuild/console |
192 |
- |
193 |
-diff --git a/src/bindings/cpp/include/kdbtimer.hpp b/src/bindings/cpp/include/kdbtimer.hpp |
194 |
-index ae4c242..b7f731e 100644 |
195 |
---- a/src/bindings/cpp/include/kdbtimer.hpp |
196 |
-+++ b/src/bindings/cpp/include/kdbtimer.hpp |
197 |
-@@ -13,6 +13,7 @@ |
198 |
- #include <sstream> |
199 |
- #include <string> |
200 |
- #include <sys/time.h> |
201 |
-+#include <vector> |
202 |
- |
203 |
- #ifdef __GNUC__ |
204 |
- #define TIMER_NOINLINE __attribute__ ((noinline)) |