Direct error messages from the wrappers to stderr as suggested by

Martin von Gagern in bug #278037.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 144 insertions, 2 deletions

diff --git a/app-admin/eselect-wxwidgets/ChangeLog b/app-admin/eselect-wxwidgets/ChangeLog
index 4b21847b7573..e71bbca2a6cb 100644
--- a/app-admin/eselect-wxwidgets/ChangeLog
+++ b/app-admin/eselect-wxwidgets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/eselect-wxwidgets
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.37 2009/07/02 19:45:47 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.38 2009/07/19 02:56:08 dirtyepic Exp $
+
+*eselect-wxwidgets-1.1 (19 Jul 2009)
+
+  19 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> +files/wx-config-1.1,
+  +files/wxrc-1.1, +eselect-wxwidgets-1.1.ebuild:
+  Direct error messages from the wrappers to stderr as suggested by
+  Martin von Gagern in bug #278037.
 
   02 Jul 2009; Fabian Groffen <grobian@gentoo.org> files/wx-config-1,
   files/wxrc-1:
diff --git a/app-admin/eselect-wxwidgets/Manifest b/app-admin/eselect-wxwidgets/Manifest
index 74c6f063b97a..8e0ccdda9448 100644
--- a/app-admin/eselect-wxwidgets/Manifest
+++ b/app-admin/eselect-wxwidgets/Manifest
@@ -1,11 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wx-config-0.7 1097 RMD160 057fa949a0f97c16ff07c0448e26b92026b7f5b6 SHA1 eb73c40fbd5ed7b39d58f3f432ffeec8a7193437 SHA256 3d63c12d718d1da27fc09bfbe007e2915084fa6749321067ed2fbd6f71dbd01e
 AUX wx-config-1 930 RMD160 5afa22c3a603f73f363e6dcd1af4d235765c878f SHA1 ccbf6aab3605a7285c114d31d08f09d134de9388 SHA256 cff1b119086536c13b071c9d853758c1ff0004d3e0d2395feef64f3ab30425ce
+AUX wx-config-1.1 926 RMD160 296782bfcba316febe09a6c2551da9f28e6ef9b5 SHA1 e32f7d45e6b9b0385bcd26d25229ed2f68aa6491 SHA256 6c1518eefcc0d62747eafb518a9dd38282478281dbf34bf68048c9944b348415
 AUX wxrc-0.7 1113 RMD160 16b7af49f53cef79fda197579d6e451716e050e3 SHA1 c6f949e2500fc638290744e4232cde8c8fd29d62 SHA256 ce8cd476dfc9bbd64a5bf03d295649f966aceff0f19fd345bcda5aafe9d5b3a8
 AUX wxrc-1 946 RMD160 84d3d6f2a78bfb80cb0d1e5e1bb845d87849368b SHA1 94d51dc041c74c949100e2a1148de7e214d75ff9 SHA256 ea030437f5eb3f32d0563cd96b57c5c5457accab4d6fe20d59116cf3b82dddd8
+AUX wxrc-1.1 940 RMD160 1d7c46ec61c1398dc146e4439cd81e023ecbbb16 SHA1 1a1193343112c589a6ad60ab438d180a5f746a46 SHA256 c7fe4bf0ce503e7194ca01dc2f8a2097c53db7accf21edc2ce3349941f928fcb
 AUX wxwidgets.eselect-0.7 5005 RMD160 653f133a42f7733e4dc6bb113126e72530f0ad23 SHA1 807097283dd702c564c2a0b1647bf2b4ee050026 SHA256 9131a7a7716fd677369d42823cf6e03a4dea29416daeb83748f674360e694a3e
 AUX wxwidgets.eselect-0.8 5610 RMD160 b9386cb24523cdfd04b7e8e5d4870f3840e1fe66 SHA1 076b5cf0dc22ce158d63b9b52c18892163a5569e SHA256 612e5495e62aa9fce33e07b7e63e9278342c43db6cb8de8c6a84b06f7dbe8fa9
 AUX wxwin.m4 12433 RMD160 d8001d1e974bdecf44cb24427f22b64984d77535 SHA1 b252940ab25967ab711bc42d0a86df16452f605a SHA256 f143b92ea6e37d9c63417134b1487625799d94fe3095bb0d2d6448e54117afc0
 EBUILD eselect-wxwidgets-0.8.ebuild 1393 RMD160 2347abdddb129c050f2ac3fed47a0295e32c7dcb SHA1 a119c2adda2b902f9fd55e7ac9e69ee668d5a284 SHA256 aa1a735ec89aaf507fce7736d8742633a0fd9710cbac09e76ea5d0baea45377c
 EBUILD eselect-wxwidgets-1.0.ebuild 1342 RMD160 d5363032e15a0a77ea9b3cb2fc692603908c6e7a SHA1 3b4e8e91abfde2c19ce2e54234c3049af7e89345 SHA256 ab6078e64b3cbc66974a68dddff64936b188faafcbbfb8b01a4bc30a805f26d6
