--- a/modules/wxwidgets.eselect +++ a/modules/wxwidgets.eselect @@ -1,15 +1,29 @@ # -*-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 package-manager 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_libdir +# Print the libdir name obtained according to PMS algorithm 12.5 +# !!! This function is included here only for testing, and will +# !!! be added to libs/package-manager.bash.in of eselect instead +get_libdir() { + local abi libdir + abi=$(envvar sys-devel/gcc ABI) + [[ -n ${abi} ]] && libdir=$(envvar sys-devel/gcc "LIBDIR_${abi}") + echo "${libdir:-lib}" +} + +get_confdir() { + echo "${EROOT}/usr/$(get_libdir)/wx/config" +} find_targets() { local conf @@ -89,6 +103,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 +138,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 +149,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