[gentoo-commits] gentoo-x86 commit in app-admin/eselect-wxwidgets/files: wxrc-0.7 wx-config-0.7 digest-eselect-wxwidgets-0.7-r1 digest-eselect-wxwidgets-0.7

[Ryan Hill (dirtyepic)]

dirtyepic    07/12/23 04:02:49

  Modified:             wxrc-0.7 wx-config-0.7
  Added:                digest-eselect-wxwidgets-0.7-r1
  Removed:              digest-eselect-wxwidgets-0.7
  Log:
  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)

Revision  Changes    Path
1.2                  app-admin/eselect-wxwidgets/files/wxrc-0.7

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/eselect-wxwidgets/files/wxrc-0.7?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/eselect-wxwidgets/files/wxrc-0.7?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/eselect-wxwidgets/files/wxrc-0.7?r1=1.1&r2=1.2

Index: wxrc-0.7
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wxrc-0.7,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxrc-0.7	20 Dec 2007 00:11:50 -0000	1.1
+++ wxrc-0.7	23 Dec 2007 04:02:48 -0000	1.2
@@ -1,50 +1,49 @@
 #!/bin/bash -
 #
 # /usr/bin/wxrc
-#	a lame wrapper by dirtyepic@g.o
+#
+#  a lame wxrc wrapper by dirtyepic@g.o
 
 _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
+



1.2                  app-admin/eselect-wxwidgets/files/wx-config-0.7

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/eselect-wxwidgets/files/wx-config-0.7?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/eselect-wxwidgets/files/wx-config-0.7?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/eselect-wxwidgets/files/wx-config-0.7?r1=1.1&r2=1.2

Index: wx-config-0.7
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wx-config-0.7,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wx-config-0.7	20 Dec 2007 00:11:50 -0000	1.1
+++ wx-config-0.7	23 Dec 2007 04:02:48 -0000	1.2
@@ -13,25 +13,22 @@
 	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



1.1                  app-admin/eselect-wxwidgets/files/digest-eselect-wxwidgets-0.7-r1

	<<Binary file>>


-- 
gentoo-commits@g.o mailing list