Version bump (thanks Andreas Sturmlechner, bug 520288).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 125 insertions, 9 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/Manifest b/app-admin/elektra/Manifest
index 09dee7ff5f2c..eb3ec35e4092 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -7,20 +7,21 @@ AUX elektra-0.7.1-remove-ddefault-link.patch 576 SHA256 ad834ef43a15925e5570faae
 AUX elektra-0.7.1-test.patch 6259 SHA256 a84091cbe3b0ca9c01278c17d8eee0f95a06758969d52599b855da1be3949f49 SHA512 258e49c90cea8b1a830a8acb5a2307e49d3dea6b2189373f1b0b614cb070d7a9dbb4954fb486bbacd46fa612d96d6824ef1ee4f40925ad2a347eabb4a45bdfe7 WHIRLPOOL 382a95d5b7fb4d5564eac06a04a909e69af3770913d06b56c3e3d78f3c4f56ef9a4fe51e490e274de0cdd9b254808da6c5638d4b35f991fe1b4c5cf9d7cda011
 AUX elektra-0.8.3-fix-yajl-if-user-config.patch 814 SHA256 b49d742526c40fb017e09b68bf5d9be928c21374778142efb1aa7530b72e59c9 SHA512 2531f730991e9810ff84372dfe79e6a973eecca3b3154709c5e839a8a9e45606567619549e4e9156a1751e3e45a723f0728ca9d4175606252dca6fdef19ff879 WHIRLPOOL c8159580e9ab9988994406a8936225a54c949971b28bfba7a64a47f77966cdea5f0f814213f8e2992041adb7ec66e7ca53f6d43f791a1e5036b460d0da2fda5f
 AUX elektra-0.8.3-introduce-attributes.patch 806 SHA256 09ea008048e620e05b6e64a877275073574e34457354f578ba9d0ab1737e15f2 SHA512 1ea9dd7b5460dfae6a57ceb972e527b7c7dd80452fba19b1296a31175b3285144b0458271981f6b26e5e239301bb698c1ce87ca113ad58ecf3fa433f4240b666 WHIRLPOOL 90eb0167a85c1ea9e58f12c30fb69a13edea034762a6c04d3ccd8b8f9e656e3398ccca3f3ee27592401930c6088043416515850055c149709cc7d2884bce9b66
+AUX elektra-0.8.7-conditional-glob-tests.patch 589 SHA256 e23ece7b784cefe34d8f7720e451798b5a4c57fe4f9bb0bfcf33943631ebb744 SHA512 6b8255000f447a455484f7e4d8727ab18f921a9ca6d2b46a5136c7f4162bcbc4b5fc24c060f2805b454e271a51bd371e9365c972620c078dbcf978bd7f4d05ca WHIRLPOOL 1a9479bb8d6b2ed52f1420bfe9eef0e1f408252955756ff64834f57446206f6c63712127d1616a935d4a075ec10403d7dc451287e296d22ffce61b771d9948ee
 DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
 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
 EBUILD elektra-0.7.1-r5.ebuild 2135 SHA256 ad5ecb8d4ef5b4db5d98aa831282444d8177fe830eec1debea5b8f0fbb837b32 SHA512 71af2fc32b87a208bddb4ff24cd420d8a130e56612611c9990125c38a94be49fc657fb4b6cc51e31ae7a74bf97d332ccc393c6ee280af317233f46af7e3cc64e WHIRLPOOL 3ff36cca07dd55873e028a134a6384f48fa76175967e579af144c6cfec4448af08e771ec7806ce9478e7339219fdb3a37abde5af5281b607688f685adc2d70bc
 EBUILD elektra-0.8.3-r3.ebuild 2756 SHA256 a7493c0613e50d53c9588fed7d2153fe9b39a6f75ba925839a2d8a1fb1e4134b SHA512 c1411e40ec5df76cb382a4aae02813ebc3e8aa38440e229a6cff8a7a38de7d7eed737d9d5a81f8ceb4654c2e3cb9366f19244e8f626680cddd128cd40411312c WHIRLPOOL b6f420a5d8c0ea92ada97c535af900d28e91ea505f2721b4f95bf1197958be5326c370d1fb2f21e16d16c1e1c49b4af1bd89b9d20b4ae81a089e02d172450a9f
 EBUILD elektra-0.8.6.ebuild 2280 SHA256 3b35f6706d4c1e807f77197396e86fbbce8eca2ba7e00260a605f7797c73803a SHA512 31034da650b2e46eca399750d51d1933e88ae1c5377a94da196f353a569c924e9976025a32db04a65183873437b8688883cd4a731ba080d10466f00f6c8e6f20 WHIRLPOOL 6efa6a61b9ad0b0f4cf2f0f184f41860bae5c245cc29ea2a25d0caef883e96a46d6c79d72012af7505e6f52e15814527585235bded0970b97dbeee778ff049a6
