| 1 |
commit: 854a97904d06f51a5d25cab1d20fe2857773a4d0 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 1 19:01:56 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 1 19:01:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854a9790 |
| 7 |
|
| 8 |
wxwidgets.eclass: Remove dead SLOTs |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/wxwidgets.eclass | 32 +++++++++----------------------- |
| 13 |
1 file changed, 9 insertions(+), 23 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass |
| 16 |
index 80c0fc5dea3..09c45ba48a5 100644 |
| 17 |
--- a/eclass/wxwidgets.eclass |
| 18 |
+++ b/eclass/wxwidgets.eclass |
| 19 |
@@ -94,31 +94,17 @@ esac |
| 20 |
# See: http://docs.wxwidgets.org/trunk/overview_debugging.html |
| 21 |
|
| 22 |
setup-wxwidgets() { |
| 23 |
- local w wxtoolkit wxdebug wxconf |
| 24 |
+ local w wxtoolkit wxconf |
| 25 |
|
| 26 |
- case "${WX_GTK_VER}" in |
| 27 |
- 3.0-gtk3) |
| 28 |
- wxtoolkit=gtk3 |
| 29 |
- if [[ -z ${WX_DISABLE_NDEBUG} ]]; then |
| 30 |
- ( in_iuse debug && use debug ) || append-cppflags -DNDEBUG |
| 31 |
- fi |
| 32 |
- ;; |
| 33 |
- 2.9|3.0) |
| 34 |
- wxtoolkit=gtk2 |
| 35 |
- if [[ -z ${WX_DISABLE_NDEBUG} ]]; then |
| 36 |
- ( in_iuse debug && use debug ) || append-cppflags -DNDEBUG |
| 37 |
- fi |
| 38 |
- ;; |
| 39 |
- 2.8) |
| 40 |
- wxtoolkit=gtk2 |
| 41 |
- wxdebug="release-" |
| 42 |
- has_version x11-libs/wxGTK:${WX_GTK_VER}[debug] && wxdebug="debug-" |
| 43 |
- ;; |
| 44 |
- *) |
| 45 |
- die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT" |
| 46 |
- ;; |
| 47 |
+ case ${WX_GTK_VER} in |
| 48 |
+ 3.0-gtk3) wxtoolkit=gtk3 ;; |
| 49 |
+ 3.0) wxtoolkit=gtk2 ;; |
| 50 |
esac |
| 51 |
|
| 52 |
+ if [[ -z ${WX_DISABLE_NDEBUG} ]]; then |
| 53 |
+ { in_iuse debug && use debug; } || append-cppflags -DNDEBUG |
| 54 |
+ fi |
| 55 |
+ |
| 56 |
# toolkit overrides |
| 57 |
if has_version "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then |
| 58 |
wxtoolkit="mac" |
| 59 |
@@ -126,7 +112,7 @@ setup-wxwidgets() { |
| 60 |
wxtoolkit="base" |
| 61 |
fi |
| 62 |
|
| 63 |
- wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}" |
| 64 |
+ wxconf="${wxtoolkit}-unicode-${WX_GTK_VER}" |
| 65 |
for w in "${CHOST:-${CBUILD}}-${wxconf}" "${wxconf}"; do |
| 66 |
[[ -f ${ESYSROOT:-${EPREFIX}}/usr/$(get_libdir)/wx/config/${w} ]] && wxconf=${w} && break |
| 67 |
done || die "Failed to find configuration ${wxconf}" |
Archives