Version bump, support --brief (bug #292119). Minor cleanup.

Remove old.
(Portage version: 2.2_rc49/cvs/Linux x86_64)

8 files changed, 23 insertions, 446 deletions

diff --git a/app-admin/eselect-wxwidgets/ChangeLog b/app-admin/eselect-wxwidgets/ChangeLog
index 5fa5a8a1feb4..597f4459e122 100644
--- a/app-admin/eselect-wxwidgets/ChangeLog
+++ b/app-admin/eselect-wxwidgets/ChangeLog
@@ -1,6 +1,15 @@
 # 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.43 2009/10/31 14:44:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.44 2009/11/13 01:48:24 dirtyepic Exp $
+
+*eselect-wxwidgets-1.2 (13 Nov 2009)
+
+  13 Nov 2009; Ryan Hill <dirtyepic@gentoo.org> -files/wx-config-0.7,
+  -files/wxrc-0.7, -files/wxwidgets.eselect-0.7,
+  -eselect-wxwidgets-0.8.ebuild, -files/wx-config-1, -files/wxrc-1,
+  -eselect-wxwidgets-1.0.ebuild, +eselect-wxwidgets-1.2.ebuild:
+  Version bump, support --brief (bug #292119). Minor cleanup.
+  Remove old.
 
   31 Oct 2009; Brent Baude <ranger@gentoo.org> eselect-wxwidgets-1.1.ebuild:
   Marking eselect-wxwidgets-1.1 ppc64 for bug 287362
diff --git a/app-admin/eselect-wxwidgets/eselect-wxwidgets-0.8.ebuild b/app-admin/eselect-wxwidgets/eselect-wxwidgets-0.8.ebuild
deleted file mode 100644
index 685c9e0711ea..000000000000
--- a/app-admin/eselect-wxwidgets/eselect-wxwidgets-0.8.ebuild
+++ /dev/null
@@ -1,45 +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-0.8.ebuild,v 1.11 2009/01/22 12:49:52 armin76 Exp $
-
-DESCRIPTION="Manage the system default for wxWidgets packages."
-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"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}"/wxwidgets.eselect-${PV} wxwidgets.eselect \
-		|| die "Failed installing module"
-
-	insinto /usr/share/aclocal
-	doins "${FILESDIR}"/wxwin.m4
-
-	newbin "${FILESDIR}"/wx-config-0.7 wx-config
-	newbin "${FILESDIR}"/wxrc-0.7 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 your system wxWidgets profile is set to \"none\"."
-	elog
-	elog "You will need to select a profile using \`eselect wxwidgets\` to"
-	elog "use wxGTK outside of portage.  If you do not plan on building"
-	elog "packages or doing development work with wxGTK outside of portage"
-	elog "then you can safely leave this set to \"none\"."
-	echo
-}
diff --git a/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.0.ebuild b/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.2.ebuild
index 1a7fde538948..615d11327136 100644
--- a/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.0.ebuild
+++ b/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.2.ebuild
@@ -1,10 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/eselect-wxwidgets-1.2.ebuild,v 1.1 2009/11/13 01:48:24 dirtyepic Exp $
+
+WXWRAP_VER=1.1
+WXESELECT_VER=1.2
 
 DESCRIPTION="Eselect module and wrappers for wxWidgets"
 HOMEPAGE="http://www.gentoo.org"
-SRC_URI=""
+SRC_URI="mirror://gentoo.org/wxwidgets.eselect-${WXESELECT_VER}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -12,20 +15,22 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE=""
 
 DEPEND="!<=x11-libs/wxGTK-2.6.4.0-r2"
-RDEPEND="app-admin/eselect"
+RDEPEND=">=app-admin/eselect-1.2.3"
 
-WXWRAP_VER=1
+S=${WORKDIR}
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}"/wxwidgets.eselect-0.8 wxwidgets.eselect \
+	newins "${S}"/wxwidgets.eselect-${WXESELECT_VER} wxwidgets.eselect \
 		|| die "Failed installing module"
 
 	insinto /usr/share/aclocal
