| 1 |
commit: 4f487d6cc395f03963f4bb7a68bde985dd73b4a3 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 29 17:10:45 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 30 16:44:55 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/eselect.git/commit/?id=4f487d6c |
| 7 |
|
| 8 |
wxwidgets.eselect: Fix libdir usage. |
| 9 |
|
| 10 |
* modules/wxwidgets.eselect: Inherit multilib library (bug 552500). |
| 11 |
(get_confdir): New function, outputs path of wx config dir. |
| 12 |
(do_list, do_set, do_update): Use it. |
| 13 |
|
| 14 |
ChangeLog | 6 ++++++ |
| 15 |
modules/wxwidgets.eselect | 12 +++++++++--- |
| 16 |
2 files changed, 15 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/ChangeLog b/ChangeLog |
| 19 |
index 6de155b..b12c381 100644 |
| 20 |
--- a/ChangeLog |
| 21 |
+++ b/ChangeLog |
| 22 |
@@ -1,3 +1,9 @@ |
| 23 |
+2018-05-29 Ulrich Müller <ulm@g.o> |
| 24 |
+ |
| 25 |
+ * modules/wxwidgets.eselect: Inherit multilib library (bug 552500). |
| 26 |
+ (get_confdir): New function, outputs path of wx config dir. |
| 27 |
+ (do_list, do_set, do_update): Use it. |
| 28 |
+ |
| 29 |
2018-03-06 Ulrich Müller <ulm@g.o> |
| 30 |
|
| 31 |
* modules/gnome-shell-extensions.eselect: Inherit tests library. |
| 32 |
|
| 33 |
diff --git a/modules/wxwidgets.eselect b/modules/wxwidgets.eselect |
| 34 |
index 55d49d2..b1abc1c 100644 |
| 35 |
--- a/modules/wxwidgets.eselect |
| 36 |
+++ b/modules/wxwidgets.eselect |
| 37 |
@@ -1,15 +1,18 @@ |
| 38 |
# -*-eselect-*- vim: ft=eselect |
| 39 |
-# Copyright 1999-2014 Gentoo Foundation |
| 40 |
+# Copyright 1999-2018 Gentoo Foundation |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
|
| 43 |
-inherit config |
| 44 |
+inherit config multilib |
| 45 |
|
| 46 |
DESCRIPTION="Manage the system default wxWidgets profile" |
| 47 |
MAINTAINER="wxwidgets@g.o" |
| 48 |
VERSION="20140423" |
| 49 |
|
| 50 |
WXCONFFILE="${EROOT}"/var/lib/wxwidgets/current |
| 51 |
-WXCONFDIR="${EROOT}"/usr/lib/wx/config |
| 52 |
+ |
| 53 |
+get_confdir() { |
| 54 |
+ echo "${EROOT}/usr/$(get_libdir)/wx/config" |
| 55 |
+} |
| 56 |
|
| 57 |
find_targets() { |
| 58 |
local conf |
| 59 |
@@ -89,6 +92,7 @@ describe_list() { |
| 60 |
} |
| 61 |
|
| 62 |
do_list() { |
| 63 |
+ local WXCONFDIR=$(get_confdir) |
| 64 |
local i targets currconf |
| 65 |
targets=( $(find_targets) ) |
| 66 |
[[ -e ${WXCONFFILE} ]] && currconf=$(load_config ${WXCONFFILE} WXCONFIG) |
| 67 |
@@ -123,6 +127,7 @@ do_set() { |
| 68 |
[[ ! -w "${EROOT}"/var/lib/ ]] \ |
| 69 |
&& die -q "You need write permission to /var/lib to perform this action." |
| 70 |
|
| 71 |
+ local WXCONFDIR=$(get_confdir) |
| 72 |
set_config "${1}" |
| 73 |
} |
| 74 |
|
| 75 |
@@ -133,6 +138,7 @@ describe_update() { |
| 76 |
do_update() { |
| 77 |
[[ ! -e ${WXCONFFILE} ]] && do_set none |
| 78 |
|
| 79 |
+ local WXCONFDIR=$(get_confdir) |
| 80 |
currconf=$(load_config ${WXCONFFILE} WXCONFIG) |
| 81 |
|
| 82 |
# if current config is valid leave it alone |
Archives