From daca6852432fa8058039965288ef2a05d8b598fb Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Tue, 29 May 2018 19:10:45 +0200 Subject: wxwidgets.eselect: Fix libdir usage. * modules/wxwidgets.eselect: Inherit multilib library (bug 552500). (get_confdir): New function, outputs path of wx config dir. (do_list, do_set, do_update): Use it. Filtered-out-of: https://gitweb.gentoo.org/proj/eselect.git/ Filtered-branch: extern Filtered-commit: 4f487d6cc395f03963f4bb7a68bde985dd73b4a3 --- wxwidgets.eselect | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/wxwidgets.eselect b/wxwidgets.eselect index 55d49d2..b1abc1c 100644 --- a/wxwidgets.eselect +++ b/wxwidgets.eselect @@ -1,15 +1,18 @@ # -*-eselect-*- vim: ft=eselect -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -inherit config +inherit config multilib DESCRIPTION="Manage the system default wxWidgets profile" MAINTAINER="wxwidgets@gentoo.org" VERSION="20140423" WXCONFFILE="${EROOT}"/var/lib/wxwidgets/current -WXCONFDIR="${EROOT}"/usr/lib/wx/config + +get_confdir() { + echo "${EROOT}/usr/$(get_libdir)/wx/config" +} find_targets() { local conf @@ -89,6 +92,7 @@ describe_list() { } do_list() { + local WXCONFDIR=$(get_confdir) local i targets currconf targets=( $(find_targets) ) [[ -e ${WXCONFFILE} ]] && currconf=$(load_config ${WXCONFFILE} WXCONFIG) @@ -123,6 +127,7 @@ do_set() { [[ ! -w "${EROOT}"/var/lib/ ]] \ && die -q "You need write permission to /var/lib to perform this action." + local WXCONFDIR=$(get_confdir) set_config "${1}" } @@ -133,6 +138,7 @@ describe_update() { do_update() { [[ ! -e ${WXCONFFILE} ]] && do_set none + local WXCONFDIR=$(get_confdir) currconf=$(load_config ${WXCONFFILE} WXCONFIG) # if current config is valid leave it alone -- cgit v1.2.3-65-gdbad