summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2007-12-12 04:05:38 +0000
committerRyan Hill <dirtyepic@gentoo.org>2007-12-12 04:05:38 +0000
commitfd375e0b04dcc619810fd515faeffdfb60bb00c3 (patch)
treead67be1298fce5238c495f65cfa5f5e58714de06 /app-admin/eselect-wxwidgets
parentAdded postinst message explaining how to set a profile since we now default (diff)
downloadgentoo-2-fd375e0b04dcc619810fd515faeffdfb60bb00c3.tar.gz
gentoo-2-fd375e0b04dcc619810fd515faeffdfb60bb00c3.tar.bz2
gentoo-2-fd375e0b04dcc619810fd515faeffdfb60bb00c3.zip
Handle case where doesn't exist. Undo thinko in wxrc wrapper.
(Portage version: 2.1.4_rc9)
Diffstat (limited to 'app-admin/eselect-wxwidgets')
-rw-r--r--app-admin/eselect-wxwidgets/ChangeLog6
-rwxr-xr-xapp-admin/eselect-wxwidgets/files/wxrc-0.52
-rw-r--r--app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.54
3 files changed, 9 insertions, 3 deletions
diff --git a/app-admin/eselect-wxwidgets/ChangeLog b/app-admin/eselect-wxwidgets/ChangeLog
index 3785fc71d784..431b588699a1 100644
--- a/app-admin/eselect-wxwidgets/ChangeLog
+++ b/app-admin/eselect-wxwidgets/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/eselect-wxwidgets
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.7 2007/12/12 03:47:30 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.8 2007/12/12 04:05:37 dirtyepic Exp $
+
+ 12 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> files/wxrc-0.5,
+ files/wxwidgets.eselect-0.5:
+ Handle case where doesn't exist. Undo thinko in wxrc wrapper.
12 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
eselect-wxwidgets-0.5.ebuild:
diff --git a/app-admin/eselect-wxwidgets/files/wxrc-0.5 b/app-admin/eselect-wxwidgets/files/wxrc-0.5
index c09fd94dd51c..080242e582c6 100755
--- a/app-admin/eselect-wxwidgets/files/wxrc-0.5
+++ b/app-admin/eselect-wxwidgets/files/wxrc-0.5
@@ -3,4 +3,4 @@
# /usr/bin/wxrc
# another lame wrapper by dirtyepic@gentoo.org
-/usr/bin/wx-config --utility=wxrc "$@"
+$(/usr/bin/wx-config --utility=wxrc) "$@"
diff --git a/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.5 b/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.5
index 9ccc934959b4..4b5f17a51e1a 100644
--- a/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.5
+++ b/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.5
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.5,v 1.2 2007/12/12 03:29:12 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.5,v 1.3 2007/12/12 04:05:38 dirtyepic Exp $
inherit config
@@ -115,6 +115,8 @@ describe_update() {
}
do_update() {
+ [[ ! -e ${WXCONFFILE} ]] && do_set none
+
currconf=$(load_config ${WXCONFFILE} WXCONFIG)
# if current config is "none" leave it alone