From 6742122b4b88539fb740545f33929845d962fff0 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Fri, 12 Jan 2007 20:58:59 +0000 Subject: [PATCH] Remove eselect-mysql, as it was only useful with mysql-slotted and should thus have never been unmasked. --- app-admin/eselect-mysql/ChangeLog | 65 ---- app-admin/eselect-mysql/Manifest | 19 - .../eselect-mysql/eselect-mysql-1.1.8.ebuild | 22 -- .../files/digest-eselect-mysql-1.1.8 | 0 app-admin/eselect-mysql/files/mysql.eselect | 362 ------------------ app-admin/eselect-mysql/metadata.xml | 10 - 6 files changed, 478 deletions(-) delete mode 100644 app-admin/eselect-mysql/ChangeLog delete mode 100644 app-admin/eselect-mysql/Manifest delete mode 100644 app-admin/eselect-mysql/eselect-mysql-1.1.8.ebuild delete mode 100644 app-admin/eselect-mysql/files/digest-eselect-mysql-1.1.8 delete mode 100644 app-admin/eselect-mysql/files/mysql.eselect delete mode 100644 app-admin/eselect-mysql/metadata.xml diff --git a/app-admin/eselect-mysql/ChangeLog b/app-admin/eselect-mysql/ChangeLog deleted file mode 100644 index 74217f49dfb9..000000000000 --- a/app-admin/eselect-mysql/ChangeLog +++ /dev/null @@ -1,65 +0,0 @@ -# ChangeLog for app-admin/eselect-mysql -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mysql/ChangeLog,v 1.12 2007/01/02 11:37:13 vivo Exp $ - -*eselect-mysql-1.1.8 (02 Jan 2007) - - 02 Jan 2007; Francesco Riosa files/mysql.eselect, - +eselect-mysql-1.1.8.ebuild: - Updating for new slotted kind; 500 => 5_0_26 - -*eselect-mysql-1.1.0 (15 Feb 2006) - - 15 Feb 2006; Francesco Riosa files/mysql.eselect, - -eselect-mysql-1.0.0-r5.ebuild, +eselect-mysql-1.1.0.ebuild: - added "distclean" action to remove stale files from previous installs - -*eselect-mysql-1.0.0-r5 (14 Feb 2006) - - 14 Feb 2006; Francesco Riosa files/mysql.eselect, - -eselect-mysql-1.0.0-r4.ebuild, +eselect-mysql-1.0.0-r5.ebuild: - -r4 was not working at all - -*eselect-mysql-1.0.0-r3 (06 Feb 2006) - - 06 Feb 2006; Francesco Riosa 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) - - 05 Feb 2006; Francesco Riosa files/mysql.eselect, - -eselect-mysql-1.0.0-r1.ebuild, +eselect-mysql-1.0.0-r2.ebuild: - Added function slot_remove to be used inside MySQL eclass/ebuild - -*eselect-mysql-1.0.0-r1 (01 Feb 2006) - - 01 Feb 2006; Francesco Riosa - -eselect-mysql-1.0.0.ebuild, +eselect-mysql-1.0.0-r1.ebuild: - version bump - - 01 Feb 2006; Francesco Riosa files/mysql.eselect: - bad symlinking solved, missed a commit before. - - 30 Jan 2006; Francesco Riosa files/mysql.eselect: - Additional security, duplicated the code from mysql eclasses to symlink - required include files and libraries (always to the best version) - - 08 Jan 2006; Francesco Riosa files/mysql.eselect: - Added "remove" action to remove simlinks - removed need to check for both plain and .gz files for manpages due to a move - as a consequence of a mysql eclass change. - - 07 Jan 2006; Francesco Riosa files/mysql.eselect: - Many changes after chatting with kugelfang in irc - - 07 Jan 2006; Francesco Riosa files/mysql.eselect, - eselect-mysql-1.0.0.ebuild: - Removed unused function, added support for manpages and directoryes - Reverse order of version shown, "eselect mysql set 1" set the best version now - -*eselect-mysql-1.0.0 (07 Jan 2006) - - 07 Jan 2006; Francesco Riosa ChangeLog: - This module will be used to switch between MySQL slotted versions. - diff --git a/app-admin/eselect-mysql/Manifest b/app-admin/eselect-mysql/Manifest deleted file mode 100644 index 28fbc535bf54..000000000000 --- a/app-admin/eselect-mysql/Manifest +++ /dev/null @@ -1,19 +0,0 @@ -AUX mysql.eselect 9412 RMD160 7619ebd385a05724ac8d64db01716ea12f219703 SHA1 891cb39b8693e36680833de0e19bd2c0c8cf5d0c SHA256 d1f96609c4354cf1bd341e378a34845c117f8bca98acca97d5a7a4a761510a37 -MD5 1a04d8c3d759b5d74c6f267b3e27f283 files/mysql.eselect 9412 -RMD160 7619ebd385a05724ac8d64db01716ea12f219703 files/mysql.eselect 9412 -SHA256 d1f96609c4354cf1bd341e378a34845c117f8bca98acca97d5a7a4a761510a37 files/mysql.eselect 9412 -EBUILD eselect-mysql-1.1.8.ebuild 623 RMD160 b469be780fd40314d69b64fc6cd03953afca9b81 SHA1 a60486e26c297e57f7948643b6d7a17b868c4b2c SHA256 3571c5c6e41fee7aa7e630818605398c69bf82ccabb5632f2764cadeff317e7d -MD5 f96a3413661f859a6b241411f634dc12 eselect-mysql-1.1.8.ebuild 623 -RMD160 b469be780fd40314d69b64fc6cd03953afca9b81 eselect-mysql-1.1.8.ebuild 623 -SHA256 3571c5c6e41fee7aa7e630818605398c69bf82ccabb5632f2764cadeff317e7d eselect-mysql-1.1.8.ebuild 623 -MISC ChangeLog 2616 RMD160 ecea6a8ed6774d0a07dbd35bd7a5366dbb214316 SHA1 8bc33dd814f1b6f8ea8e2006e7c3ad78ff3e2f4e SHA256 fe49be511465c01ca54d6c299abc2e146001a24519d72032f457bcee0f614214 -MD5 a7ff28a47870af1c8877c2b43220a193 ChangeLog 2616 -RMD160 ecea6a8ed6774d0a07dbd35bd7a5366dbb214316 ChangeLog 2616 -SHA256 fe49be511465c01ca54d6c299abc2e146001a24519d72032f457bcee0f614214 ChangeLog 2616 -MISC metadata.xml 338 RMD160 73a2e747b9cb92a8a03ab792fcc0aa997b31c8d1 SHA1 01c2d47d82530f35fa090d79a3b5d272d8ab2862 SHA256 6a290284a517ad042ee98313454b6615a0498d59f8dcf428aac3da3da7340065 -MD5 fa97fe3e6f213f79ccf7ffbd53838095 metadata.xml 338 -RMD160 73a2e747b9cb92a8a03ab792fcc0aa997b31c8d1 metadata.xml 338 -SHA256 6a290284a517ad042ee98313454b6615a0498d59f8dcf428aac3da3da7340065 metadata.xml 338 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eselect-mysql-1.1.8 0 -RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-eselect-mysql-1.1.8 0 -SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-eselect-mysql-1.1.8 0 diff --git a/app-admin/eselect-mysql/eselect-mysql-1.1.8.ebuild b/app-admin/eselect-mysql/eselect-mysql-1.1.8.ebuild deleted file mode 100644 index 65da238eb69e..000000000000 --- a/app-admin/eselect-mysql/eselect-mysql-1.1.8.ebuild +++ /dev/null @@ -1,22 +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-mysql/eselect-mysql-1.1.8.ebuild,v 1.1 2007/01/02 11:37:13 vivo Exp $ - -DESCRIPTION="Utility to change the default MySQL server being used" -HOMEPAGE="http://www.gentoo.org/" - -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="" - -RDEPEND="app-admin/eselect" - -src_install() { - pushd "${FILESDIR}" 1>/dev/null - insinto /usr/share/eselect/modules - doins mysql.eselect - popd 1>/dev/null -} diff --git a/app-admin/eselect-mysql/files/digest-eselect-mysql-1.1.8 b/app-admin/eselect-mysql/files/digest-eselect-mysql-1.1.8 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/app-admin/eselect-mysql/files/mysql.eselect b/app-admin/eselect-mysql/files/mysql.eselect deleted file mode 100644 index 9a8ad15a1a14..000000000000 --- a/app-admin/eselect-mysql/files/mysql.eselect +++ /dev/null @@ -1,362 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id: mysql.eselect,v 1.13 2007/01/02 11:37:13 vivo Exp $ - -[[ -d "${ROOT}/lib64" ]] && LIBDIR="lib64" || LIBDIR="lib" - -DESCRIPTION="Manage the /usr/${LIBDIR}/*mysql* links" -MAINTAINER="vivo@gentoo.org" -SVN_DATE='$Date: 2007/01/02 11:37:13 $' -VERSION=$(svn_date_to_version "${SVN_DATE}" ) -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)" - -# return a human oriented version -# -# $1 - version to transform -function version4human() { - echo "${1//_/.}" -} - -# return a integer version -# -# $1 - version to transform - -function version4bash() { - echo "${1//./_}" -} - -# Return the versions currently installed -find_versions() { - local versions list - # TODO: "eselect mysql set 1" will always set the best version - list=$( mysql_make_file_list ${MYSQL_SYMLINK_CHECKDIR}/perror 2>/dev/null ) - for x in ${list} ; do - versions=( $( version4human ${x##*-}) ${versions[@]} ) - done - echo ${versions[@]} -} - -# Check if a symlink could be created for a specific file -# -# $1 - original file name -# $2 - MySQL version -check_symlink() { - local filename=${1} - local version=${2} - local linkname=${filename/"-${version}"/} - local ret=0 - - [[ -z ${filename} ]] || [[ -z ${version} ]] && return 1 - - # check link source - [[ -f "${filename}" ]] || [[ -f "${filename}.gz" ]] || [[ -d ${filename} ]] || ret=$(( ${ret} + 1 )) - - # check link targe - # not checking for directory (want to keep "/etc/mysql") - [[ -a ${linkname} ]] && [[ ! -L ${linkname} ]] && [[ ! -d ${linkname} ]] \ - && ret=$(( ${ret} +2 )) - - return ${ret} -} - -# THERE IS A COPY OF THIS ONE IN MYSQL_FX.ECLASS, keep the two synced -mysql_make_file_list() { - local base="${1}-" - local items - local ret - echo $( for i in $( ls -d ${1}-[[:digit:]]_[[:digit:]]{,[[:digit:]]}_[[:digit:]]{,[[:digit:]]} 2>/dev/null ) - do - n=${i#${base}} - n=( ${n//_/ } ) - echo "$(( ${n[0]} * 10000 + 100 + ${n[1]} * 100 + 100 + ${n[2]} ))$i" - done | sort | cut -c 6- ) -} - -# THERE IS A COPY OF THIS ONE IN ESELECT-MYSQL, keep the two synced -mysql_choose_better_version() { - local better=$(mysql_make_file_list ${1}) - echo ${better##* } -} - -# void mysql_lib_symlinks() -# -# To be called on the live filesystem, reassign symlinks to each mysql -# library to the best version avaiable -# 2005-12-30 -# THERE IS A COPY OF THIS ONE IN MYSQL_FX.ECLASS, keep the two synced -mysql_lib_symlinks() { - local d dirlist maxdots soname sonameln other better - pushd "${ROOT}/usr/${LIBDIR}" &> /dev/null - # dirlist must contain the less significative directory left - dirlist="mysql $( mysql_make_file_list mysql )" - - # waste some time in removing and recreating symlinks - for d in $dirlist ; do - for soname in $( find "${d}" -name "*.so*" -and -not -type "l" 2>/dev/null ) - do - # maxdot is a limit versus infinite loop - maxdots=0 - sonameln=${soname##*/} - # loop in version of the library to link it, similar to the - # libtool work - while [[ ${sonameln:0-3} != '.so' ]] && [[ ${maxdots} -lt 6 ]] - do - rm -f "${sonameln}" - ln -s "${soname}" "${sonameln}" - (( ++maxdots )) - sonameln="${sonameln%.*}" - done - rm -f "${sonameln}" - ln -s "${soname}" "${sonameln}" - done - done - popd &> /dev/null - - # "include"s and "mysql_config", needed to compile other sw - for other in "/usr/${LIBDIR}/mysql" "/usr/include/mysql" "/usr/bin/mysql_config" ; do - pushd "${ROOT}${other%/*}" &> /dev/null - better=$( mysql_choose_better_version "${other##*/}" ) - if ! [[ -d "${other##*/}" ]] ; then - [[ -L "${other##*/}" ]] && rm -f "${other##*/}" - ! [[ -f "${other##*/}" ]] && ln -sf "${better}" "${other##*/}" - else - [[ -L "${other##*/}" ]] && rm -f "${other##*/}" - ! [[ -d "${other##*/}" ]] && ln -s "${better}" "${other##*/}" - fi - popd &> /dev/null - done -} - - -# work out which MYSQL version the user has chosen from the list -# -# $1: the list id that the user has chosen -get_version_fromlist() { - local version=${1} - local -a versions=( $(find_versions) ) - - if is_number ${version} ; then - if [[ ${version} -gt 0 ]] && [[ ${version} -le ${#versions[@]} ]] ; then - version=${versions[(( ${version} - 1 ))]} - echo "${version}" - return - fi - fi - - for (( i = 0 ; i < ${#versions[@]} ; i = i + 1 )) ; do - [[ ${versions[$i]} == ${version} ]] || continue - echo ${version} - return - done - - echo "${ERR_NOT_FOUND}" -} - -get_current_version() { - link=$(readlink ${MYSQL_SYMLINK_CHECKDIR}/perror) - version=${link##*-} - - if ! is_number "${version//_/}" || [[ "${version}" == "" ]] ; then - version="${ERR_UNSET}" - echo "${version}" - else - echo $(version4human "${version}") - fi -} - -set_current_version() { - - local version=${1} - is_number "${version//_/}" || die -q "No usable version: ${version}" - local CWD=$(pwd) - local lastdir dir linkname - local list=$(< $ROOT/var/lib/eselect/mysql/mysql-${version}.filelist ) - - # perform a check on the entire file list - for filename in $list ; do - dir="${ROOT}/$(dirname "${filename}")" - if [[ "${dir}" != "${lastdir}" ]] ; then - cd "${dir}" - lastdir="${dir}" - fi - check_symlink "$(basename "${filename}")" "${version}" - ret=$? - if [[ $ret -ne 0 ]] ; then - cd "${CWD}" - die -q \ - "File \"${ROOT}/${filename}\" is not suitable for symlink (${ret})" - fi - done - - # it's ok to do the effective work now - for filename in $list ; do - dir="${ROOT}/$(dirname "${filename}")" - if [[ "${dir}" != "${lastdir}" ]] ; then - cd "${dir}" - lastdir="${dir}" - fi - linkname="$(basename "${filename}")" - if ! [[ -f "${linkname}" ]] && ! [[ -d "${linkname}" ]] \ - && [[ -f "${linkname}.gz" ]] - then - linkname="${linkname}.gz" - fi - if [[ -a "${linkname}" ]] ; then - # rm needed for directory - rm -f "${linkname/"-${version}"/}" &> /dev/null - ln -sf "${linkname}" "${linkname/"-${version}"/}" - [[ ! -L "${linkname/"-${version}"/}" ]] \ - && write_warning_msg "FAILED: cd \"${dir}\" && ln -sf \"${linkname}\" \"${linkname/"-${version}"/}\"" - fi - done - - cd "${CWD}" -} - -remove_current_version() { - - local version=${1} - is_number "${version//_/}" || die -q "No usable version: ${version}" - local CWD=$(pwd) - local lastdir dir linkname - local list=$(< $ROOT/var/lib/eselect/mysql/mysql-${version}.filelist ) - - 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}" -} - -### show action ### - -describe_show() { - echo "Show the current default version for MySQL" -} - -do_show() { - write_list_start "Current default MySQL version:" - version=$(get_current_version) - write_kv_list_entry "$version" "" -} - -### list action ### - -describe_list() { - echo "List available MySQL versions to link to" -} - -do_list() { - versions=( $(find_versions) ) - current=$(get_current_version) - - write_list_start "Available MySQL versions:" - - if [[ -n "${versions[@]}" ]] ; then - local i - for (( i = 0 ; i < ${#versions[@]} ; i = i + 1 )) ; do - [[ ${versions[${i}]} == ${current} ]] && \ - versions[${i}]="${versions[${i}]} $(highlight '*' )" - done - write_numbered_list "${versions[@]}" - else - write_kv_list_entry "(none found)" "" - fi -} - -### set action ### - -describe_set() { - echo "Set MYSQL version used" -} - -do_set() { - [[ ${#@} -lt 1 ]] && - die -q "Wrong count of paramters." - local version - version=$(get_version_fromlist ${1}) - - if [[ ${version} == "${ERR_NOT_FOUND}" ]] ; then - die -q "I don't recognise that version of MYSQL" - fi - - set_current_version "$(version4bash "${version}")" - mysql_lib_symlinks -} - -### remove action ### - -describe_remove() { - echo "Remove symlinks of the default server" -} - -do_remove() { - - local version=$(readlink "${MYSQL_SYMLINK_CHECKDIR}/perror") - version=$(version4human "${version##*-}") - - if [[ -z "${version}" ]] ; then - die -q "No symlinks found" - fi - - remove_current_version "$(version4bash "${version}")" - mysql_lib_symlinks -} - -### slot_remove action ### - -describe_slot_remove() { - echo "Remove symlinks given a MySQL slot (used in the ebuild)" -} - -do_slot_remove() { - - [[ ${#@} -lt 1 ]] && - die -q "Wrong count of paramters." - local version=$( version4human ${1} ) - version=$( get_version_fromlist ${version} ) - local cur_version=$( get_current_version ) - - if [[ ${version} == "${ERR_NOT_FOUND}" ]] ; then - die -q "I don't recognise that version of MYSQL" - fi - - if [[ -z "${version}" ]] ; then - die -q "No symlinks found" - fi - - if [[ "${version}" != "${cur_version}" ]] ; then - die -q "The version specified is not the current one" - fi - - remove_current_version "$( version4bash "${version}" )" - mysql_lib_symlinks -} - -describe_distclean() { - echo "Remove ANY non slotted mysql and slotted symlinks, DANGEROUS" -} - -do_distclean() { - local bckfile="${HOME}/eselect-mysql-distclean-backup.tar.bz2" - local list=$( cat $ROOT/var/lib/eselect/mysql/mysql-*.filelist \ - | sed -e 's/-[0123456789][0123456789][0123456789]//' \ - | sort | uniq ) - touch "${bckfile}" || die -q "cannot create \"${bckfile}\"" - rm -f "${bckfile}" - pushd ${ROOT}/ &> /dev/null - tar -jcpf "${bckfile}" ${list} 2> /dev/null - for f in ${list} ; do - [[ "${f:0:3}" == "usr" ]] && rm -rf "${f}" - done - popd &> /dev/null - echo "backup created in \"${bckfile}\"" -} - -# vim: set ft=eselect : diff --git a/app-admin/eselect-mysql/metadata.xml b/app-admin/eselect-mysql/metadata.xml deleted file mode 100644 index da8ca5633ac4..000000000000 --- a/app-admin/eselect-mysql/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - -mysql - - vivo@gentoo.org - Francesco Riosa - -Utility to switch betwen slotted mysql installations. - -- 2.26.2