Fix wxrc wrapper to work when called from eclass and push out various small

local changes i forgot to commit.
(Portage version: 2.1.4_rc10)

5 files changed, 54 insertions, 50 deletions

diff --git a/app-admin/eselect-wxwidgets/ChangeLog b/app-admin/eselect-wxwidgets/ChangeLog
index 7d16abef5ec3..f740482ebe35 100644
--- a/app-admin/eselect-wxwidgets/ChangeLog
+++ b/app-admin/eselect-wxwidgets/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2007/12/22 22:06:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.14 2007/12/23 04:02:47 dirtyepic Exp $
+
+*eselect-wxwidgets-0.7-r1 (23 Dec 2007)
+
+  23 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> files/wx-config-0.7,
+  files/wxrc-0.7, -eselect-wxwidgets-0.7.ebuild,
+  +eselect-wxwidgets-0.7-r1.ebuild:
+  Fix wxrc wrapper to work when called from eclass and push out various small
+  local changes i forgot to commit.
 
   22 Dec 2007; nixnut <nixnut@gentoo.org> eselect-wxwidgets-0.7.ebuild:
   Added ~ppc wrt bug 199594
diff --git a/app-admin/eselect-wxwidgets/eselect-wxwidgets-0.7.ebuild b/app-admin/eselect-wxwidgets/eselect-wxwidgets-0.7-r1.ebuild
index 2155c7024d0d..afc6d2b57e1a 100644
--- a/app-admin/eselect-wxwidgets/eselect-wxwidgets-0.7.ebuild
+++ b/app-admin/eselect-wxwidgets/eselect-wxwidgets-0.7-r1.ebuild
@@ -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/eselect-wxwidgets-0.7.ebuild,v 1.2 2007/12/22 22:06:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/eselect-wxwidgets-0.7-r1.ebuild,v 1.1 2007/12/23 04:02:47 dirtyepic Exp $
 
 DESCRIPTION="Manage the system default for wxWidgets packages."
 HOMEPAGE="http://www.gentoo.org"
diff --git a/app-admin/eselect-wxwidgets/files/digest-eselect-wxwidgets-0.7 b/app-admin/eselect-wxwidgets/files/digest-eselect-wxwidgets-0.7-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/app-admin/eselect-wxwidgets/files/digest-eselect-wxwidgets-0.7
+++ b/app-admin/eselect-wxwidgets/files/digest-eselect-wxwidgets-0.7-r1
diff --git a/app-admin/eselect-wxwidgets/files/wx-config-0.7 b/app-admin/eselect-wxwidgets/files/wx-config-0.7
index 550ae2eabc75..388ad5097547 100755
--- a/app-admin/eselect-wxwidgets/files/wx-config-0.7
+++ b/app-admin/eselect-wxwidgets/files/wx-config-0.7
@@ -13,25 +13,22 @@ _wxerror() {
 	exit 1
 }
 
-# Ebuilds should not use this wrapper and use wxwidgets.eclass instead.
-#if [[ -n ${EBUILD_PHASE} ]]; then
+if [[ -n ${WX_ECLASS_CONFIG} ]]; then
+	${WX_ECLASS_CONFIG} "$@"
+	exit 0
+#elif [[ -n ${EBUILD_PHASE} ]]; then
 #	cat <<- EOF
-#"
+#	"
 #
 #
-#***     This ebuild is attempting to use /usr/bin/wx-config directly.
-#***     Please see wxwidgets.eclass for instructions how to add wxWidgets support
-#***     to your package.
+#	***     This ebuild is attempting to use /usr/bin/wx-config directly.
+#	***     Please see wxwidgets.eclass for instructions how to add wxWidgets support
+#	***     to your package.
 #
 #
-#"
+#	"
 #	EOF
 #	exit 1
-#fi
-
-if [[ -n ${WX_ECLASS_CONFIG} ]]; then
-	${WX_ECLASS_CONFIG} "$@"
-	exit 0
 else
 	if [[ -e /var/lib/wxwidgets/current ]]; then
 		source /var/lib/wxwidgets/current
diff --git a/app-admin/eselect-wxwidgets/files/wxrc-0.7 b/app-admin/eselect-wxwidgets/files/wxrc-0.7
index 8a30541d43d7..6dcfa4a73181 100755
--- a/app-admin/eselect-wxwidgets/files/wxrc-0.7
+++ b/app-admin/eselect-wxwidgets/files/wxrc-0.7
@@ -1,50 +1,49 @@
 #!/bin/bash -
 #
 # /usr/bin/wxrc
-#	a lame wrapper by dirtyepic@gentoo.org
+#
+#  a lame wxrc wrapper by dirtyepic@gentoo.org
 
 _wxerror() {
-    echo "An error occurred while calling wxrc:"
-    echo
-    echo "    ${1}"
-    echo
-    echo "Please use \`eselect wxwidgets\` to select an available profile and try again."
-    exit 1
-}
-
-# Ebuilds should not use this wrapper and use wxwidgets.eclass instead.
-if [[ -n ${EBUILD_PHASE} ]]; then
-	cat <<- EOF
-"
-
-
-***     This ebuild is attempting to use /usr/bin/wxrc directly.
-***     Please see wxwidgets.eclass for instructions how to add wxWidgets support
-***     to your package.
-
-
-"
-	EOF
+	echo "An error occurred while calling wxrc:"
+	echo
+	echo "    ${1}"
+	echo
+	echo "Please use \`eselect wxwidgets\` to select an available profile and try again."
 	exit 1
-fi
+}
 
 if [[ -n ${WX_ECLASS_CONFIG} ]]; then
-    ${WX_ECLASS_CONFIG} "$@"
-    exit 0
+	$(${WX_ECLASS_CONFIG} --utility=wxrc) "$@"
+	exit 0
+#elif [[ -n ${EBUILD_PHASE} ]]; then
+#	cat <<- EOF
+#	"
+#
+#
+#	***     This ebuild is attempting to use /usr/bin/wx-config directly.
+#	***     Please see wxwidgets.eclass for instructions how to add wxWidgets support
+#	***     to your package.
+#
+#
+#	"
+#	EOF
+#	exit 1
 else
-    if [[ -e /var/lib/wxwidgets/current ]]; then
-        source /var/lib/wxwidgets/current
-    else
-        _wxerror "Cannot find wxWidgets profile configuration file ( /var/lib/wxwidgets/current )"
-    fi
+	if [[ -e /var/lib/wxwidgets/current ]]; then
+		source /var/lib/wxwidgets/current
+	else
+		_wxerror "Cannot find wxWidgets profile configuration file ( /var/lib/wxwidgets/current )"
+	fi
 
-    [[ ${WXCONFIG} == none ]] && _wxerror "No profile currently selected"
+	[[ ${WXCONFIG} == none ]] && _wxerror "No profile currently selected"
 
-    if [[ -f /usr/lib/wx/config/${WXCONFIG} \
-       && -x /usr/lib/wx/config/${WXCONFIG} ]]; then
-       $(/usr/lib/wx/config/${WXCONFIG} --utility=wxrc) "$@"
-    else
-        _wxerror "Cannot find wxWidgets profile ( ${WXCONFIG} )"
+	if [[ -f /usr/lib/wx/config/${WXCONFIG} \
+	   && -x /usr/lib/wx/config/${WXCONFIG} ]]; then
+	   $(/usr/lib/wx/config/${WXCONFIG} --utility=wxrc) "$@"
+	else
+		_wxerror "Cannot find wxWidgets profile ( ${WXCONFIG} )"
 	fi
 	exit 0
 fi
+