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

local changes i forgot to commit.
Package-Manager: portage-2.1.4_rc10

6 files changed, 83 insertions, 69 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/Manifest b/app-admin/eselect-wxwidgets/Manifest
index c5fc97c9ed25..6610defdc071 100644
--- a/app-admin/eselect-wxwidgets/Manifest
+++ b/app-admin/eselect-wxwidgets/Manifest
@@ -1,11 +1,14 @@
-AUX wx-config-0.7 1167 RMD160 4ffb4108cd4ef54f49b1f84407f940185f1a5301 SHA1 bc212c04b4a43ea652709a6b0e783b67e261b885 SHA256 28ba8e42113e45d3f1f1d9d65e23d03a2d3c8e11ff0d0e71f8bda9b790b352cc
-MD5 8ab08a59e96c032be85c6e190f6c58d6 files/wx-config-0.7 1167
-RMD160 4ffb4108cd4ef54f49b1f84407f940185f1a5301 files/wx-config-0.7 1167
-SHA256 28ba8e42113e45d3f1f1d9d65e23d03a2d3c8e11ff0d0e71f8bda9b790b352cc files/wx-config-0.7 1167
-AUX wxrc-0.7 1208 RMD160 86934f8436cc2989df3009856303c1d6219d3f59 SHA1 0d245546213a6e5c4973a78c3501b2292000815d SHA256 1e98c0ef1fef166d215adda583ddfc18fb9da295a37e7a6fcb066528a17efccc
-MD5 e2bdbad7335ffa32377007e488e8f529 files/wxrc-0.7 1208
-RMD160 86934f8436cc2989df3009856303c1d6219d3f59 files/wxrc-0.7 1208
-SHA256 1e98c0ef1fef166d215adda583ddfc18fb9da295a37e7a6fcb066528a17efccc files/wxrc-0.7 1208
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX wx-config-0.7 1097 RMD160 057fa949a0f97c16ff07c0448e26b92026b7f5b6 SHA1 eb73c40fbd5ed7b39d58f3f432ffeec8a7193437 SHA256 3d63c12d718d1da27fc09bfbe007e2915084fa6749321067ed2fbd6f71dbd01e
+MD5 c7c2673ad6b9616e92f1a4a2bf3b65b7 files/wx-config-0.7 1097
+RMD160 057fa949a0f97c16ff07c0448e26b92026b7f5b6 files/wx-config-0.7 1097
+SHA256 3d63c12d718d1da27fc09bfbe007e2915084fa6749321067ed2fbd6f71dbd01e files/wx-config-0.7 1097
+AUX wxrc-0.7 1118 RMD160 1d8fa34f3b4a6def4365d310182186492319726e SHA1 b19518a1d00fdae8684ee25bfad6ccf380841926 SHA256 4f27aa862e4e6aefdc6e962f6dc25f0a3b44bed9fac31e35186cd41509af1c22
+MD5 030880af51fb6f6f72dbc26b0b51357d files/wxrc-0.7 1118
+RMD160 1d8fa34f3b4a6def4365d310182186492319726e files/wxrc-0.7 1118
+SHA256 4f27aa862e4e6aefdc6e962f6dc25f0a3b44bed9fac31e35186cd41509af1c22 files/wxrc-0.7 1118
 AUX wxwidgets.eselect-0.7 5005 RMD160 653f133a42f7733e4dc6bb113126e72530f0ad23 SHA1 807097283dd702c564c2a0b1647bf2b4ee050026 SHA256 9131a7a7716fd677369d42823cf6e03a4dea29416daeb83748f674360e694a3e
 MD5 e7e691b4e746a262426bdf6602086dac files/wxwidgets.eselect-0.7 5005
 RMD160 653f133a42f7733e4dc6bb113126e72530f0ad23 files/wxwidgets.eselect-0.7 5005
@@ -14,18 +17,25 @@ AUX wxwin.m4 12433 RMD160 d8001d1e974bdecf44cb24427f22b64984d77535 SHA1 b252940a
 MD5 2ca4f85bd825e85c136b2efb69861c76 files/wxwin.m4 12433
 RMD160 d8001d1e974bdecf44cb24427f22b64984d77535 files/wxwin.m4 12433
 SHA256 f143b92ea6e37d9c63417134b1487625799d94fe3095bb0d2d6448e54117afc0 files/wxwin.m4 12433
