From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0F774138335 for ; Sun, 25 Nov 2018 23:42:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98205E09E0; Sun, 25 Nov 2018 23:41:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57B62E09E0 for ; Sun, 25 Nov 2018 23:41:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96779335D9E for ; Sun, 25 Nov 2018 23:41:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C3B84BD for ; Sun, 25 Nov 2018 23:41:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1543189233.cb4224bbbeb0a2bc7222b70775f953db4a61efe6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/elektra/elektra-0.8.20-r1.ebuild X-VCS-Directories: app-admin/elektra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cb4224bbbeb0a2bc7222b70775f953db4a61efe6 X-VCS-Branch: master Date: Sun, 25 Nov 2018 23:41:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3753fc57-ca84-44d0-ac51-b56975c69feb X-Archives-Hash: 2f8b5739ef6f0b790ec9f847f930c92b commit: cb4224bbbeb0a2bc7222b70775f953db4a61efe6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 25 21:08:55 2018 +0000 Commit: Andreas Sturmlechner gentoo 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 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"