Version bump, add live ebuild, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/165 (thanks a17r).

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

7 files changed, 287 insertions, 11 deletions

diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog
index 1d021a18576d..4ce227ce0f91 100644
--- a/app-admin/elektra/ChangeLog
+++ b/app-admin/elektra/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/elektra
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.22 2015/08/05 12:03:06 xmw Exp $
+
+*elektra-0.8.12 (05 Aug 2015)
+*elektra-9999 (05 Aug 2015)
+
+  05 Aug 2015; Michael Weber <xmw@gentoo.org> +elektra-0.8.12.ebuild,
+  +elektra-9999.ebuild, +files/elektra-0.8.11-conditional-glob-tests.patch,
+  elektra-0.8.7.ebuild, metadata.xml:
+  Version bump, add live ebuild, https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/165 (thanks a17r).
 
 *elektra-0.8.7 (09 Jun 2015)
 
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index eb3ec35e4092..8f6e35b1da4e 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -5,23 +5,27 @@ AUX elektra-0.7.1-automake-1.12.patch 600 SHA256 42ae7ff20a5e2f9b99a8c6db8c3aab3
 AUX elektra-0.7.1-ltdl.patch 630 SHA256 707a809f9927f5ef376b7f4f7c116590524f2da8a5cbcfb76ab2664b14de136c SHA512 f32fc4b0c3fd943ba2ced6908417eeb24216878e6a8523991e81f59343c35d4cc2e393153f4c961bdbf8574e7caf941c0c85d695003aa124f55e9e9e862d13d8 WHIRLPOOL 4a787ed571e8cc82a1bfcefd6f3ff8dca4f251286b6ffd7e8c898ce11526ca86c19f72d33f16397dd131c5f6977195077442199c54e8f786d7748812fd259cc4
 AUX elektra-0.7.1-remove-ddefault-link.patch 576 SHA256 ad834ef43a15925e5570faae853fa6d32607bd75dd991d9223373c1aa66df15e SHA512 75b0d776fdd150f369021f98868da5a1d3e4dc7891a5de149c9b16ca984300a0688fec11e9441732ac7d11c899371bbfa3879562131333597a5d57f89748a92d WHIRLPOOL dc0dd9e760ce86b5b8e28cae0c43c86de4194c1008d82a4b8dfe934eda35c88f7e3ff26931a46f192f0a45e0f71d642c8d10d00ac66431e6c5e037ffbb34ef1c
 AUX elektra-0.7.1-test.patch 6259 SHA256 a84091cbe3b0ca9c01278c17d8eee0f95a06758969d52599b855da1be3949f49 SHA512 258e49c90cea8b1a830a8acb5a2307e49d3dea6b2189373f1b0b614cb070d7a9dbb4954fb486bbacd46fa612d96d6824ef1ee4f40925ad2a347eabb4a45bdfe7 WHIRLPOOL 382a95d5b7fb4d5564eac06a04a909e69af3770913d06b56c3e3d78f3c4f56ef9a4fe51e490e274de0cdd9b254808da6c5638d4b35f991fe1b4c5cf9d7cda011
+AUX elektra-0.8.11-conditional-glob-tests.patch 667 SHA256 28d6f2de7cc9c1281d943da84561047cf029d7f2b6425814b4bb4cabd13ce250 SHA512 e329f3971af6e8ceef11161226cf0484c5cbbaa81b8e03a1d5066e5438af4a236502a792f13264bacec96b08175e6dcc06d0baddcdf3c2593915fe4c14ada374 WHIRLPOOL d1139870ab8f8f3fd099f0dcb6febaa5f6e71cc0d4aee736a47969b3b77725bbfe7795e2d9cfa744367e865b3487254c02ab51f3ddca7a695221addce526d68f
 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.12.tar.gz 2102450 SHA256 562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea WHIRLPOOL 6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da
 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.12.ebuild 3790 SHA256 cdb0bb3d6f91683399e856aac43fabec9be3f403fdf2904e29a707097ee1e691 SHA512 4da7e82ae91ccdf291e5c032b6faf8b8158fffd78cdcff93c432d7726ee77e3dda0d43ec13a20e83ed103fbe82081c595e22201d6d93111c9e24ea51dd35cd05 WHIRLPOOL 4494296e1360c112ea69fc44f6b42b5f81bffc252cb9f938699c5678c0e045577be97eea9046e0a4237ed2e03f8e39dd0898e2683fcb5237c16b5e3792f7dbad
 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
