re-add symlinking of libraryes for un-slotted (screwed before)

2 files changed, 10 insertions, 4 deletions

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 5d4267d04ec1..2f493df9bbdf 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.23 2006/03/09 12:37:01 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.24 2006/03/10 11:41:39 vivo Exp $
 
 # Author: Francesco Riosa <vivo at gentoo.org>
 # Maintainer: Francesco Riosa <vivo at gentoo.org>
@@ -520,6 +520,10 @@ mysql_src_install() {
 			echo "${MY_SHAREDSTATEDIR#"/"}" >> "${filelist}"
 		popd &>/dev/null
 	fi
+	
+	# It's safer portage wis doing this in instal, but we can't
+	# if it's a slotted install
+	[[ ${SLOT} -eq 0 ]] && ROOT="${D}" mysql_lib_symlinks	
 }
 
 mysql_pkg_preinst() {
@@ -532,7 +536,9 @@ mysql_pkg_preinst() {
 mysql_pkg_postinst() {
 
 	mysql_init_vars
-	mysql_lib_symlinks
+	# slotted, manage lib symlinks on the real file-system
+	# to cope with other version installed
+	[[ ${SLOT} -ne 0 ]] && mysql_lib_symlinks
 
 	# mind at FEATURES=collision-protect before to remove this
 	[ -d "${ROOT}/var/log/mysql" ] \
diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index 17431d137f77..076ac3074898 100644
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.8 2006/02/01 18:10:10 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.9 2006/03/10 11:41:39 vivo Exp $
 
 # Author: Francesco Riosa <vivo at gentoo.org>
 # Maintainer: Francesco Riosa <vivo at gentoo.org>
@@ -114,7 +114,7 @@ mysql_version_is_at_least() {
 # THERE IS A COPY OF THIS ONE IN ESELECT-MYSQL, keep the two synced
 mysql_make_file_list() {
 	local items= left=0
-	items=$( ls -d ${1}-[[:digit:]][[:digit:]][[:digit:]] )
+	items=$( ls -d ${1}-[[:digit:]][[:digit:]][[:digit:]] 2>/dev/null )
 
 	while [[ ${left} -lt ${#items[@]} ]] ; do
 		local lowest_idx=${left}