From b9c488b57bb2c47ea6cdb4352c8f7910d419a30a Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 6 Nov 2016 11:26:27 +0100 Subject: [PATCH] app-admin/elektra: Version bump to 0.8.16, EAPI 6 Indent metadata.xml, sort use desc Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/1656 Signed-off-by: David Seifert --- app-admin/elektra/Manifest | 1 + app-admin/elektra/elektra-0.8.16.ebuild | 122 ++++++++++++++++++++++++ app-admin/elektra/elektra-9999.ebuild | 39 ++++---- app-admin/elektra/metadata.xml | 24 ++--- 4 files changed, 154 insertions(+), 32 deletions(-) create mode 100644 app-admin/elektra/elektra-0.8.16.ebuild diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest index 99ae60fa465ab..02d6e91166744 100644 --- a/app-admin/elektra/Manifest +++ b/app-admin/elektra/Manifest @@ -1,3 +1,4 @@ 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.16.tar.gz 2405443 SHA256 3cf0624eb027e533192ca9d612618df3d38ec3674c9cd20474f04ff269fad77e SHA512 b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326 WHIRLPOOL 3230dbe2f613b5eee71c01ce7afeac3cca02ffbf45cba7a9300f8f3347d5d4c3baf0f8339ecaaaeb3ca747523229292738f1e94660187c1a9c23b4aaa02f0b6f diff --git a/app-admin/elektra/elektra-0.8.16.ebuild b/app-admin/elektra/elektra-0.8.16.ebuild new file mode 100644 index 0000000000000..2a67535410838 --- /dev/null +++ b/app-admin/elektra/elektra-0.8.16.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit cmake-multilib eutils java-pkg-opt-2 + +DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs" +HOMEPAGE="https://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" +PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl"; +IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}" + +RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] + augeas? ( app-admin/augeas ) + dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) + iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jdk-1.8.0 ) + qt5? ( + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qttest:5 + dev-qt/qtwidgets:5 + ) + uname? ( sys-apps/coreutils ) + systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] ) + yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + test? ( >=dev-cpp/gtest-1.7.0 )" + +DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO ) +# tries to write to user's home directory (and doesn't respect HOME) +RESTRICT="test" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h ) + +PATCHES=( + "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch + "${FILESDIR}/${PN}"-0.8.15-gcc-5.4.0.patch +) + +src_prepare() { + cmake-utils_src_prepare + + 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 + + # move doc files to correct location + sed -e "s/elektra-api/${PF}/" \ + -i cmake/ElektraCache.cmake || die + + # avoid useless build time, nothing ends up installed + cmake_comment_add_subdirectory benchmarks + cmake_comment_add_subdirectory examples +} + +multilib_src_configure() { + local my_plugins="ALL" + + if multilib_is_native_abi ; then + use augeas || my_plugins+=";-augeas" + use java || my_plugins+=";-jni" + else + my_plugins+=";-augeas;-jni" + fi + + use dbus || my_plugins+=";-dbus" + use iconv || my_plugins+=";-iconv" + use ini || my_plugins+=";-ini" # bundles inih + use simpleini || my_plugins+=";-simpleini" + use syslog || my_plugins+=";-syslog" + use systemd || my_plugins+=";-journald" + use tcl || my_plugins+=";-tcl" + use uname || my_plugins+=";-uname" + use xml || my_plugins+=";-xmltool" + use yajl || my_plugins+=";-yajl" + + # Disabling for good (?): + # counter - Only useful for debugging the plugin framework + # doc - Explaining basic makeup of a function //bug #514402 + # noresolver - Does not resolve, but can act as one + # template - Template for new plugin written in C + # wresolver - Resolver for non-POSIX, e.g. w32/w64 systems + my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver" + + local my_tools + + if multilib_is_native_abi ; then + my_tools="kdb" + use qt5 && my_tools+=";qt-gui" + fi + + local mycmakeargs=( + -DBUILD_PDF=OFF + -DBUILD_SHARED=ON + -DBUILD_STATIC=$(usex static-libs) + -DBUILD_TESTING=$(usex test) + -DENABLE_TESTING=$(usex test) + -DPLUGINS=${my_plugins} + -DTOOLS=${my_tools} + -DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no) + -DTARGET_CMAKE_FOLDER=share/cmake/Modules + ) + + cmake-utils_src_configure +} + +multilib_src_install_all() { + einfo remove test_data + rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data" + einfo remove tool_exec + rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec" +} diff --git a/app-admin/elektra/elektra-9999.ebuild b/app-admin/elektra/elektra-9999.ebuild index d19d1c42d5bac..6ce1c4043f37c 100644 --- a/app-admin/elektra/elektra-9999.ebuild +++ b/app-admin/elektra/elektra-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit cmake-multilib eutils java-pkg-opt-2 git-r3 @@ -23,10 +23,10 @@ RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}] iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) java? ( >=virtual/jdk-1.8.0 ) qt5? ( - >=dev-qt/qtdeclarative-5.3:5 - >=dev-qt/qtgui-5.3:5 - >=dev-qt/qttest-5.3:5 - >=dev-qt/qtwidgets-5.3:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qttest:5 + dev-qt/qtwidgets:5 ) uname? ( sys-apps/coreutils ) systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] ) @@ -56,8 +56,8 @@ src_prepare() { -i cmake/ElektraCache.cmake || die # avoid useless build time, nothing ends up installed - comment_add_subdirectory benchmarks - comment_add_subdirectory examples + cmake_comment_add_subdirectory benchmarks + cmake_comment_add_subdirectory examples } multilib_src_configure() { @@ -96,17 +96,16 @@ multilib_src_configure() { use qt5 && my_tools+=";qt-gui" fi - mycmakeargs=( - "-DBUILD_SHARED=ON" - "-DPLUGINS=${my_plugins}" - "-DTOOLS=${my_tools}" - "-DLATEX_COMPILER=OFF" - "-DTARGET_CMAKE_FOLDER=share/cmake/Modules" - $(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \ - || echo -DBUILD_DOCUMENTATION=OFF) - $(cmake-utils_use static-libs BUILD_STATIC) - $(cmake-utils_use test BUILD_TESTING) - $(cmake-utils_use test ENABLE_TESTING) + local mycmakeargs=( + -DBUILD_PDF=OFF + -DBUILD_SHARED=ON + -DBUILD_STATIC=$(usex static-libs) + -DBUILD_TESTING=$(usex test) + -DENABLE_TESTING=$(usex test) + -DPLUGINS=${my_plugins} + -DTOOLS=${my_tools} + -DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no) + -DTARGET_CMAKE_FOLDER=share/cmake/Modules ) cmake-utils_src_configure @@ -114,7 +113,7 @@ multilib_src_configure() { multilib_src_install_all() { einfo remove test_data - rm -rvf "${D}/usr/share/${PN}" || die "Failed to remove test_data" + rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data" einfo remove tool_exec - rm -rvf "${D}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec" + rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec" } diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml index 59b713eb20dd0..05fc88807765a 100644 --- a/app-admin/elektra/metadata.xml +++ b/app-admin/elektra/metadata.xml @@ -1,16 +1,16 @@ - -xmw@gentoo.org -Michael Weber - - - Enable plugin for reading and writing configuration files with help from Augeas - Enable new, advanced ini support - Enable coverage support - Enable simpleini support - Enable uname information for the key database - Enable yajl support - + + xmw@gentoo.org + Michael Weber + + + Enable plugin for reading and writing configuration files with help from Augeas + Enable coverage support + Enable new, advanced ini support + Enable simpleini support + Enable uname information for the key database + Enable yajl support +