[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/, app-admin/elektra/files/

[Michael Weber]

commit:     c958a565bc94069f30ac4654ed66ee2782ee6558
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 15:30:23 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 15:50:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c958a565

app-admin/elektra: Version bump.

Package-Manager: portage-2.2.27

 app-admin/elektra/Manifest                         |   1 +
 app-admin/elektra/elektra-0.8.15.ebuild            | 120 +++++++++++++++++++++
 .../elektra-0.8.15-conditional-glob-tests.patch    |  15 +++
 3 files changed, 136 insertions(+)

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index 9e6e2a0..d7821bf 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,5 +1,6 @@
 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.15.ebuild b/app-admin/elektra/elektra-0.8.15.ebuild
new file mode 100644
index 0000000..cbab60a
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.15.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib eutils java-pkg-opt-2
+
+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"
+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.3:5
+		>=dev-qt/qtgui-5.3:5
+		>=dev-qt/qttest-5.3:5
+		>=dev-qt/qtwidgets-5.3: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}/${P}"-conditional-glob-tests.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
+	comment_add_subdirectory benchmarks
+	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
+
+	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)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	einfo remove test_data
+	rm -rvf "${D}/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"
+}

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
new file mode 100644
index 0000000..413515e
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
@@ -0,0 +1,15 @@
+--- elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
++++ elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ add_cppheaders (HDR_FILES)
+ add_toolheaders (HDR_FILES)
+ 
++if (ENABLE_TESTING)
+ include (LibAddTest)
+ 
+ file (GLOB TESTS testtool_*.cpp)
+@@ -11,3 +12,4 @@
+ 	get_filename_component (name ${file} NAME_WE)
+ 	add_gtest (${name} LINK_TOOLS)
+ endforeach (file ${TESTS})
++endif (ENABLE_TESTING)