From: Michael Weber <xmw@gentoo.org>
Date: Tue, 1 Mar 2016 15:47:14 +0000 (+0100)
Subject: app-admin/elektra: fix DESCRIPTION, live ebuild, metadata.xml
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=40e14a420f80b1f175e8e83dbe3eb54e6af5cb34;p=gentoo.git

app-admin/elektra: fix DESCRIPTION, live ebuild, metadata.xml

Package-Manager: portage-2.2.27
---

diff --git a/app-admin/elektra/elektra-0.7.1-r5.ebuild b/app-admin/elektra/elektra-0.7.1-r5.ebuild
index a15dac611bf5..e9b015410e46 100644
--- a/app-admin/elektra/elektra-0.7.1-r5.ebuild
+++ b/app-admin/elektra/elektra-0.7.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit autotools autotools-multilib eutils multilib
 
-DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
 SRC_URI="ftp://ftp.markus-raab.org/${PN}/${P}.tar.gz"
 
diff --git a/app-admin/elektra/elektra-0.8.12.ebuild b/app-admin/elektra/elektra-0.8.12.ebuild
index b1fb7b2f8a38..9ff40ab26531 100644
--- a/app-admin/elektra/elektra-0.8.12.ebuild
+++ b/app-admin/elektra/elektra-0.8.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ 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"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
 SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
 
diff --git a/app-admin/elektra/elektra-0.8.15.ebuild b/app-admin/elektra/elektra-0.8.15.ebuild
index cbab60adaee6..487f83bdc252 100644
--- a/app-admin/elektra/elektra-0.8.15.ebuild
+++ b/app-admin/elektra/elektra-0.8.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ 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"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
 SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
 
diff --git a/app-admin/elektra/elektra-9999.ebuild b/app-admin/elektra/elektra-9999.ebuild
index fa4aed646a54..d719bc8665f3 100644
--- a/app-admin/elektra/elektra-9999.ebuild
+++ b/app-admin/elektra/elektra-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,12 +6,12 @@ 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"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
 EGIT_REPO_URI="git://github.com/ElektraInitiative/libelektra.git"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS=""
 PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
 IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
@@ -41,7 +41,7 @@ RESTRICT="test"
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
 
-PATCHES=( "${FILESDIR}/${PN}"-0.8.11-conditional-glob-tests.patch )
+PATCHES=( "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch )
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
index 1c07cb81ebd7..59b713eb20dd 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -9,7 +9,6 @@
 	<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>