Fix bashisms in wrapper scripts. Bug #301778 by Anthony Parsons.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 149 insertions, 3 deletions

diff --git a/app-admin/eselect-wxwidgets/ChangeLog b/app-admin/eselect-wxwidgets/ChangeLog
index 597f4459e122..20d32e087dd0 100644
--- a/app-admin/eselect-wxwidgets/ChangeLog
+++ b/app-admin/eselect-wxwidgets/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2009/11/13 01:48:24 dirtyepic Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.45 2010/01/24 21:45:06 dirtyepic Exp $
+
+*eselect-wxwidgets-1.3 (24 Jan 2010)
+
+  24 Jan 2010; Ryan Hill <dirtyepic@gentoo.org> +files/wx-config-1.3,
+  +files/wxrc-1.3, +eselect-wxwidgets-1.3.ebuild:
+  Fix bashisms in wrapper scripts. Bug #301778 by Anthony Parsons.
 
 *eselect-wxwidgets-1.2 (13 Nov 2009)
 
diff --git a/app-admin/eselect-wxwidgets/Manifest b/app-admin/eselect-wxwidgets/Manifest
index 8bca3f58e47a..a97da1dda3c7 100644
--- a/app-admin/eselect-wxwidgets/Manifest
+++ b/app-admin/eselect-wxwidgets/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wx-config-1.1 926 RMD160 296782bfcba316febe09a6c2551da9f28e6ef9b5 SHA1 e32f7d45e6b9b0385bcd26d25229ed2f68aa6491 SHA256 6c1518eefcc0d62747eafb518a9dd38282478281dbf34bf68048c9944b348415
+AUX wx-config-1.3 920 RMD160 cbe9e5ce2b8bb0694895c91c3ce4fb1d0229c9f1 SHA1 8682abbbbe60705f0b339d825c40da94cf522fc2 SHA256 735c0253b0ccc004854b489db17be404fbfb84dbad8a44aa4edc4d4fddb33e04
 AUX wxrc-1.1 940 RMD160 1d7c46ec61c1398dc146e4439cd81e023ecbbb16 SHA1 1a1193343112c589a6ad60ab438d180a5f746a46 SHA256 c7fe4bf0ce503e7194ca01dc2f8a2097c53db7accf21edc2ce3349941f928fcb
+AUX wxrc-1.3 934 RMD160 ef7c9e3f357b2732e437a2462696027d9ab0e4e6 SHA1 80026aff2fded232bbca2a4c2fce506b8fd8d135 SHA256 89a8366e8e9dc603d4a96fdae807c852259c696f4e802f2e5d833929bf4053dc
 AUX wxwidgets.eselect-0.8 5610 RMD160 b9386cb24523cdfd04b7e8e5d4870f3840e1fe66 SHA1 076b5cf0dc22ce158d63b9b52c18892163a5569e SHA256 612e5495e62aa9fce33e07b7e63e9278342c43db6cb8de8c6a84b06f7dbe8fa9
 AUX wxwin.m4 12433 RMD160 d8001d1e974bdecf44cb24427f22b64984d77535 SHA1 b252940ab25967ab711bc42d0a86df16452f605a SHA256 f143b92ea6e37d9c63417134b1487625799d94fe3095bb0d2d6448e54117afc0
 DIST wxwidgets.eselect-1.2.bz2 2235 RMD160 7136685a0992007bef6bcd69d8a7fabaa169083e SHA1 8ce32f34681c2011463afc9288350c15f7a01913 SHA256 403b94d1f8d50e0a4c0bc3656643cf040e90667b77f4c6f65049db39ed139396
 EBUILD eselect-wxwidgets-1.1.ebuild 1331 RMD160 63d6b9278df830dbdc071bd186c6c09dfa1f46a5 SHA1 1ece460d8e55ec9da35e7fdd82aef65a6f25dc7e SHA256 9516369f2d0c6d7902d402613a90a7c973b606b1069552f9c77f19cc9e4fd34e
 EBUILD eselect-wxwidgets-1.2.ebuild 1551 RMD160 51b94096e9f47b55fcb8affb83d3215151eeba0c SHA1 d7c59916b94c11910940ca1ff77a3883d94cf125 SHA256 4a16c8513478865b19d446155c9c5756619c1d27c8d35b70296227da40be1ad7
-MISC ChangeLog 7069 RMD160 1572e7c7371f250f47c4688b7b762ef8e67f1c90 SHA1 72ceb359e75f3c3034946a0c25ae99fcb9b978c5 SHA256 0fe31ecf33e7fe5bad513d19bb69791f2d1ba36b874a8ac0fcda5d7478a66970
+EBUILD eselect-wxwidgets-1.3.ebuild 1551 RMD160 1a31cfdf5eef61d67d679f55c978fa59f2cea4ae SHA1 74d745615f022b4a351b4e871f7c224cfd99633d SHA256 3e8c6b280ab8e9b85a1adbea5539941d895ace9a971657e03c703152f4a3a58c
+MISC ChangeLog 7295 RMD160 3cbde292401dceca7d7b2af5dfaf2be9844a8e4a SHA1 79180f1327dda5b5540017af84ffec9856d41368 SHA256 507a1fb045b111cd9c1ffe4b28ccbed740f87790510e88e3cd4dd6eeea0597e0
 MISC metadata.xml 163 RMD160 9a0dfd25dd8d78688f888da6873ba81236f6ed02 SHA1 a3f0779e6edd3b5eff0964b594051edd3de40978 SHA256 f80859bf7a6a4f9003e458590a617debc14e3e1766004a67b368b327f3afc535
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktcv+UACgkQiqiDRvmkBmJnIwCg7baHg2lakj4fH/AGnkSHkL2K
+TUYAn2oOunePbdKDUXzQ+9spggbAd+CF
+=LCuL
+-----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.3.ebuild b/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.3.ebuild
new file mode 100644
index 000000000000..a3be2d3aea58
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 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.3.ebuild,v 1.1 2010/01/24 21:45:06 dirtyepic Exp $
+
+WXWRAP_VER=1.3
+WXESELECT_VER=1.2
+
+DESCRIPTION="Eselect module and wrappers for wxWidgets"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="mirror://gentoo/wxwidgets.eselect-${WXESELECT_VER}.bz2"
+
+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-1.2.3"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${S}"/wxwidgets.eselect-${WXESELECT_VER} wxwidgets.eselect \
+		|| die "Failed installing module"
+
+	insinto /usr/share/aclocal
+	doins "${FILESDIR}"/wxwin.m4 || die "Failed installing m4"
+
+	newbin "${FILESDIR}"/wx-config-${WXWRAP_VER} wx-config \
+		|| die "Failed installing wx-config"
+	newbin "${FILESDIR}"/wxrc-${WXWRAP_VER} wxrc \
+		|| die "Failed installing 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.3 b/app-admin/eselect-wxwidgets/files/wx-config-1.3
new file mode 100755
index 000000000000..e61cdcac5608
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/files/wx-config-1.3
@@ -0,0 +1,38 @@
+#!/bin/sh -
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wx-config-1.3,v 1.1 2010/01/24 21:45: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
+		. /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.3 b/app-admin/eselect-wxwidgets/files/wxrc-1.3
new file mode 100755
index 000000000000..7b55f43f0408
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/files/wxrc-1.3
@@ -0,0 +1,38 @@
+#!/bin/sh -
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wxrc-1.3,v 1.1 2010/01/24 21:45: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
+		. /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
+