-EBUILD eselect-wxwidgets-0.7.ebuild 1343 RMD160 56c64c9da44a052a5431bcf28a36e18afed21a23 SHA1 556a200119dbb24a4ea9c6b0328e420d5960bb14 SHA256 60d76f9ee00110fba92f68547d3fa0b3ae328c623c79486a5f7435d74c741625
-MD5 6c0f2bfa3ce4c03881f9002b6d24cc76 eselect-wxwidgets-0.7.ebuild 1343
-RMD160 56c64c9da44a052a5431bcf28a36e18afed21a23 eselect-wxwidgets-0.7.ebuild 1343
-SHA256 60d76f9ee00110fba92f68547d3fa0b3ae328c623c79486a5f7435d74c741625 eselect-wxwidgets-0.7.ebuild 1343
-MISC ChangeLog 2519 RMD160 332cfc0ca0adcf195fdcf0a5ed6538f03d8db63a SHA1 7fa1b62e5f4c32a0ac61e35ba7d9711b808f937b SHA256 5653a66152dfa03a3998f07a2be3649eeacab5c06f6202e26e77e5cde35d710e
-MD5 f64a6427d7c5083b55e670a82e2941a6 ChangeLog 2519
-RMD160 332cfc0ca0adcf195fdcf0a5ed6538f03d8db63a ChangeLog 2519
-SHA256 5653a66152dfa03a3998f07a2be3649eeacab5c06f6202e26e77e5cde35d710e ChangeLog 2519
+EBUILD eselect-wxwidgets-0.7-r1.ebuild 1349 RMD160 bd6a0edd7a862cf31adb7425567e763e877df668 SHA1 e2914ec066875885f1162dbf4cab0fc131c091ac SHA256 5b6d48b9d0d2efc95ad98ddde8f7f9184a718b565d6da60de05e6cdd4d39174b
+MD5 13201598845e496ec2a2d6e4aa15be0f eselect-wxwidgets-0.7-r1.ebuild 1349
+RMD160 bd6a0edd7a862cf31adb7425567e763e877df668 eselect-wxwidgets-0.7-r1.ebuild 1349
+SHA256 5b6d48b9d0d2efc95ad98ddde8f7f9184a718b565d6da60de05e6cdd4d39174b eselect-wxwidgets-0.7-r1.ebuild 1349
+MISC ChangeLog 2832 RMD160 3555bc1474c8159b3280e447aea17dde92930481 SHA1 c539477b8eed2f394624c939b96128943d795db4 SHA256 9801367e9ae732429751b83ff61fe3e96b703a5e63cfdf23df644bf92404b968
+MD5 1cb4676d952645ff085e6d5566755137 ChangeLog 2832
+RMD160 3555bc1474c8159b3280e447aea17dde92930481 ChangeLog 2832
+SHA256 9801367e9ae732429751b83ff61fe3e96b703a5e63cfdf23df644bf92404b968 ChangeLog 2832
 MISC metadata.xml 163 RMD160 f00b10701f46ce312c4e3056575ecdc7214b29b6 SHA1 8ca95681a55a91e5ed44e59ba5660d00bc9b5e0c SHA256 98e13cbe1b574224e90ac29486bdd82dfe1863029528af041f0a963cb01e8c74
 MD5 34a3c9a403196f569f63f0f608007f6e metadata.xml 163
 RMD160 f00b10701f46ce312c4e3056575ecdc7214b29b6 metadata.xml 163
 SHA256 98e13cbe1b574224e90ac29486bdd82dfe1863029528af041f0a963cb01e8c74 metadata.xml 163
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eselect-wxwidgets-0.7 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-eselect-wxwidgets-0.7 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-eselect-wxwidgets-0.7 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eselect-wxwidgets-0.7-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-eselect-wxwidgets-0.7-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-eselect-wxwidgets-0.7-r1 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkdt3fIACgkQiqiDRvmkBmISfwCgmcEFHheuvz7hd0JZiLzabMIc
+s4MAoICZenM/RpJ/xV0ZEdgi5G/7Uezt
+=4A9X
+-----END PGP SIGNATURE-----
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
+