Remove old.

Package-Manager: portage-2.2.0_alpha18/cvs/Linux x86_64

9 files changed, 18 insertions, 846 deletions

diff --git a/app-admin/eselect-wxwidgets/ChangeLog b/app-admin/eselect-wxwidgets/ChangeLog
index d71a4102cafc..2130e332bb33 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.56 2011/01/12 13:40:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.57 2011/01/22 07:13:19 dirtyepic Exp $
+
+  22 Jan 2011; Ryan Hill <dirtyepic@gentoo.org> -files/wxwidgets.eselect-0.8,
+  -files/wx-config-1.1, -files/wxrc-1.1, -eselect-wxwidgets-1.1.ebuild,
+  -eselect-wxwidgets-1.2.ebuild, -eselect-wxwidgets-1.3.ebuild,
+  -files/wxwin.m4:
+  Remove old.
 
   12 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
   eselect-wxwidgets-1.4.ebuild:
diff --git a/app-admin/eselect-wxwidgets/Manifest b/app-admin/eselect-wxwidgets/Manifest
index 38d9bd9aefe1..7e34e9469bdb 100644
--- a/app-admin/eselect-wxwidgets/Manifest
+++ b/app-admin/eselect-wxwidgets/Manifest
@@ -1,15 +1,17 @@
-AUX wx-config-1.1 926 RMD160 296782bfcba316febe09a6c2551da9f28e6ef9b5 SHA1 e32f7d45e6b9b0385bcd26d25229ed2f68aa6491 SHA256 6c1518eefcc0d62747eafb518a9dd38282478281dbf34bf68048c9944b348415
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 AUX wxwin.m4-2.9 40702 RMD160 c008eb98aaacb63ee6fd41f8af378ac3ca85fba4 SHA1 65e86e11d21ae376be91b05296e8a1384512b692 SHA256 fec6eabf456c24e5920e561b539d1e06036125a3a4a76ba9ac7208c586c95710
-DIST wxwidgets.eselect-1.2.bz2 2235 RMD160 7136685a0992007bef6bcd69d8a7fabaa169083e SHA1 8ce32f34681c2011463afc9288350c15f7a01913 SHA256 403b94d1f8d50e0a4c0bc3656643cf040e90667b77f4c6f65049db39ed139396
 DIST wxwidgets.eselect-1.4.bz2 2375 RMD160 5aa665b2512342a83e9f4ea8afc010afa7049e05 SHA1 3d192f3f91b1f1a842077696d0f979471897dbea SHA256 630d2a79e3c1a124a124a81db1213e1c036a5c49a5bf06a328b164d997725386
-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
-EBUILD eselect-wxwidgets-1.3.ebuild 1537 RMD160 adf0d3d6c2a80503e1dc7651feaa9e5db63d6ca6 SHA1 60baf10aa55a6898a53f77e37c901ee8828eb135 SHA256 7b6fb8e52696dd77c84fe7d2fd942fe15ee3eecc33954c3aaeff1d672b694cea
 EBUILD eselect-wxwidgets-1.4.ebuild 1556 RMD160 874401728ac66871362be897e1cc89dedb4c0aa3 SHA1 7459fb2e20b3b9c0e6081edb1c8ef99f0cde8aa3 SHA256 4ffe31e85f3306d558b9bce9869c80825600779f330a3db1632ac2fedecaf964
