Version bump (thanks Andreas Sturmlechner, bug 520288).

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 117 insertions, 2 deletions

diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog
index 02fa8d415cb0..1d021a18576d 100644
--- a/app-admin/elektra/ChangeLog
+++ b/app-admin/elektra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/elektra
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.20 2014/07/30 22:49:14 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.21 2015/06/09 16:45:41 xmw Exp $
+
+*elektra-0.8.7 (09 Jun 2015)
+
+  09 Jun 2015; Michael Weber <xmw@gentoo.org> +elektra-0.8.7.ebuild,
+  +files/elektra-0.8.7-conditional-glob-tests.patch, metadata.xml:
+  Version bump (thanks Andreas Sturmlechner, bug 520288).
 
 *elektra-0.8.6 (30 Jul 2014)
 
diff --git a/app-admin/elektra/elektra-0.8.7.ebuild b/app-admin/elektra/elektra-0.8.7.ebuild
new file mode 100644
index 000000000000..381fc5d8952b
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.8.7.ebuild,v 1.1 2015/06/09 16:45:41 xmw Exp $
+
+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 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.7-conditional-glob-tests.patch b/app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch
new file mode 100644
index 000000000000..16cc0f81513e
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch
@@ -0,0 +1,21 @@
+--- 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)
diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
index 46bb8c87b42c..5ed326c0c99a 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -10,6 +10,8 @@
 	<flag name="simpleini">Enable simpleini support</flag>
 	<flag name="uname">Enable uname information for the key database</flag>
 	<flag name="yajl">Enable yajl support</flag>
+	<flag name="ini">Enable ini support</flag>
+	<flag name="keytometa">Enable keytometa support</flag>
 </use>
 </pkgmetadata>