-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
+EBUILD elektra-0.8.7.ebuild 2840 SHA256 9e9f56de583007856b56c74f26157b829b6cb5efb4145be01a69f6b24e3456f0 SHA512 9dae1dd0eb32b00ff7bb0da5d559463ef3c313379bd9d5387e241e24220f80c9c6512d5acb35c446bf7c3d0ecca75ba95630af6815ff8f5d9b99ccfd779aab81 WHIRLPOOL 66033b709b4048939b819653445ff33d8b65bd88237a202c6a05b81b3ce2b9e5091b6bec923681342cb961239469912e5affd74c25918eab1fe0ee3e2438f189
+EBUILD elektra-9999.ebuild 3781 SHA256 f1b7ad3f0f5b8ccb6aeccc3d6a8c1ff85f7111c4613c190305b5c9903bc7fabd SHA512 96ad63646c6b5de8c86e60d122b91dd4e09d6b319aaf8c73e6d41155ea7124a65bcf686ea83f35bb2447a555a57511cb1ff7c2b0b29c6d57ef801429f5a0eff1 WHIRLPOOL f2110ff9670f727ee50aa82c7acbf99dc123409361d533d197c7b0ab2ed593c0c4c7102e4570561b091ce87ba7ffe4b80e391ef42cde2c69f0ec38581cc5c848
+MISC ChangeLog 4412 SHA256 3de214eae0b0bf73ee8ab2bc080efd7074185c598ec620f2f29632089dfe2041 SHA512 daa6f2bdc84e47a88814c4f1ca5d4f8aafa1c16b6195cb8d9e31d57d1ee5c2d7bd236f8e30dbbbac6c43414863e4df162791b331a8ded2902d432a9befee733d WHIRLPOOL 1c4cef8a03e139332d59e4226e6ba8fe98f61c9aa18845bd70390b3208e7594d8be17bd5a8a66711cbc2f090febcf5911e27c113ac1076fba8b89ce73989df77
+MISC metadata.xml 684 SHA256 cf971fcdea38f0e05089a49ce1d6809d54d70a852f04e1c9ed6bc45345647fa0 SHA512 8e2f6f3f51e5ced3a112eb012ba8da94566cd995d118ff007647190580c8ae57b487b50c384bfb14a451f3d19139089793fb192e12a860b83b444797b537d524 WHIRLPOOL 0a0031765ee7b5c5ad413c97bd6c1571fdb1900d453706dcbc664d861630f9607fac247757caf051c56ebb917cc0a45852bbae23bb563d4dfad0f3ff0edc8855
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlV3GDYACgkQknrdDGLu8JC5OgEAicNnxXmzlf9WrW3jCQYWLClt
-4bj6pqY8tChNl2xoeJsA/AxgKWrr/k11BlbT/QZPk+mRg4m3GUMUZyjiolPOhXJj
-=/T1J
+iF4EAREIAAYFAlXB+3sACgkQknrdDGLu8JDzyQD/cKKNzz8yQOBeJfrnfr3CpIo9
+qCRoh7bzCS59QzAYBYwA/iQwGKKlyc3XwmDauy5LDtTdbS0seB2BD0byNXLiZMrv
+=0Ym0
 -----END PGP SIGNATURE-----
diff --git a/app-admin/elektra/elektra-0.8.12.ebuild b/app-admin/elektra/elektra-0.8.12.ebuild
new file mode 100644
index 000000000000..a870ef67e9a5
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.12.ebuild
@@ -0,0 +1,120 @@
+# 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.12.ebuild,v 1.1 2015/08/05 12:03:06 xmw Exp $
+
+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
+		>=dev-qt/qtgui-5.3
+		>=dev-qt/qttest-5.3
+		>=dev-qt/qtwidgets-5.3
+	)
+	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.11-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/elektra-0.8.7.ebuild b/app-admin/elektra/elektra-0.8.7.ebuild
index 381fc5d8952b..874523752b21 100644
--- a/app-admin/elektra/elektra-0.8.7.ebuild
+++ b/app-admin/elektra/elektra-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.8.7.ebuild,v 1.2 2015/08/05 12:03:06 xmw Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
 SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="dbus doc examples iconv ini keytometa simpleini static-libs syslog tcl test +uname xml yajl"
 
diff --git a/app-admin/elektra/elektra-9999.ebuild b/app-admin/elektra/elektra-9999.ebuild
new file mode 100644
index 000000000000..4f59d4d846c6
--- /dev/null
+++ b/app-admin/elektra/elektra-9999.ebuild
@@ -0,0 +1,120 @@
+# 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-9999.ebuild,v 1.1 2015/08/05 12:03:06 xmw Exp $
+
+EAPI=5
+
+inherit cmake-multilib eutils java-pkg-opt-2 git-r3
+
+DESCRIPTION="Universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
+EGIT_REPO_URI="git://github.com/ElektraInitiative/libelektra.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+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
+		>=dev-qt/qtgui-5.3
+		>=dev-qt/qttest-5.3
+		>=dev-qt/qtwidgets-5.3
+	)
+	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.11-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.11-conditional-glob-tests.patch b/app-admin/elektra/files/elektra-0.8.11-conditional-glob-tests.patch
new file mode 100644
index 000000000000..ad529e4fd059
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.8.11-conditional-glob-tests.patch
@@ -0,0 +1,22 @@
+--- a/src/libtools/tests/CMakeLists.txt	2014-08-22 20:52:14.634898037 +0200
++++ b/src/libtools/tests/CMakeLists.txt	2014-08-22 21:19:25.770506035 +0200
+@@ -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})
+\ No newline at end of file
++	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 5ed326c0c99a..c3fe5e3083bd 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -6,12 +6,13 @@
 <name>Michael Weber</name>
 </maintainer>
 <use>
+	<flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
+	<flag name="ini">Enable new, advanced ini support</flag>
 	<flag name="gcov">Enable coverage support</flag>
+	<flag name="keytometa">Enable keytometa support</flag>
 	<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>