-	doins "${FILESDIR}"/wxwin.m4
+	doins "${FILESDIR}"/wxwin.m4 || die "Failed installing m4"
 
-	newbin "${FILESDIR}"/wx-config-${WXWRAP_VER} wx-config
-	newbin "${FILESDIR}"/wxrc-${WXWRAP_VER} wxrc
+	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
diff --git a/app-admin/eselect-wxwidgets/files/wx-config-0.7 b/app-admin/eselect-wxwidgets/files/wx-config-0.7
deleted file mode 100755
index 388ad5097547..000000000000
--- a/app-admin/eselect-wxwidgets/files/wx-config-0.7
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash -
-#
-# /usr/bin/wx-config
-#
-#  a lame wx-config wrapper by dirtyepic@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
-#elif [[ -n ${EBUILD_PHASE} ]]; then
-#	cat <<- EOF
-#	"
-#
-#
-#	***     This ebuild is attempting to use /usr/bin/wx-config directly.
-#	***     Please see wxwidgets.eclass for instructions how to add wxWidgets support
-#	***     to your package.
-#
-#
-#	"
-#	EOF
-#	exit 1
-else
-	if [[ -e /var/lib/wxwidgets/current ]]; then
-		source /var/lib/wxwidgets/current
-	else
-		_wxerror "Cannot find wxWidgets profile configuration file ( /var/lib/wxwidgets/current )"
-	fi
-
-	[[ ${WXCONFIG} == none ]] && _wxerror "No profile currently selected"
-
-	if [[ -f /usr/lib/wx/config/${WXCONFIG} \
-	   && -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/wx-config-1 b/app-admin/eselect-wxwidgets/files/wx-config-1
deleted file mode 100755
index 1f4742b280f4..000000000000
--- a/app-admin/eselect-wxwidgets/files/wx-config-1
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh -
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wx-config-1,v 1.2 2009/07/02 19:45:48 grobian Exp $
-#
-# /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-0.7 b/app-admin/eselect-wxwidgets/files/wxrc-0.7
deleted file mode 100755
index 29efeaab2c6b..000000000000
--- a/app-admin/eselect-wxwidgets/files/wxrc-0.7
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash -
-#
-# /usr/bin/wxrc
-#
-#  a lame wxrc wrapper by dirtyepic@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
-#elif [[ -n ${EBUILD_PHASE} ]]; then
-#	cat <<- EOF
-#	"
-#
-#
-#	***     This ebuild is attempting to use /usr/bin/wxrc directly.
-#	***     Please see wxwidgets.eclass for instructions how to add wxWidgets support
-#	***     to your package.
-#
-#
-#	"
-#	EOF
-#	exit 1
-else
-	if [[ -e /var/lib/wxwidgets/current ]]; then
-		source /var/lib/wxwidgets/current
-	else
-		_wxerror "Cannot find wxWidgets profile configuration file ( /var/lib/wxwidgets/current )"
-	fi
-
-	[[ ${WXCONFIG} == none ]] && _wxerror "No profile currently selected"
-
-	if [[ -f /usr/lib/wx/config/${WXCONFIG} \
-	   && -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/wxrc-1 b/app-admin/eselect-wxwidgets/files/wxrc-1
deleted file mode 100755
index 6f6f9c5b1a1e..000000000000
--- a/app-admin/eselect-wxwidgets/files/wxrc-1
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh -
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wxrc-1,v 1.2 2009/07/02 19:45:48 grobian Exp $
-#
-# /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
-
diff --git a/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.7 b/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.7
deleted file mode 100644
index ee3c95892339..000000000000
--- a/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.7
+++ /dev/null
@@ -1,222 +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.7,v 1.1 2007/12/20 00:11:50 dirtyepic Exp $
-
-inherit config
-
-DESCRIPTION="Manage the system default wxWidgets profile."
-MAINTAINER="dirtyepic@gentoo.org"
-VERSION=0.5
-
-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}
-}
-
-### 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}
-}