--- elektra-0.8.6.ebuild	2014-07-31 00:49:14.000000000 +0200
+++ elektra-0.8.6.ebuild	2014-08-20 02:55:55.326184527 +0200
@@ -1,6 +1,6 @@ 
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.8.6.ebuild,v 1.1 2014/07/30 22:49:14 xmw Exp $
+# $Header: $
 
 EAPI=5
 
@@ -8,12 +8,20 @@ 
 
 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"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://gitorious.org/elektra-initiative/libelektra.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus doc examples iconv simpleini static-libs syslog tcl test +uname xml yajl"
+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}] )
@@ -27,12 +35,28 @@ 
 	sys-devel/libtool
 	doc? ( app-doc/doxygen )"
 
-DOCS="doc/AUTHORS doc/CHANGES doc/NEWS doc/README doc/todo/TODO"
+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}/${PN}-0.8.7-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
@@ -44,8 +68,10 @@ 
 	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 doc       && my_plugins+=";doc"
+#	use doc       && my_plugins+=";doc"		#bug 514402; examples?
 	use iconv     && my_plugins+=";iconv"
+	use ini       && my_plugins+=";ini"		#bundles inih - baaad
+	use keytometa && my_plugins+=";keytometa"
 	use simpleini && my_plugins+=";simpleini"
 	use syslog    && my_plugins+=";syslog"
 	use tcl       && my_plugins+=";tcl"
@@ -63,6 +89,7 @@ 
 			|| 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