Version bump. Debashify wx-config and wxrc wrappers for compatibility with

cmake (bug #274675).
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 138 insertions, 2 deletions

diff --git a/app-admin/eselect-wxwidgets/ChangeLog b/app-admin/eselect-wxwidgets/ChangeLog
index 07442b72824b..6341cbed1138 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.35 2009/01/22 12:49:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.36 2009/07/01 07:16:25 dirtyepic Exp $
+
+*eselect-wxwidgets-1.0 (01 Jul 2009)
+
+  01 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> +files/wx-config-1,
+  +files/wxrc-1, +eselect-wxwidgets-1.0.ebuild:
+  Version bump. Debashify wx-config and wxrc wrappers for compatibility with
+  cmake (bug #274675).
 
   22 Jan 2009; Raúl Porcel <armin76@gentoo.org>
   eselect-wxwidgets-0.8.ebuild:
diff --git a/app-admin/eselect-wxwidgets/Manifest b/app-admin/eselect-wxwidgets/Manifest
index 0fe37ff1fbde..7ed06f18ca20 100644
--- a/app-admin/eselect-wxwidgets/Manifest
+++ b/app-admin/eselect-wxwidgets/Manifest
@@ -1,8 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wx-config-0.7 1097 RMD160 057fa949a0f97c16ff07c0448e26b92026b7f5b6 SHA1 eb73c40fbd5ed7b39d58f3f432ffeec8a7193437 SHA256 3d63c12d718d1da27fc09bfbe007e2915084fa6749321067ed2fbd6f71dbd01e
+AUX wx-config-1 809 RMD160 e5e7ae19b0a24c43d93d740b261d49a5aa742287 SHA1 1e2c0fc45cc83b747d1ea3707583f39ebd55b48a SHA256 c2ca9828d44dd3967b9f02c7f3ca652faf107f3192a9de356622a3ba3bbe4282
 AUX wxrc-0.7 1113 RMD160 16b7af49f53cef79fda197579d6e451716e050e3 SHA1 c6f949e2500fc638290744e4232cde8c8fd29d62 SHA256 ce8cd476dfc9bbd64a5bf03d295649f966aceff0f19fd345bcda5aafe9d5b3a8
+AUX wxrc-1 830 RMD160 c923a6425e4dd60a1d1f8b8673cb74972da29188 SHA1 05eeabd1ae43b21ac4870da61abbb566090edc62 SHA256 4e03561727e9202a854806564f2bfb4724cb8de2322c5fd5fac54131b0acd263
 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
-MISC ChangeLog 5458 RMD160 58b0dcc4a6f7eb9b9923585bccb8ae7bbcac30bc SHA1 8e4c3ed8994a4d490d55b27237f4a672e9b2cf6b SHA256 5abcdabbf15be0841cc8f53516e667b65a03214afb72f8b342660a2f6ce16c61
+EBUILD eselect-wxwidgets-1.0.ebuild 1342 RMD160 d5363032e15a0a77ea9b3cb2fc692603908c6e7a SHA1 3b4e8e91abfde2c19ce2e54234c3049af7e89345 SHA256 ab6078e64b3cbc66974a68dddff64936b188faafcbbfb8b01a4bc30a805f26d6
+MISC ChangeLog 5715 RMD160 061d912546bba3c0ee81b9994e8f6ad3ded3afa5 SHA1 4bb09d51ed9f1fcdbb73c60e9c96f166d2b7eecc SHA256 05a2764a047e1224fb71f5dfe5af99866b146e5591442b6e895a7b251e1b490a
 MISC metadata.xml 163 RMD160 9a0dfd25dd8d78688f888da6873ba81236f6ed02 SHA1 a3f0779e6edd3b5eff0964b594051edd3de40978 SHA256 f80859bf7a6a4f9003e458590a617debc14e3e1766004a67b368b327f3afc535
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEARECAAYFAkpLDV0ACgkQiqiDRvmkBmJa3QCfU3nIg+FoIvNeuf/4keJ8dINi
+UbYAniSTWDA9zOf5KeY4IYqgle0CZnXI
+=bz33
+-----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.0.ebuild b/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.0.ebuild
new file mode 100644
index 000000000000..1a7fde538948
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.0.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.0.ebuild,v 1.1 2009/07/01 07:16:25 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
+
+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 b/app-admin/eselect-wxwidgets/files/wx-config-1
new file mode 100755
index 000000000000..559434bc2c77
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/files/wx-config-1
@@ -0,0 +1,35 @@
+#!/bin/sh -
+#
+# /usr/bin/wx-config
+#
+#  a lame wx-config wrapper (bugs to wxwidgets@gentoo.org)
+
+_wxerror() {
+	echo "An error occurred while calling wx-config:"
+	echo
+	echo "    ${1}"
+	echo
+	echo "Please use \`eselect wxwidgets\` to select an available profile and try again."
+	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 b/app-admin/eselect-wxwidgets/files/wxrc-1
new file mode 100755
index 000000000000..cf755dad178e
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/files/wxrc-1
@@ -0,0 +1,35 @@
+#!/bin/sh -
+#
+# /usr/bin/wxrc
+#
+#  a lame wxrc wrapper (bugs to wxwidgets@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
+}
+
+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
+