commit: 0cc2490adecc540fd1c69ae6f9205ec550efdd9e Author: Michael Weber <xmw <AT> gentoo <DOT> org> AuthorDate: Tue Mar 1 15:33:42 2016 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Tue Mar 1 15:51:03 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc2490a
app-admin/elektra: Drop old. Package-Manager: portage-2.2.27 app-admin/elektra/Manifest | 3 - app-admin/elektra/elektra-0.8.3-r3.ebuild | 92 ---------------------- app-admin/elektra/elektra-0.8.6.ebuild | 69 ---------------- app-admin/elektra/elektra-0.8.7.ebuild | 86 -------------------- .../elektra-0.8.3-fix-yajl-if-user-config.patch | 31 -------- .../files/elektra-0.8.3-introduce-attributes.patch | 27 ------- .../elektra-0.8.7-conditional-glob-tests.patch | 21 ----- 7 files changed, 329 deletions(-) diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest index d7821bf..99ae60f 100644 --- a/app-admin/elektra/Manifest +++ b/app-admin/elektra/Manifest @@ -1,6 +1,3 @@ DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d DIST elektra-0.8.12.tar.gz 2102450 SHA256 562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea WHIRLPOOL 6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da DIST elektra-0.8.15.tar.gz 2338297 SHA256 6a406986cecb8d4a44485ced118ee803bc039b0824b72298e123b4dd47eb0b22 SHA512 86a408dd546b33e3b437f92f415de7aee6a235189f9eab0762b3f44ab4c453ee369a53de10a9f5b0df1b446460b12c57c6b8b77c282648ec2a49f2328d9af13d WHIRLPOOL c4f77903f9340c665f4c484c0b700b048358691873031ae5e62e63f0acf9a5fc5efb3c307331712497c59172ad202780280abfa8b717f523fabda73564a0005e -DIST elektra-0.8.3.tar.gz 1092409 SHA256 48fab82a6b1e8f0038c43ae9ade4da25b697d0aa74e39b7b94056ab7febc4be1 SHA512 e298c0515515a3a59fe28e695fd347ce775465d95f95f8d08c54e0223baf24300ec7e876d35fd3a07f2348290fdc7f740557333b26e847d09b4c41df63a1d886 WHIRLPOOL 64673416e96cc0a8f3ffbfc3f88525de3bc1270b381d0642b59f0a4f9d49db5cb296bd10a2839bc2baea82f58dcb6416ada1031553d378cba858d8f94df2d3b9 -DIST elektra-0.8.6.tar.gz 1188337 SHA256 e815cf69b070c339784472841aa0ee0b169fab7c78f41cbbd7044f53fa9ed216 SHA512 4df585e07ab461b924a506a8c58bcfbe55e6c1df72710bfdc13760559054ffef6b92f8da94c08f2d8f6a7a7692983d0e92d4ffa98506fcbfc166a71bf989e488 WHIRLPOOL b0dfa2841dcef35e03dfa04e5613576d5d8d74586e959c538399adbebf2d4d4842b15e912845c07f5c309614e33217b112124ec0971accf9fa4e521e1283732a -DIST elektra-0.8.7.tar.gz 1566800 SHA256 698ebd41d540eb0c6427c17c13a6a0f03eef94655fbd40655c9b42d612ea1c9b SHA512 37b34abeb392e170f89a97f825153f925d7b11ea980832cb8f1bf8dbd8b098f8bd553b3998728ef84ce4f4c53ea1f420824984fe670f6752c1b50e98821eb07e WHIRLPOOL 7f3f290f9064488fd1c9927a76d3f9e235e144b1ebe91a02b392ee468b2bcc4881906a71b88822a75ac1506200c3c8d5857c31f35bdc8f9832eae67c2647a768 diff --git a/app-admin/elektra/elektra-0.8.3-r3.ebuild b/app-admin/elektra/elektra-0.8.3-r3.ebuild deleted file mode 100644 index 9d53dc6..0000000 --- a/app-admin/elektra/elektra-0.8.3-r3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-multilib eutils - -DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism" -HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"; -SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dbus doc examples iconv inifile simpleini static-libs syslog tcl test xml yajl" - -RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) - yajl? ( - <dev-libs/yajl-2[${MULTILIB_USEDEP}] - >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] - )" -DEPEND="${RDEPEND} - sys-devel/libtool - doc? ( app-doc/doxygen )" - -# tries to write to user's home directory (and doesn't respect HOME) -RESTRICT="test" - -src_prepare() { - #fix QA issues with upstream patches - epatch "${FILESDIR}/${P}-introduce-attributes.patch" - epatch "${FILESDIR}/${P}-fix-yajl-if-user-config.patch" - - #move doc files to correct location - sed -e "s/elektra-api/${PF}/" \ - -i cmake/ElektraCache.cmake || die - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation" - - use dbus && my_plugins+=";dbus" - use doc && my_plugins+=";doc" - use iconv && my_plugins+=";iconv" - use inifile && my_plugins+=";simpleini" - use syslog && my_plugins+=";syslog" - use tcl && my_plugins+=";tcl" - use xml && my_plugins+=";xmltool" - use yajl && my_plugins+=";yajl" - - mycmakeargs=( - "-DPLUGINS=${my_plugins}" - "-DLATEX_COMPILER=OFF" - "-DTARGET_CMAKE_FOLDER=share/cmake/Modules" - $(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \ - || echo -DBUILD_DOCUMENTATION=OFF) - $(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \ - || echo -DBUILD_EXAMPLES=OFF) - $(cmake-utils_use static-libs BUILD_STATIC) - $(cmake-utils_use test BUILD_TESTING) - ) - - cmake-utils_src_configure -} - -src_compile() { - dodir /usr/share/man/man3 - cmake-multilib_src_compile -} - -multilib_src_install() { - cmake-utils_src_install - - if multilib_is_native_abi && use doc; then - rm -rf "${D}/usr/share/doc/${PF}/man" || die - cd doc/man/man3 || die - local my_f - for my_f in *.3 ; do - newman ${my_f} ${PN}-${my_f} - elog "installed /usr/share/man/man3/${my_f} as ${PN}-${my_f}" - done - fi -} - -multilib_src_install_all() { - dodoc doc/{AUTHORS,CHANGES,NEWS,README,todo/TODO} -} diff --git a/app-admin/elektra/elektra-0.8.6.ebuild b/app-admin/elektra/elektra-0.8.6.ebuild deleted file mode 100644 index b16fd29..0000000 --- a/app-admin/elektra/elektra-0.8.6.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-multilib eutils - -DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism" -HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"; -SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dbus doc examples iconv simpleini static-libs syslog tcl test +uname xml yajl" - -RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) - uname? ( sys-apps/coreutils ) - yajl? ( - <dev-libs/yajl-2[${MULTILIB_USEDEP}] - >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] - )" -DEPEND="${RDEPEND} - sys-devel/libtool - doc? ( app-doc/doxygen )" - -DOCS="doc/AUTHORS doc/CHANGES doc/NEWS doc/README doc/todo/TODO" -# tries to write to user's home directory (and doesn't respect HOME) -RESTRICT="test" - -src_prepare() { - - #move doc files to correct location - sed -e "s/elektra-api/${PF}/" \ - -i cmake/ElektraCache.cmake || die - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation" - - use dbus && my_plugins+=";dbus" - use doc && my_plugins+=";doc" - use iconv && my_plugins+=";iconv" - use simpleini && my_plugins+=";simpleini" - use syslog && my_plugins+=";syslog" - use tcl && my_plugins+=";tcl" - use uname && my_plugins+=";uname" - use xml && my_plugins+=";xmltool" - use yajl && my_plugins+=";yajl" - - mycmakeargs=( - "-DPLUGINS=${my_plugins}" - "-DLATEX_COMPILER=OFF" - "-DTARGET_CMAKE_FOLDER=share/cmake/Modules" - $(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \ - || echo -DBUILD_DOCUMENTATION=OFF) - $(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \ - || echo -DBUILD_EXAMPLES=OFF) - $(cmake-utils_use static-libs BUILD_STATIC) - $(cmake-utils_use test BUILD_TESTING) - ) - - cmake-utils_src_configure -} diff --git a/app-admin/elektra/elektra-0.8.7.ebuild b/app-admin/elektra/elektra-0.8.7.ebuild deleted file mode 100644 index 3ba336f..0000000 --- a/app-admin/elektra/elektra-0.8.7.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-multilib eutils - -DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism" -HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"; -SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="dbus doc examples iconv ini keytometa simpleini static-libs syslog tcl test +uname xml yajl" - -RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) - uname? ( sys-apps/coreutils ) - yajl? ( - <dev-libs/yajl-2[${MULTILIB_USEDEP}] - >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] - )" -DEPEND="${RDEPEND} - sys-devel/libtool - doc? ( app-doc/doxygen )" - -DOCS="README.md doc/AUTHORS doc/CHANGES doc/NEWS doc/todo/TODO" -# tries to write to user's home directory (and doesn't respect HOME) -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}/${P}-conditional-glob-tests.patch" - - einfo remove bundled libs - # TODO: Remove bundled inih from src/plugins/ini (add to portage): - # https://code.google.com/p/inih/ - rm -rf src/external || die - - local tests="augeas fstab hosts ini yajl" - if ! use test ; then - einfo remove test data - for test in ${tests}; do - sed -e '/TARGET_TEST_DATA_FOLDER/ s/^#*/#/' \ - -i src/plugins/${test}/CMakeLists.txt || die - done - fi - - #move doc files to correct location - sed -e "s/elektra-api/${PF}/" \ - -i cmake/ElektraCache.cmake || die - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation" - - use dbus && my_plugins+=";dbus" - use iconv && my_plugins+=";iconv" - use ini && my_plugins+=";ini" #bundles inih - use keytometa && my_plugins+=";keytometa" - use simpleini && my_plugins+=";simpleini" - use syslog && my_plugins+=";syslog" - use tcl && my_plugins+=";tcl" - use uname && my_plugins+=";uname" - use xml && my_plugins+=";xmltool" - use yajl && my_plugins+=";yajl" - - mycmakeargs=( - "-DPLUGINS=${my_plugins}" - "-DLATEX_COMPILER=OFF" - "-DTARGET_CMAKE_FOLDER=share/cmake/Modules" - $(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \ - || echo -DBUILD_DOCUMENTATION=OFF) - $(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \ - || echo -DBUILD_EXAMPLES=OFF) - $(cmake-utils_use static-libs BUILD_STATIC) - $(cmake-utils_use test BUILD_TESTING) - $(cmake-utils_use test ENABLE_TESTING) - ) - - cmake-utils_src_configure -} 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 deleted file mode 100644 index 9577f1e..0000000 --- a/app-admin/elektra/files/elektra-0.8.3-fix-yajl-if-user-config.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/src/plugins/yajl/yajl.c -+++ b/src/plugins/yajl/yajl.c -@@ -23,6 +23,10 @@ - ***************************************************************************/ - - -+#ifndef HAVE_KDBCONFIG -+# include "kdbconfig.h" -+#endif -+ - #include "yajl.h" - - #include <kdberrors.h> -@@ -340,7 +344,7 @@ - KeySet *config= elektraPluginGetConfig(handle); - - // ksClear (returned); -- if (keyIsUser(parentKey)) -+ if (!strncmp(keyName(parentKey), "user", 4)) - { - const Key * lookup = ksLookupByName(config, "/user_path", 0); - if (!lookup) -@@ -422,7 +426,7 @@ - return 1; /* success */ - } - --int elektraYajlSet(Plugin *handle, KeySet *returned, Key *parentKey) -+int elektraYajlSet(Plugin *handle ELEKTRA_UNUSED, KeySet *returned, Key *parentKey) - { - yajl_gen_config conf = { 1, " " }; - yajl_gen g = yajl_gen_alloc(&conf, NULL); 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 deleted file mode 100644 index b970544..0000000 --- a/app-admin/elektra/files/elektra-0.8.3-introduce-attributes.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/src/include/CMakeLists.txt -+++ b/src/include/CMakeLists.txt -@@ -22,6 +22,9 @@ - check_include_file(time.h HAVE_TIME_H) - check_include_file(unistd.h HAVE_UNISTD_H) - -+set (ELEKTRA_DEPRECATED "__attribute__ ((deprecated))") -+set (ELEKTRA_UNUSED "__attribute__ ((unused))") -+ - configure_file ( - "${CMAKE_CURRENT_SOURCE_DIR}/kdb.h" - "${CMAKE_CURRENT_BINARY_DIR}/kdb.h" ---- a/src/include/kdbconfig.h -+++ b/src/include/kdbconfig.h -@@ -30,6 +30,12 @@ - * to search for user configuration. */ - #define KDB_DB_HOME "@KDB_DB_HOME@" - -+/** Declares a parameter as unused. */ -+#define ELEKTRA_UNUSED @ELEKTRA_UNUSED@ -+ -+/** Declares an API as deprecated. */ -+#define ELEKTRA_DEPRECATED @ELEKTRA_DEPRECATED@ -+ - /* disable debug output messages */ - #define DEBUG @DEBUG@ - 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 deleted file mode 100644 index 16cc0f8..0000000 --- a/app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- elektra-0.87/src/libtools/tests/CMakeLists.txt -+++ elektra-0.87/src/libtools/tests/CMakeLists.txt -@@ -4,10 +4,12 @@ - add_cppheaders (HDR_FILES) - add_toolheaders(HDR_FILES) - --include (LibAddTest) -+if (ENABLE_TESTING) -+ include (LibAddTest) - --file (GLOB TESTS testtool_*.cpp) --foreach (file ${TESTS}) -- get_filename_component (name ${file} NAME_WE) -- add_gtest (${name}) --endforeach (file ${TESTS}) -+ file (GLOB TESTS testtool_*.cpp) -+ foreach (file ${TESTS}) -+ get_filename_component (name ${file} NAME_WE) -+ add_gtest (${name}) -+ endforeach (file ${TESTS}) -+endif (ENABLE_TESTING)