-MISC ChangeLog 5862 RMD160 b74d05574288343eedb34e1f86921cc062d942ee SHA1 839b140a96f914722efd5ca3cf2f9fea2a35f111 SHA256 6e960ab93fb0aa3e737a75048dd7026c591103e36f8c5bb87ec6bd239cbdb94d
+EBUILD eselect-wxwidgets-1.1.ebuild 1344 RMD160 2fbc471fcd987a22c2985437d7e724a2c04ccf08 SHA1 6ece72cce82e0508529f50bcd43e6e4c016cd6d4 SHA256 1c9dc7eb3ad6ea1cfeeef504d6fd68aed7a187961f51b1a1a55cf40cb5f5ad2d
+MISC ChangeLog 6127 RMD160 3cddf4f7880df31b29685abcbece8086d964eb3c SHA1 5a05500a14234a8b0a1be30d28f3bbe8965f2ae2 SHA256 ee6f6c071ef3fc120bced68686883103333647852724ff28d2d89f38013557c7
 MISC metadata.xml 163 RMD160 9a0dfd25dd8d78688f888da6873ba81236f6ed02 SHA1 a3f0779e6edd3b5eff0964b594051edd3de40978 SHA256 f80859bf7a6a4f9003e458590a617debc14e3e1766004a67b368b327f3afc535
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpii2gACgkQiqiDRvmkBmLJdQCgqVikRQ8dIDFE3UigrGSHOPah
+CugAniLriyfO6pJS1HoRBv6AyZhVVwCz
+=8yqT
+-----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.1.ebuild b/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.1.ebuild
new file mode 100644
index 000000000000..63bb0f02d4c6
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.1.ebuild,v 1.1 2009/07/19 02:56:08 dirtyepic Exp $
+
+DESCRIPTION="Eselect module and wrappers for wxWidgets"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="!<=x11-libs/wxGTK-2.6.4.0-r2"
+RDEPEND="app-admin/eselect"
+
+WXWRAP_VER=1.1
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${FILESDIR}"/wxwidgets.eselect-0.8 wxwidgets.eselect \
+		|| die "Failed installing module"
+
+	insinto /usr/share/aclocal
+	doins "${FILESDIR}"/wxwin.m4
+
+	newbin "${FILESDIR}"/wx-config-${WXWRAP_VER} wx-config
+	newbin "${FILESDIR}"/wxrc-${WXWRAP_VER} wxrc
+
+	keepdir /var/lib/wxwidgets
+	keepdir /usr/share/bakefile/presets
+}
+
+pkg_postinst() {
+	if [[ ! -e ${ROOT}/var/lib/wxwidgets/current ]]; then
+		echo 'WXCONFIG="none"' > "${ROOT}"/var/lib/wxwidgets/current
+	fi
+
+	echo
+	elog "By default the system wxWidgets profile is set to \"none\"."
+	elog
+	elog "It is unnecessary to change this unless you are doing development work"
+	elog "with wxGTK outside of portage.  The package manager ignores the profile"
+	elog "setting altogether."
+	echo
+}
diff --git a/app-admin/eselect-wxwidgets/files/wx-config-1.1 b/app-admin/eselect-wxwidgets/files/wx-config-1.1
new file mode 100755
index 000000000000..03f20f3bad7f
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/files/wx-config-1.1
@@ -0,0 +1,38 @@
+#!/bin/sh -
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wx-config-1.1,v 1.1 2009/07/19 02:56:08 dirtyepic Exp $
+#
+# /usr/bin/wx-config
+#
+#  a lame wx-config wrapper (bugs to wxwidgets@gentoo.org)
+
+_wxerror() {
+	cat >&2 <<- EOF
+		An error occurred while calling wx-config:
+		
+		${1}
+
+		Please use \`eselect wxwidgets\` to select an available profile and try again.
+	EOF
+	exit 1
+}
+
+if [ -n "${WX_ECLASS_CONFIG}" ]; then
+	${WX_ECLASS_CONFIG} "$@"
+	exit 0
+else
+	if [ -e /var/lib/wxwidgets/current ]; then
+		source /var/lib/wxwidgets/current
+	else
+		_wxerror "Cannot find the wxWidgets profile configuration ( /var/lib/wxwidgets/current )"
+	fi
+
+	[ -z "${WXCONFIG}" -o "${WXCONFIG}" == none ] && _wxerror "No profile currently selected"
+
+	if [ -x /usr/lib/wx/config/${WXCONFIG} ]; then
+	   /usr/lib/wx/config/${WXCONFIG} "$@"
+	else
+		_wxerror "Cannot find wxWidgets profile ( ${WXCONFIG} )"
+	fi
+	exit 0
+fi
+
diff --git a/app-admin/eselect-wxwidgets/files/wxrc-1.1 b/app-admin/eselect-wxwidgets/files/wxrc-1.1
new file mode 100755
index 000000000000..9cca21e3d5ca
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/files/wxrc-1.1
@@ -0,0 +1,38 @@
+#!/bin/sh -
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wxrc-1.1,v 1.1 2009/07/19 02:56:08 dirtyepic Exp $
+#
+# /usr/bin/wxrc
+#
+#  a lame wxrc wrapper (bugs to wxwidgets@gentoo.org)
+
+_wxerror() {
+	cat >&2 <<- EOF
+		An error occurred while calling wxrc:
+
+		${1}
+
+		Please use \`eselect wxwidgets\` to select an available profile and try again.
+	EOF
+	exit 1
+}
+
+if [ -n "${WX_ECLASS_CONFIG}" ]; then
+	$(${WX_ECLASS_CONFIG} --utility=wxrc) "$@"
+	exit 0
+else
+	if [ -e /var/lib/wxwidgets/current ]; then
+		source /var/lib/wxwidgets/current
+	else
+		_wxerror "Cannot find the wxWidgets profile configuration ( /var/lib/wxwidgets/current )"
+	fi
+
+	[ -z "${WXCONFIG}" -o "${WXCONFIG}" == none ] && _wxerror "No profile currently selected"
+
+	if [ -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
+