fix for bug #121754, eselect mysql don't work with USE="minimal"

(Portage version: 2.1_pre4-r1)

4 files changed, 15 insertions, 10 deletions

diff --git a/app-admin/eselect-mysql/ChangeLog b/app-admin/eselect-mysql/ChangeLog
index 59695ed8852e..2a788ecab198 100644
--- a/app-admin/eselect-mysql/ChangeLog
+++ b/app-admin/eselect-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-mysql
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mysql/ChangeLog,v 1.8 2006/02/05 14:22:46 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mysql/ChangeLog,v 1.9 2006/02/06 10:31:11 vivo Exp $
+
+*eselect-mysql-1.0.0-r3 (06 Feb 2006)
+
+  06 Feb 2006; Francesco Riosa <vivo@gentoo.org> files/mysql.eselect,
+  -eselect-mysql-1.0.0-r2.ebuild, +eselect-mysql-1.0.0-r3.ebuild:
+  fix for bug #121754, eselect mysql don't work with USE="minimal"
 
 *eselect-mysql-1.0.0-r2 (05 Feb 2006)
 
diff --git a/app-admin/eselect-mysql/eselect-mysql-1.0.0-r2.ebuild b/app-admin/eselect-mysql/eselect-mysql-1.0.0-r3.ebuild
index 40bde1c09294..69a39bf77da8 100644
--- a/app-admin/eselect-mysql/eselect-mysql-1.0.0-r2.ebuild
+++ b/app-admin/eselect-mysql/eselect-mysql-1.0.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mysql/eselect-mysql-1.0.0-r2.ebuild,v 1.1 2006/02/05 14:22:46 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mysql/eselect-mysql-1.0.0-r3.ebuild,v 1.1 2006/02/06 10:31:11 vivo Exp $
 
 DESCRIPTION="Utility to change the default MySQL server being used"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/app-admin/eselect-mysql/files/digest-eselect-mysql-1.0.0-r2 b/app-admin/eselect-mysql/files/digest-eselect-mysql-1.0.0-r3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/app-admin/eselect-mysql/files/digest-eselect-mysql-1.0.0-r2
+++ b/app-admin/eselect-mysql/files/digest-eselect-mysql-1.0.0-r3
diff --git a/app-admin/eselect-mysql/files/mysql.eselect b/app-admin/eselect-mysql/files/mysql.eselect
index 23e1f4fc6aa8..27aaf6476d74 100644
--- a/app-admin/eselect-mysql/files/mysql.eselect
+++ b/app-admin/eselect-mysql/files/mysql.eselect
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: mysql.eselect,v 1.7 2006/02/05 14:22:46 vivo Exp $
+# $Id: mysql.eselect,v 1.8 2006/02/06 10:31:11 vivo Exp $
 
 DESCRIPTION="Manage the /usr/lib/*mysql* links"
 MAINTAINER="vivo@gentoo.org"
-SVN_DATE='$Date: 2006/02/05 14:22:46 $'
+SVN_DATE='$Date: 2006/02/06 10:31:11 $'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
-MYSQL_SYMLINK_CHECKDIR="${ROOT}/usr/sbin"
+MYSQL_SYMLINK_CHECKDIR="${ROOT}/usr/bin"
 ERR_NOT_FOUND="(not-found)"
 # "unset" is grepped by the MySQL ebuild so don't touch it
 ERR_UNSET="(unset)"
@@ -36,9 +36,8 @@ function version4bash() {
 find_versions() {
 	local versions list
 	# "eselect mysql set 1" will always set the best version
-	list=${MYSQL_SYMLINK_CHECKDIR}/mysqld-*
-	[[ ${list##/} == mysqld-* ]] && return
-	for x in ${MYSQL_SYMLINK_CHECKDIR}/mysqld-* ; do
+	list=$( ls ${MYSQL_SYMLINK_CHECKDIR}/perror-* 2>/dev/null )
+	for x in ${list} ; do
 		versions=( $( version4human ${x##*-}) ${versions[@]} )
 	done
 	echo ${versions[@]}
@@ -177,7 +176,7 @@ get_version_fromlist() {
 }
 
 get_current_version() {
-	link=$(readlink ${MYSQL_SYMLINK_CHECKDIR}/mysqld)
+	link=$(readlink ${MYSQL_SYMLINK_CHECKDIR}/perror)
 	version=${link##*-}
 
 	if ! is_number "${version}" || [[ "${version}" == "" ]] ; then
@@ -312,7 +311,7 @@ describe_remove() {
 
 do_remove() {
 
-	local version=$(readlink "${MYSQL_SYMLINK_CHECKDIR}/mysqld")
+	local version=$(readlink "${MYSQL_SYMLINK_CHECKDIR}/perror")
 	version=$(version4human "${version##*-}")
 
 	if [[ -z "${version}" ]] ; then