-MISC ChangeLog 3829 SHA256 500bb174230239a95c18acfc6f5de6d1411f742f5b5bf280642547872eccf255 SHA512 8791f2c5068fb2e8fa8d59a0e1b02b2c770834780f2e99d9380f2108d6ed42cc315579ce911444968f421d225b26f7a9cddbe24cd76ed946e6ecc2f18ddc5f87 WHIRLPOOL 274eb5543b8afbafddae4346506e29c5c439b73d8b70ff4b7ca2be3cd2d3167d2cb0000aeb99779fc8557cf4056ccefcd505cf3d158a052cc19007566a6b6f97
-MISC metadata.xml 462 SHA256 b3af025b0625a585fe09b6029d3232534dd158172ebf677ecddc95934f131fd6 SHA512 937b1eb2c167d91ce920afd23c5cd3d6381b4ed48f7b20553f5a961cfeb1360c3b5d6ad1fe464f8aac11aa9ee0ed9fa3686aee215bea594a03703b9242fdda2e WHIRLPOOL d07fdf0591ad8121c9348056e7d3cd72ac12ae26a69ee88b7342e6dbcac4c5c3fa34a3f66a064cfb6b5c758057849b5cf05f693271daece576b38111ec10ccac
+EBUILD elektra-0.8.7.ebuild 2834 SHA256 1b3e1fc2d04e1152dfea95f0b5d54449ee2073319571aea35169a5654190972e SHA512 980e0722fbed05e7432944b4976b3795536ec3d147d12d01804790909bc799d7387c158080252ed259dc6053833736dae23c2f14f20c7dcad42381054918daf2 WHIRLPOOL 56877b2886acf04ae43d84a49b638f0e51ec9ee1fc2ef999d557a28f884d17ad8a217674e5fe2771ca43f372a49aa401d08ffce2c44c8b7d9b7f645cd690f896
+MISC ChangeLog 4054 SHA256 c1d01f1006d7be0c6d512965baff96f46ee02580d9a9dbb56aba393ed439810b SHA512 a411520af2e46be02c6f1f86bfedfe68dd6eec6be5bb059240dd77be5320335ad62d7464cb8e5e2747f035ecae6d20b88abdb2fa5560f2600d3632f628aca087 WHIRLPOOL 8295e0198f0e8cd8f6ef3c5b1aa63b81a1207c390c2451d67547616d8e7e035877ca63c05bdb55649d386b326795b8fc16e866f4a2396b57981bb7ed349db0fe
+MISC metadata.xml 562 SHA256 4aac0536ed40cd53360837769560ea2b391410ab25a8c1c485fe07247967ccca SHA512 9c08344f697b66cd6f9a61e1200df5a4d159cd3145c61d7033085d558ec620c4ae33ec2639db2872a1e5555233a06e293d1a21d9472643eab5b863ff496060c5 WHIRLPOOL d42e400a47900eb574e486068489864bba87f6c7144bcb3c4a8e8d6f3b8acc21ccebf3c800e7123bff4a3b692c0f23d438e167667652c7f6a5ebe8a5eaa84236
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlPZdnBfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JCKfQD9EAtGwPNepd2A5+UaK8bRFLhw
-GgffqQmu3qY0L06cEgkA/RpJz9rv5g/B8te4vgEOU1I/qtsfZzKFY7RDT06dpIu3
-=C+ey
+iF4EAREIAAYFAlV3GDYACgkQknrdDGLu8JC5OgEAicNnxXmzlf9WrW3jCQYWLClt
+4bj6pqY8tChNl2xoeJsA/AxgKWrr/k11BlbT/QZPk+mRg4m3GUMUZyjiolPOhXJj
+=/T1J
 -----END PGP SIGNATURE-----
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>