From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RcvHu-0006gp-2C for garchives@archives.gentoo.org; Tue, 20 Dec 2011 08:43:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10D0C21C0C7; Tue, 20 Dec 2011 08:42:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C18AF21C0B4 for ; Tue, 20 Dec 2011 08:42:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14FFE1B401E for ; Tue, 20 Dec 2011 08:42:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2B90780056 for ; Tue, 20 Dec 2011 08:42:41 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-autotools.eclass eclass/mysql-cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: d5df6ff8a13bf996a0b4779609f692e94bfa0b5b Date: Tue, 20 Dec 2011 08:42:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4e2948e0-e6f9-48ee-9c7d-8bdc38e3bb49 X-Archives-Hash: 495839dbd79d772becca2174692e014a commit: d5df6ff8a13bf996a0b4779609f692e94bfa0b5b Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Tue Dec 20 08:15:59 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Tue Dec 20 08:15:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3Dd5df6ff8 Use ${D} and not ${ED} with the mysql variables as they already have ${EP= REFIX}. --- eclass/mysql-autotools.eclass | 8 ++++---- eclass/mysql-cmake.eclass | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclas= s index f2a7747..fb40456 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -543,23 +543,23 @@ mysql-autotools_src_install() { for removeme in "mysql-log-rotate" mysql.server* \ binary-configure* my-*.cnf mi_test_all* do - rm -f "${ED}"/${MY_SHAREDSTATEDIR}/${removeme} + rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme} done =20 # Clean up stuff for a minimal build if use minimal ; then einfo "Remove all extra content for minimal build" - rm -Rf "${ED}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} + rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation= ,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensi= ons,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},my= isam*,isam*,pack_isam} rm -f "${ED}/usr/sbin/mysqld" - rm -f "${ED}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isa= mmrg,isam},vio,dbug}.a + rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isam= mrg,isam},vio,dbug}.a fi =20 # Unless they explicitly specific USE=3Dtest, then do not install the # testsuite. It DOES have a use to be installed, esp. when you want to = do a # validation of your database configuration after tuning it. if use !test ; then - rm -rf "${ED}"/${MY_SHAREDSTATEDIR}/mysql-test + rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test fi =20 # Configuration stuff diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index d792cf9..63aae6c 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -276,17 +276,17 @@ mysql-cmake_src_install() { # Clean up stuff for a minimal build # if use minimal ; then # einfo "Remove all extra content for minimal build" -# rm -Rf "${ED}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} +# rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} # rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installatio= n,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extens= ions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},m= yisam*,isam*,pack_isam} # rm -f "${ED}/usr/sbin/mysqld" -# rm -f "${ED}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,is= ammrg,isam},vio,dbug}.a +# rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isa= mmrg,isam},vio,dbug}.a # fi =20 # Unless they explicitly specific USE=3Dtest, then do not install the # testsuite. It DOES have a use to be installed, esp. when you want to = do a # validation of your database configuration after tuning it. if ! use test ; then - rm -rf "${ED}"/${MY_SHAREDSTATEDIR}/mysql-test + rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test fi =20 # Configuration stuff