-MISC ChangeLog 8684 RMD160 939dd673db90961ff137ff6d81485228ead49746 SHA1 e9a7437081c709085fec9fb49f7d7e502a0abff9 SHA256 dae6235b72cbbf1da1093844408072b1f77cc1e2688c92536f609f6a737e1e1a
+MISC ChangeLog 8931 RMD160 1ded6edbf532df79d452023e30345fb72a0e95e4 SHA1 50e6caa7020a444a131a04a56ef591182a035dea SHA256 60a63f440271f35fea849852236b128de46f9e7575203f565bfe8896257e7a55
 MISC metadata.xml 163 RMD160 9a0dfd25dd8d78688f888da6873ba81236f6ed02 SHA1 a3f0779e6edd3b5eff0964b594051edd3de40978 SHA256 f80859bf7a6a4f9003e458590a617debc14e3e1766004a67b368b327f3afc535
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk06hOUACgkQiqiDRvmkBmIrbQCfaI+LbIh/KRkxFkg+IhuMJ7oZ
+1rQAnROZjv/U5BtgYgv6xC7IbFrU+6Oj
+=d6Eb
+-----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
deleted file mode 100644
index 9ebf12077538..000000000000
--- a/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.6 2009/10/31 14:44:09 ranger 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/eselect-wxwidgets-1.2.ebuild b/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.2.ebuild
deleted file mode 100644
index 8307ed05a8dc..000000000000
--- a/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.2.ebuild,v 1.2 2009/11/13 06:01:32 mr_bones_ Exp $
-
-WXWRAP_VER=1.1
-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/eselect-wxwidgets-1.3.ebuild b/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.3.ebuild
deleted file mode 100644
index 3b72457a5231..000000000000
--- a/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.5 2010/07/27 01:46:52 jer 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.1 b/app-admin/eselect-wxwidgets/files/wx-config-1.1
deleted file mode 100755
index 03f20f3bad7f..000000000000
--- a/app-admin/eselect-wxwidgets/files/wx-config-1.1
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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
deleted file mode 100755
index 9cca21e3d5ca..000000000000
--- a/app-admin/eselect-wxwidgets/files/wxrc-1.1
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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
-
diff --git a/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.8 b/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.8
deleted file mode 100644
index 2be0a6500a2a..000000000000
--- a/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.8
+++ /dev/null
@@ -1,246 +0,0 @@
-# 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.8,v 1.2 2008/02/08 01:08:07 dirtyepic Exp $
-
-inherit config
-
-DESCRIPTION="Manage the system default wxWidgets profile."
-MAINTAINER="dirtyepic@gentoo.org"
-VERSION=0.8
-
-WXCONFFILE=/var/lib/wxwidgets/current
-WXCONFDIR=/usr/lib/wx/config
-
-find_targets() {
-	local conf
-	for conf in ${WXCONFDIR}/*; do
-		[[ -f ${conf} && -x ${conf} ]] && basename ${conf}
-	done
-}
-
-set_config() {
-	local target="${1}" targets
-
-	# selected by number
-	if is_number "${target}"; then
-		targets=( $(find_targets) )
-		[[ ${1} -ge 1 && ${1} -le ${#targets[@]} ]] \
-			|| die -q "Number out of range: ${1}"
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-
-	if [[ ${target} == "none" ]]; then
-		# none is a special case
-		:
-	else
-		[[ ! -f ${WXCONFDIR}/${target} ]] && \
-			die -q "\"${1}\" doesn't appear to be a valid profile name"
-	fi
-
-	echo
-	echo "Setting wxWidgets profile to ${target}"
-	echo
-	store_config ${WXCONFFILE} WXCONFIG ${target}
-
-	if [[ ! ${target} == "none" ]]; then
-		# expose the slot number of the selected target for various uses
-		local wxslot
-		OIFS=${IFS}
-		IFS=-
-		set -- ${target}
-		wxslot=${4}
-		IFS=${OIFS}
-	fi
-
-	# symlink bakefile presets to current slot (Bug #209150)
-	local f
-	pushd /usr/share/bakefile/presets/ &> /dev/null
-	for f in .bkl _unix.bkl _win32.bkl; do
-		if [[ -e wx${f} || -L wx${f} ]]; then
-			rm -f wx${f} || die -q "Error removing wx${f}"
-		fi
-		if [[ ! ${target} == "none" ]]; then
-			ln -sf wx${wxslot/./}${f} wx${f} \
-				|| die -q "Error symlinking wx${wxslot/./}${f}"
-		fi
-	done
-	popd &> /dev/null
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the currently selected profile"
-}
-
-do_show() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
-
-	write_list_start "Current wxWidgets profile:"
-	if [[ -e ${WXCONFFILE} ]]; then
-		write_kv_list_entry "$(load_config ${WXCONFFILE} WXCONFIG)" ""
-	else
-		write_kv_list_entry "(none)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available profiles"
-}
-
-do_list() {
-	local i targets
-	# targets is an array containing names of available configs
-	targets=( $(find_targets) )
-
-	if [[ -n ${targets[@]} ]]; then
-		for (( i = 0; i < ${#targets[@]}; i++ )); do
-			if [[ -e ${WXCONFFILE} ]]; then
-				# highlight current version
-				[[ ${targets[${i}]} == $(load_config ${WXCONFFILE} WXCONFIG) ]] \
-					&& targets[${i}]="$(highlight ${targets[${i}]}) *"
-			fi
-		done
-		write_list_start "Available wxWidgets profiles:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set the system wxWidgets profile"
-}
-
-describe_set_options() {
-	echo "target: profile name or number (gotten from 'list')"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	[[ ! ${#@} -eq 1 ]] \
-		&& die -q "You must specify a profile name or number"
-
-	[[ -w "${ROOT}"/var/lib ]] \
-		|| die -q "You need proper write permissions.  Please run as root."
-
-	set_config "${1}"
-}
-
-describe_update() {
-	echo "Check current profile and update it if invalid (internal use only)"
-}
-
-do_update() {
-	[[ ! -e ${WXCONFFILE} ]] && do_set none
-
-	currconf=$(load_config ${WXCONFFILE} WXCONFIG)
-
-	# if current config is "none" leave it alone
-	[[ ${currconf} == none ]] && return 0
-
-	# if current config is valid leave it alone
-	[[ -e ${WXCONFDIR}/${currconf} ]] && return 0
-
-	# split the config string into components
-	OIFS=${IFS}
-	IFS=-
-	set -- ${currconf}
-	IFS=${OIFS}
-
-	declare -a wxtoolkit wxchar wxdebug wxver
-
-	# put selected components into the first element of the array
-	wxtoolkit=(${1})
-	wxchar=(${2})
-	wxdebug=(${3})
-	wxver=(${4})
-
-	# put available components into next element(s) of array
-	local component toolkit char debug ver element opt
-
-	for component in toolkit char debug ver; do
-		element=1
-		case ${component} in
-			toolkit)
-				for opt in base gtk2; do
-					if [[ ${opt} == ${wxtoolkit[0]} ]]; then
-						continue
-					else
-						wxtoolkit[${element}]=${opt}
-						(( element++ ))
-					fi
-				done
-				;;
-
-			char)
-				for opt in ansi unicode; do
-					if [[ ${opt} == ${wxchar[0]} ]]; then
-						continue
-					else
-						wxchar[${element}]=${opt}
-						(( element++ ))
-					fi
-				done
-				;;
-
-			debug)
-				for opt in release debug; do
-					if [[ ${opt} == ${wxdebug[0]} ]]; then
-						continue
-					else
-						wxdebug[${element}]=${opt}
-						(( element++ ))
-					fi
-				done
-				;;
-
-			ver)
-				for opt in 2.10 2.8 2.6; do
-					if [[ ${opt} == ${wxver[0]} ]]; then
-						continue
-					else
-						wxver[${element}]=${opt}
-						(( element++ ))
-					fi
-				done
-				;;
-		esac
-	done
-
-	# Now we iterate through the installed wx-configs and find the closest match
-	# ( debug > char > toolkit > ver )
-
-	local d c t v checkconf foundconf
-
-	for (( v = 0 ; v < ${#wxver[@]} ; v++ )); do
-		for (( t = 0 ; t < ${#wxtoolkit[@]} ; t++ )); do
-			for (( c = 0 ; c < ${#wxchar[@]} ; c++ )); do
-				for (( d = 0 ; d < ${#wxdebug[@]} ; d++ )); do
-					checkconf="${wxtoolkit[$t]}-${wxchar[$c]}-${wxdebug[$d]}-${wxver[$v]}"
-					[[ -e ${WXCONFDIR}/${checkconf} ]] || continue
-					foundconf=${checkconf}
-					break 4
-				done
-			done
-		done
-	done
-
-	[[ -z ${foundconf} ]] && foundconf="none"
-
-	echo
-	write_warning_msg "Your currently selected wxWidgets profile:	( ${currconf} )"
-	write_warning_msg "is no longer available."
-	write_warning_msg
-	write_warning_msg "The closest matching profile:	( ${foundconf} )"
-	write_warning_msg "will be activated in its place."
-
-	do_set ${foundconf}
-}
diff --git a/app-admin/eselect-wxwidgets/files/wxwin.m4 b/app-admin/eselect-wxwidgets/files/wxwin.m4
deleted file mode 100644
index 52c55e2e6e6b..000000000000
--- a/app-admin/eselect-wxwidgets/files/wxwin.m4
+++ /dev/null
@@ -1,366 +0,0 @@
-dnl ---------------------------------------------------------------------------
-dnl Macros for wxWidgets detection. Typically used in configure.in as:
-dnl
-dnl     AC_ARG_ENABLE(...)
-dnl     AC_ARG_WITH(...)
-dnl        ...
-dnl     AM_OPTIONS_WXCONFIG
-dnl        ...
-dnl        ...
-dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)
-dnl     if test "$wxWin" != 1; then
-dnl        AC_MSG_ERROR([
-dnl                wxWidgets must be installed on your system
-dnl                but wx-config script couldn't be found.
-dnl
-dnl                Please check that wx-config is in path, the directory
-dnl                where wxWidgets libraries are installed (returned by
-dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
-dnl                equivalent variable and wxWidgets version is 2.3.4 or above.
-dnl        ])
-dnl     fi
-dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-dnl
-dnl     LIBS="$LIBS $WX_LIBS"
-dnl ---------------------------------------------------------------------------
-
-dnl ---------------------------------------------------------------------------
-dnl AM_OPTIONS_WXCONFIG
-dnl
-dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
-dnl --wx-config command line options
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AM_OPTIONS_WXCONFIG],
-[
-    AC_ARG_WITH(wxdir,
-                [  --with-wxdir=PATH       Use uninstalled version of wxWidgets in PATH],
-                [ wx_config_name="$withval/wx-config"
-                  wx_config_args="--inplace"])
-    AC_ARG_WITH(wx-config,
-                [  --with-wx-config=CONFIG wx-config script to use (optional)],
-                wx_config_name="$withval" )
-    AC_ARG_WITH(wx-prefix,
-                [  --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
-                wx_config_prefix="$withval", wx_config_prefix="")
-    AC_ARG_WITH(wx-exec-prefix,
-                [  --with-wx-exec-prefix=PREFIX
-                          Exec prefix where wxWidgets is installed (optional)],
-                wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
-])
-
-dnl Helper macro for checking if wx version is at least $1.$2.$3, set's
-dnl wx_ver_ok=yes if it is:
-AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
-[
-    wx_ver_ok=""
-    if test "x$WX_VERSION" != x ; then
-      if test $wx_config_major_version -gt $1; then
-        wx_ver_ok=yes
-      else
-        if test $wx_config_major_version -eq $1; then
-           if test $wx_config_minor_version -gt $2; then
-              wx_ver_ok=yes
-           else
-              if test $wx_config_minor_version -eq $2; then
-                 if test $wx_config_micro_version -ge $3; then
-                    wx_ver_ok=yes
-                 fi
-              fi
-           fi
-        fi
-      fi
-    fi
-])
-
-dnl ---------------------------------------------------------------------------
-dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
-dnl                  [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
-dnl
-dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
-dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
-dnl environment variable to override the default name of the wx-config script
-dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
-dnl case the macro won't even waste time on tests for its existence.
-dnl
-dnl Optional WX-LIBS argument contains comma- or space-separated list of
-dnl wxWidgets libraries to link against (it may include contrib libraries). If
-dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to
-dnl link with all of the core wxWidgets libraries.
-dnl
-dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
-dnl invocation command in present. It can be used to fine-tune lookup of
-dnl best wxWidgets build available.
-dnl
-dnl Example use:
-dnl   AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], [html,core,net]
-dnl                    [--unicode --debug])
-dnl ---------------------------------------------------------------------------
-
-dnl
-dnl Get the cflags and libraries from the wx-config script
-dnl
-AC_DEFUN([AM_PATH_WXCONFIG],
-[
-  dnl do we have wx-config name: it can be wx-config or wxd-config or ...
-  if test x${WX_CONFIG_NAME+set} != xset ; then
-     WX_CONFIG_NAME=wx-config
-  fi
-
-  if test "x$wx_config_name" != x ; then
-     WX_CONFIG_NAME="$wx_config_name"
-  fi
-
-  dnl deal with optional prefixes
-  if test x$wx_config_exec_prefix != x ; then
-     wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
-     WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
-  fi
-  if test x$wx_config_prefix != x ; then
-     wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
-     WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
-  fi
-  if test "$cross_compiling" = "yes"; then
-     wx_config_args="$wx_config_args --host=$host_alias"
-  fi
-
-  dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
-  if test -x "$WX_CONFIG_NAME" ; then
-     AC_MSG_CHECKING(for wx-config)
-     WX_CONFIG_PATH="$WX_CONFIG_NAME"
-     AC_MSG_RESULT($WX_CONFIG_PATH)
-  else
-     AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
-  fi
-
-  if test "$WX_CONFIG_PATH" != "no" ; then
-    WX_VERSION=""
-
-    min_wx_version=ifelse([$1], ,2.2.1,$1)
-    if test -z "$5" ; then
-      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
-    else
-      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
-    fi
-
-    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"
-
-    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
-    wx_config_major_version=`echo $WX_VERSION | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    wx_config_minor_version=`echo $WX_VERSION | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    wx_config_micro_version=`echo $WX_VERSION | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    wx_requested_major_version=`echo $min_wx_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    wx_requested_minor_version=`echo $min_wx_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    wx_requested_micro_version=`echo $min_wx_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
-                              [$wx_requested_minor_version],
-                              [$wx_requested_micro_version])
-
-    if test -n "$wx_ver_ok"; then
-
-      AC_MSG_RESULT(yes (version $WX_VERSION))
-      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
-
-      dnl is this even still appropriate?  --static is a real option now
-      dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
-      dnl what the user actually wants, making this redundant at best.
-      dnl For now keep it in case anyone actually used it in the past.
-      AC_MSG_CHECKING([for wxWidgets static library])
-      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
-      if test "x$WX_LIBS_STATIC" = "x"; then
-        AC_MSG_RESULT(no)
-      else
-        AC_MSG_RESULT(yes)
-      fi
-
-      dnl starting with version 2.2.6 wx-config has --cppflags argument
-      wx_has_cppflags=""
-      if test $wx_config_major_version -gt 2; then
-        wx_has_cppflags=yes
-      else
-        if test $wx_config_major_version -eq 2; then
-           if test $wx_config_minor_version -gt 2; then
-              wx_has_cppflags=yes
-           else
-              if test $wx_config_minor_version -eq 2; then
-                 if test $wx_config_micro_version -ge 6; then
-                    wx_has_cppflags=yes
-                 fi
-              fi
-           fi
-        fi
-      fi
-
-      dnl starting with version 2.7.0 wx-config has --rescomp option
-      wx_has_rescomp=""
-      if test $wx_config_major_version -gt 2; then
-        wx_has_rescomp=yes
-      else
-        if test $wx_config_major_version -eq 2; then
-           if test $wx_config_minor_version -ge 7; then
-              wx_has_rescomp=yes
-           fi
-        fi
-      fi
-      if test "x$wx_has_rescomp" = x ; then
-         dnl cannot give any useful info for resource compiler
-         WX_RESCOMP=
-      else
-         WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
-      fi
-
-      if test "x$wx_has_cppflags" = x ; then
-         dnl no choice but to define all flags like CFLAGS
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
-         WX_CPPFLAGS=$WX_CFLAGS
-         WX_CXXFLAGS=$WX_CFLAGS
-
-         WX_CFLAGS_ONLY=$WX_CFLAGS
-         WX_CXXFLAGS_ONLY=$WX_CFLAGS
-      else
-         dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
-         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
-         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
-
-         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
-         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
-      fi
-
-      ifelse([$2], , :, [$2])
-
-    else
-
-       if test "x$WX_VERSION" = x; then
-          dnl no wx-config at all
-          AC_MSG_RESULT(no)
-       else
-          AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
-       fi
-
-       WX_CFLAGS=""
-       WX_CPPFLAGS=""
-       WX_CXXFLAGS=""
-       WX_LIBS=""
-       WX_LIBS_STATIC=""
-       WX_RESCOMP=""
-       ifelse([$3], , :, [$3])
-
-    fi
-  else
-
-    WX_CFLAGS=""
-    WX_CPPFLAGS=""
-    WX_CXXFLAGS=""
-    WX_LIBS=""
-    WX_LIBS_STATIC=""
-    WX_RESCOMP=""
-
-    ifelse([$3], , :, [$3])
-
-  fi
-
-  AC_SUBST(WX_CPPFLAGS)
-  AC_SUBST(WX_CFLAGS)
-  AC_SUBST(WX_CXXFLAGS)
-  AC_SUBST(WX_CFLAGS_ONLY)
-  AC_SUBST(WX_CXXFLAGS_ONLY)
-  AC_SUBST(WX_LIBS)
-  AC_SUBST(WX_LIBS_STATIC)
-  AC_SUBST(WX_VERSION)
-  AC_SUBST(WX_RESCOMP)
-])
-
-dnl ---------------------------------------------------------------------------
-dnl Get information on the wxrc program for making C++, Python and xrs
-dnl resource files.
-dnl
-dnl     AC_ARG_ENABLE(...)
-dnl     AC_ARG_WITH(...)
-dnl        ...
-dnl     AM_OPTIONS_WXCONFIG
-dnl        ...
-dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)
-dnl     if test "$wxWin" != 1; then
-dnl        AC_MSG_ERROR([
-dnl                wxWidgets must be installed on your system
-dnl                but wx-config script couldn't be found.
-dnl
-dnl                Please check that wx-config is in path, the directory
-dnl                where wxWidgets libraries are installed (returned by
-dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
-dnl                equivalent variable and wxWidgets version is 2.6.0 or above.
-dnl        ])
-dnl     fi
-dnl
-dnl     AM_PATH_WXRC([HAVE_WXRC=1], [HAVE_WXRC=0])
-dnl     if test "x$HAVE_WXRC" != x1; then
-dnl         AC_MSG_ERROR([
-dnl                The wxrc program was not installed or not found.
-dnl     
-dnl                Please check the wxWidgets installation.
-dnl         ])
-dnl     fi
-dnl
-dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-dnl
-dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
-dnl ---------------------------------------------------------------------------
-
-
-
-dnl ---------------------------------------------------------------------------
-dnl AM_PATH_WXRC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
-dnl resources.  The variable WXRC will be set and substituted in the configure
-dnl script and Makefiles.
-dnl
-dnl Example use:
-dnl   AM_PATH_WXRC([wxrc=1], [wxrc=0])
-dnl ---------------------------------------------------------------------------
-
-dnl
-dnl wxrc program from the wx-config script
-dnl
-AC_DEFUN([AM_PATH_WXRC],
-[
-  AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
-    
-  if test "x$WX_CONFIG_NAME" = x; then
-    AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
-  else
-    
-    AC_MSG_CHECKING([for wxrc])
-    
-    if test "x$WXRC" = x ; then
-      dnl wx-config --utility is a new addition to wxWidgets:
-      _WX_PRIVATE_CHECK_VERSION(2,5,3)
-      if test -n "$wx_ver_ok"; then
-        WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
-      fi
-    fi
-
-    if test "x$WXRC" = x ; then
-      AC_MSG_RESULT([not found])
-      ifelse([$2], , :, [$2])
-    else
-      AC_MSG_RESULT([$WXRC])
-      ifelse([$1], , :, [$1])
-    fi
-    
-    AC_SUBST(WXRC)
-  fi
-])