Robin H. Johnson (robbat2) wrote: > robbat2 09/02/11 11:27:13 > > Modified: mysql.eclass > Log: > Fix PDEPEND for build order. > > Revision Changes Path > 1.104 eclass/mysql.eclass > > file : > http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.104&view=markup > plain: > http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.104&content-type=text/plain > diff : > http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.103&r2=1.104 > > Index: mysql.eclass > =================================================================== > RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v > retrieving revision 1.103 > retrieving revision 1.104 > diff -p -w -b -B -u -u -r1.103 -r1.104 > --- mysql.eclass 12 Jan 2009 23:08:17 -0000 1.103 > +++ mysql.eclass 11 Feb 2009 11:27:13 -0000 1.104 > @@ -1,6 +1,6 @@ > # Copyright 1999-2007 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.103 2009/01/12 > 23:08:17 maekke Exp $ > +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.104 2009/02/11 > 11:27:13 robbat2 Exp $ > > # Author: Francesco Riosa (Retired) <v...@gentoo.org> > # Maintainer: MySQL Team <mysql-b...@gentoo.org> > @@ -10,7 +10,7 @@ > WANT_AUTOCONF="latest" > WANT_AUTOMAKE="latest" > > -inherit eutils flag-o-matic gnuconfig autotools mysql_fx > +inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator > > # Shorten the path because the socket path length must be shorter than 107 > chars > # and we will run a mysql server during test phase > @@ -83,6 +83,9 @@ mysql_version_is_at_least "5.1.12" \ > # dev-perl/DBD-mysql is needed by some scripts installed by MySQL > PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" > > +# For other stuff to bring us in > +PDEPEND="${PDEPEND} =virtual/mysql-$(get_version_component_range 1-2 ${PV})" > + > # Work out the default SERVER_URI correctly > if [ -z "${SERVER_URI}" ]; then > # The community build is on the mirrors
This breaks installing MySQL: nelchael ~ # emerge -avt dev-db/mysql These are the packages that would be merged, in reverse order: Calculating dependencies... done! [nomerge ] dev-db/mysql-5.0.76 USE="berkdb ssl -big-tables -cluster -debug -embedded -extraengine -latin1 -max-idx-128 -minimal -perl (-selinux) -static" [ebuild N ] dev-db/mysql-community-5.0.67 USE="berkdb ssl -big-tables -cluster -debug -embedded -extraengine -latin1 -max-idx-128 -minimal -perl (-selinux) -static" 27,810 kB [ebuild N ] virtual/mysql-5.0 0 kB [ebuild N ] dev-db/mysql-5.0.76 USE="berkdb ssl -big-tables -cluster -debug -embedded -extraengine -latin1 -max-idx-128 -minimal -perl (-selinux) -static" 33,717 kB [ebuild N ] dev-db/mysql-init-scripts-1.2 0 kB [ebuild N ] sys-apps/ed-1.2 88 kB [blocks B ] dev-db/mysql ("dev-db/mysql" is blocking dev-db/mysql-community-5.0.67) [blocks B ] dev-db/mysql-community ("dev-db/mysql-community" is blocking dev-db/mysql-5.0.76) Total: 5 packages (5 new), Size of downloads: 61,615 kB Conflict: 2 blocks (2 unsatisfied) * Error: The above package list contains packages which cannot be * installed at the same time on the same system. ('ebuild', '/', 'dev-db/mysql-5.0.76', 'merge') pulled in by =dev-db/mysql-5.0* required by ('ebuild', '/', 'virtual/mysql-5.0', 'merge') =dev-db/mysql-5.0* required by ('ebuild', '/', 'dev-db/mysql-community-5.0.67', 'merge') dev-db/mysql For more information about Blocked Packages, please refer to the following section of the Gentoo Linux x86 Handbook (architecture is irrelevant): http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?full=1#blocked -- Krzysztof Pawlik <nelchael at gentoo.org> key id: 0xBC555551 desktop-misc, java, apache, ppc, vim, kernel, python...
signature.asc
Description: OpenPGP digital signature