Handle case where doesn't exist. Undo thinko in wxrc wrapper.

Package-Manager: portage-2.1.4_rc9

4 files changed, 24 insertions, 18 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/Manifest b/app-admin/eselect-wxwidgets/Manifest
index 8467fe5d6aa7..6cabb7a8eb87 100644
--- a/app-admin/eselect-wxwidgets/Manifest
+++ b/app-admin/eselect-wxwidgets/Manifest
@@ -5,22 +5,22 @@ AUX wx-config-0.5 832 RMD160 a555b4fa4c11176072d584c681490254f909e2ca SHA1 1ed67
 MD5 9c35b5be486ffaac37b4d42063a0d88b files/wx-config-0.5 832
 RMD160 a555b4fa4c11176072d584c681490254f909e2ca files/wx-config-0.5 832
 SHA256 06013dd63e92adca75ff3742197dcd1191f6cabd417941d79b363e71b545a180 files/wx-config-0.5 832
-AUX wxrc-0.5 117 RMD160 ca79dc620b66381469ae6aaa568380c7e0aac121 SHA1 95009ea7ed606fc817db01fbf442e268c238ad4e SHA256 38e441d2d181cb92b395c32ca730e1d8bed9fffb5e682eb6e44cba0c74281060
-MD5 14c583c0742fd9e52e0e22e1f5c5940b files/wxrc-0.5 117
-RMD160 ca79dc620b66381469ae6aaa568380c7e0aac121 files/wxrc-0.5 117
-SHA256 38e441d2d181cb92b395c32ca730e1d8bed9fffb5e682eb6e44cba0c74281060 files/wxrc-0.5 117
-AUX wxwidgets.eselect-0.5 4965 RMD160 f28058be585988c0f5b9852e4afec3838066508b SHA1 41e5c8d53d23993d5c7fc84b2cbb9b98acbceffe SHA256 6f3fa21d7935b7a70174cea041387f64d91433ab9c11b8181da870260112edf6
-MD5 f7d1fc4c7eeddfae24b6cd16b83bcf6a files/wxwidgets.eselect-0.5 4965
-RMD160 f28058be585988c0f5b9852e4afec3838066508b files/wxwidgets.eselect-0.5 4965
-SHA256 6f3fa21d7935b7a70174cea041387f64d91433ab9c11b8181da870260112edf6 files/wxwidgets.eselect-0.5 4965
+AUX wxrc-0.5 120 RMD160 211b88dda422a549275f3ee83e0bd92a142a2d32 SHA1 db82a9aff1eef2bd781a81543c27ff50fb0b7609 SHA256 2a1985791b24cf0ec67299fda4e2ce907ab4485893f1c6c21c371a23ab66683d
+MD5 b35811c688416f42475c856ddc431932 files/wxrc-0.5 120
+RMD160 211b88dda422a549275f3ee83e0bd92a142a2d32 files/wxrc-0.5 120
+SHA256 2a1985791b24cf0ec67299fda4e2ce907ab4485893f1c6c21c371a23ab66683d files/wxrc-0.5 120
+AUX wxwidgets.eselect-0.5 5007 RMD160 62d575210f9a595460217715d7304dec31cfdf11 SHA1 3b3a77020e44e1856a242084633581653a612c09 SHA256 4b35e9cea027f928ed092145a4a5d148ac02d9341124a009bba0a4ec067399bc
+MD5 fba78dc54467f8252b0c03523db81bb5 files/wxwidgets.eselect-0.5 5007
+RMD160 62d575210f9a595460217715d7304dec31cfdf11 files/wxwidgets.eselect-0.5 5007
+SHA256 4b35e9cea027f928ed092145a4a5d148ac02d9341124a009bba0a4ec067399bc files/wxwidgets.eselect-0.5 5007
 EBUILD eselect-wxwidgets-0.5.ebuild 1282 RMD160 1d826d86976f70803e9ead48aab789babe8a42d7 SHA1 35c704722a7c5b628f012a675bfa1d9dee6dc6f5 SHA256 7ced00a69bdb622c0c5354f14a08aa10d514eae6eadf13e45ebbb4f7be5320b3
 MD5 1adb8386dbec0d8ba8c78f553e175129 eselect-wxwidgets-0.5.ebuild 1282
 RMD160 1d826d86976f70803e9ead48aab789babe8a42d7 eselect-wxwidgets-0.5.ebuild 1282
 SHA256 7ced00a69bdb622c0c5354f14a08aa10d514eae6eadf13e45ebbb4f7be5320b3 eselect-wxwidgets-0.5.ebuild 1282
-MISC ChangeLog 1288 RMD160 0c6bb049f7b7e64417f3a8f6110fd8eafc7d55a2 SHA1 802401a2fedd3ac47e648e888f4699a4df6e861c SHA256 ee7efde8edce5529353addb0d94c419010215bab7cbdc2126fb870e3dfb8d1c2
-MD5 7b2d6a3f2fc295ba5ef0bae00dfabc30 ChangeLog 1288
-RMD160 0c6bb049f7b7e64417f3a8f6110fd8eafc7d55a2 ChangeLog 1288
-SHA256 ee7efde8edce5529353addb0d94c419010215bab7cbdc2126fb870e3dfb8d1c2 ChangeLog 1288
+MISC ChangeLog 1450 RMD160 3a3880778a6e7d25bb1dbef5fbe1faa4b2b6392e SHA1 c54cb055d2cc3376405a1797ddaabb8290d39c0c SHA256 44fac6d5c1fe5aa1dc60e472b8287c219488fc271e30c8dc7f8fac3c6c646d6d
+MD5 5ac128fc90a673da540f74f7ba02f413 ChangeLog 1450
+RMD160 3a3880778a6e7d25bb1dbef5fbe1faa4b2b6392e ChangeLog 1450
+SHA256 44fac6d5c1fe5aa1dc60e472b8287c219488fc271e30c8dc7f8fac3c6c646d6d ChangeLog 1450
 MISC metadata.xml 163 RMD160 f00b10701f46ce312c4e3056575ecdc7214b29b6 SHA1 8ca95681a55a91e5ed44e59ba5660d00bc9b5e0c SHA256 98e13cbe1b574224e90ac29486bdd82dfe1863029528af041f0a963cb01e8c74
 MD5 34a3c9a403196f569f63f0f608007f6e metadata.xml 163
 RMD160 f00b10701f46ce312c4e3056575ecdc7214b29b6 metadata.xml 163
@@ -31,7 +31,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHX1nXiqiDRvmkBmIRAhWIAKCpmzss8rRkd4HXyTbgcxbepVhpegCeLI2T
-3N2rWprIFwQ4oZ88pfxrcno=
-=VcPH
+iD8DBQFHX14WiqiDRvmkBmIRAnVnAKDoESCqL5q3YRRutIJtfFcOTzFjmQCeMyzS
+hr22sZP//9O/N2U8aelJvH4=
+=L4uF
 -----END PGP SIGNATURE-----
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