fix mysql.eclass bug #122205

Package-Manager: portage-2.1_pre4-r1

4 files changed, 20 insertions, 16 deletions

diff --git a/app-admin/eselect-mysql/Manifest b/app-admin/eselect-mysql/Manifest
index 6ea963e93595..fb2b49fa1ff1 100644
--- a/app-admin/eselect-mysql/Manifest
+++ b/app-admin/eselect-mysql/Manifest
@@ -4,22 +4,22 @@ Hash: SHA1
 MD5 0f402c0a3fb415176d3c72c1de584bb5 ChangeLog 1983
 RMD160 9d0147325074e57ede6b928d46c9069dd4b42f3a ChangeLog 1983
 SHA256 a30d0658b1b24a4159c66f799aec23c0cfddd8a4c4287ab85cad50a715295e72 ChangeLog 1983
-MD5 a0c299615f27fa5e147713463a6b16b8 eselect-mysql-1.0.0-r3.ebuild 626
-RMD160 bb91b53121f7ff4546bd79dac1e608498c376b06 eselect-mysql-1.0.0-r3.ebuild 626
-SHA256 9ba307d0d1d7f54aba1ab626d1de5ab2cd17d78d731280ebffadf41bf036a196 eselect-mysql-1.0.0-r3.ebuild 626
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eselect-mysql-1.0.0-r3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-eselect-mysql-1.0.0-r3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-eselect-mysql-1.0.0-r3 0
-MD5 85056847465108efbc5bea08767935aa files/mysql.eselect 8983
-RMD160 c61213877300652feac940c489a855df053938dc files/mysql.eselect 8983
-SHA256 be818888730ca8af2e2775a06d4aa7435fccb6f00a10e6a4f62c0e4e781775d6 files/mysql.eselect 8983
+MD5 c68888d7b0e06b951527d68bbe77a54b eselect-mysql-1.0.0-r4.ebuild 626
+RMD160 8b116b3a31a5fa6b076d37177a4a2cb11d7fe02f eselect-mysql-1.0.0-r4.ebuild 626
+SHA256 7c82ce8a552dbe22f6c19f4f2b418ac6907b08dcf0329c23fd5b86ddbd6bc951 eselect-mysql-1.0.0-r4.ebuild 626
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eselect-mysql-1.0.0-r4 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-eselect-mysql-1.0.0-r4 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-eselect-mysql-1.0.0-r4 0
+MD5 ba7a640dd9ea4f0e6622fa175e0469aa files/mysql.eselect 9198
+RMD160 493675d3f9af0b90120d6f0e2fc8f1f3d5a726c4 files/mysql.eselect 9198
+SHA256 766c39ec5391a43ff4068e5e8d64e1bc85ebe0b9c6c1a6703bb9626117b8d488 files/mysql.eselect 9198
 MD5 fa97fe3e6f213f79ccf7ffbd53838095 metadata.xml 338
 RMD160 73a2e747b9cb92a8a03ab792fcc0aa997b31c8d1 metadata.xml 338
 SHA256 6a290284a517ad042ee98313454b6615a0498d59f8dcf428aac3da3da7340065 metadata.xml 338
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD5yWrKolR564NvWYRAvi9AJ0TRsEsn0yDly6aSyuTzuG3WCx+ggCgjBXo
-LiFTbR973RVUiXB7q1uwhYE=
-=WR/W
+iD8DBQFD6zqwKolR564NvWYRAunBAJ4r9IiyjjHaxHKdocldK975FnuPoQCgrldJ
+jTI58715VsTFCwQDvz1JUhk=
+=AGYy
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-mysql/eselect-mysql-1.0.0-r3.ebuild b/app-admin/eselect-mysql/eselect-mysql-1.0.0-r4.ebuild
index 69a39bf77da8..3fadc6c8de24 100644
--- a/app-admin/eselect-mysql/eselect-mysql-1.0.0-r3.ebuild
+++ b/app-admin/eselect-mysql/eselect-mysql-1.0.0-r4.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-r3.ebuild,v 1.1 2006/02/06 10:31:11 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mysql/eselect-mysql-1.0.0-r4.ebuild,v 1.1 2006/02/09 12:50:37 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-r3 b/app-admin/eselect-mysql/files/digest-eselect-mysql-1.0.0-r4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/app-admin/eselect-mysql/files/digest-eselect-mysql-1.0.0-r3
+++ b/app-admin/eselect-mysql/files/digest-eselect-mysql-1.0.0-r4
diff --git a/app-admin/eselect-mysql/files/mysql.eselect b/app-admin/eselect-mysql/files/mysql.eselect
index 27aaf6476d74..20b05802135c 100644
--- a/app-admin/eselect-mysql/files/mysql.eselect
+++ b/app-admin/eselect-mysql/files/mysql.eselect
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: mysql.eselect,v 1.8 2006/02/06 10:31:11 vivo Exp $
+# $Id: mysql.eselect,v 1.9 2006/02/09 12:50:37 vivo Exp $
 
 DESCRIPTION="Manage the /usr/lib/*mysql* links"
 MAINTAINER="vivo@gentoo.org"
-SVN_DATE='$Date: 2006/02/06 10:31:11 $'
+SVN_DATE='$Date: 2006/02/09 12:50:37 $'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
 MYSQL_SYMLINK_CHECKDIR="${ROOT}/usr/bin"
 ERR_NOT_FOUND="(not-found)"
@@ -56,7 +56,7 @@ check_symlink() {
 	[[ -z ${filename} ]] || [[ -z ${version} ]] && return 1
 
 	# check link source
-	[[ -f ${filename} ]] || [[ -d ${filename} ]] || ret=$(( ${ret} + 1 ))
+	[[ -f "${filename}" ]] || [[ -f "${filename}.gz" ]] || [[ -d ${filename} ]] || ret=$(( ${ret} + 1 ))
 
 	# check link targe
 	# not checking for directory (want to keep "/etc/mysql")
@@ -218,6 +218,8 @@ set_current_version() {
 			cd "${dir}"
 			lastdir="${dir}"
 		fi
+		[[ -f "${filename}" ]] || [[ -d "${filename}" ]] \
+			|| filename="${filename}.gz"
 		linkname="$(basename "${filename}")"
 		if [[ -a "${linkname}" ]] ; then
 			# rm needed for directory
@@ -242,6 +244,8 @@ remove_current_version() {
 	for filename in $list ; do
 		linkname="${ROOT}/${filename/"-${version}"/}"
 		[[ -L "${linkname}" ]] && rm -f "${linkname}"
+		linkname="${ROOT}/${filename/"-${version}"/}.gz"
+		[[ -L "${linkname}" ]] && rm -f "${linkname}"
 	done
 
 	cd "${CWD}"