[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     cb4224bbbeb0a2bc7222b70775f953db4a61efe6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 21:08:55 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 23:40:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4224bb

app-admin/elektra: Invert plugins logic to avoid unhandled deps

Restrict plugins to 0.8.16 choice.
Quick fix for unhandled dependencies in botched 0.8.20 ebuild.

Bug: https://bugs.gentoo.org/648424
Bug: https://bugs.gentoo.org/639014
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-admin/elektra/elektra-0.8.20-r1.ebuild | 36 +++++++++++++++++-------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/app-admin/elektra/elektra-0.8.20-r1.ebuild b/app-admin/elektra/elektra-0.8.20-r1.ebuild
index c5a8299dc90..8dfa50c25aa 100644
--- a/app-admin/elektra/elektra-0.8.20-r1.ebuild
+++ b/app-admin/elektra/elektra-0.8.20-r1.ebuild
@@ -58,20 +58,26 @@ src_prepare() {
 }
 
 src_configure() {
-	local my_plugins="ALL"
-
-	use augeas    || my_plugins+=";-augeas"
-	use dbus      || my_plugins+=";-dbus"
-	use iconv     || my_plugins+=";-iconv"
-	use ini       || my_plugins+=";-ini"		# bundles inih
-	use java      || my_plugins+=";-jni"
-	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"
+	# default storage and resolver requirements
+	local my_plugins="NONE;dump;resolver;resolver_fm_hpu_b;sync;"
+	# defaults chosen by availability in 0.8.16
+	my_plugins+="ccode;conditionals;constants;enum;error;filecheck;fstab;glob;"
+	my_plugins+="hexcode;hidden;hosts;iterate;keytometa;line;lineendings;list;"
+	my_plugins+="logchange;mathcheck;network;ni;null;path;profile;regexstore;"
+	my_plugins+="rename;semlock;shell;spec;struct;timeofday;tracer;type;validation;"
+
+	use augeas    && my_plugins+="augeas;"
+	use dbus      && my_plugins+="dbus;"
+	use iconv     && my_plugins+="iconv;"
+	use ini       && my_plugins+="ini;"		# bundles inih
+	use java      && my_plugins+="jni;"
+	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
@@ -79,7 +85,7 @@ src_configure() {
 	# 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"
+	# my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
 
 	local my_tools="kdb"
 	use qt5 && my_tools+=";qt-gui"