[gentoo-commits] proj/eselect:extern commit in: modules/, /

[Ulrich Müller]

commit:     4f487d6cc395f03963f4bb7a68bde985dd73b4a3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 17:10:45 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 30 16:44:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=4f487d6c

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.

 ChangeLog                 |  6 ++++++
 modules/wxwidgets.eselect | 12 +++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6de155b..b12c381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-29  Ulrich Müller  <u...@gentoo.org>
+
+       * 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.
+
 2018-03-06  Ulrich Müller  <u...@gentoo.org>
 
        * modules/gnome-shell-extensions.eselect: Inherit tests library.

diff --git a/modules/wxwidgets.eselect b/modules/wxwidgets.eselect
index 55d49d2..b1abc1c 100644
--- a/modules/wxwidgets.eselect
+++ b/modules/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="wxwidg...@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