diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2005-05-17 17:16:26 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-05-17 17:16:26 +0000 |
| commit | 43609fcae68ce33af3e899effc80899bcaeb2615 (patch) | |
| tree | f756bd85577215c9e2d5b0bd6f606d14e38139ac | |
| parent | version bump (diff) | |
| download | gentoo-2-43609fcae68ce33af3e899effc80899bcaeb2615.tar.gz gentoo-2-43609fcae68ce33af3e899effc80899bcaeb2615.tar.bz2 gentoo-2-43609fcae68ce33af3e899effc80899bcaeb2615.zip | |
Cleanup a few minor things.
| -rw-r--r-- | dev-db/mysql/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-4.0.24-r2.ebuild | 6 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-4.1.12.ebuild | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 3f53567c6c2b..7e89baff3446 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.198 2005/05/17 17:06:49 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.199 2005/05/17 17:16:26 robbat2 Exp $ + + 17 May 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.24-r2.ebuild, + mysql-4.1.12.ebuild: + Cleanup a few minor things. 17 May 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.1.12.ebuild: Add back ~sparc ~ia64 ~ppc as they had marked an earlier 4.1 release as diff --git a/dev-db/mysql/mysql-4.0.24-r2.ebuild b/dev-db/mysql/mysql-4.0.24-r2.ebuild index 0d39cab8b6df..ecbb94cf8ddb 100644 --- a/dev-db/mysql/mysql-4.0.24-r2.ebuild +++ b/dev-db/mysql/mysql-4.0.24-r2.ebuild @@ -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/dev-db/mysql/mysql-4.0.24-r2.ebuild,v 1.1 2005/05/17 09:08:46 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.24-r2.ebuild,v 1.2 2005/05/17 17:16:26 robbat2 Exp $ inherit eutils gnuconfig flag-o-matic versionator @@ -30,7 +30,7 @@ DEPEND="readline? ( >=sys-libs/readline-4.1 ) >=sys-apps/texinfo-4.7-r1 sys-process/procps >=sys-apps/sed-4" -RDEPEND="${DEPEND} +RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )" # dev-perl/DBD-mysql is needed by some scripts installed by MySQL PDEPEND="perl? ( dev-perl/DBD-mysql )" @@ -212,7 +212,7 @@ src_compile() { #the compiler flags are as per their "official" spec ;) #CFLAGS="${CFLAGS/-O?/} -O3" \ - export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" + export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" econf \ -C \ diff --git a/dev-db/mysql/mysql-4.1.12.ebuild b/dev-db/mysql/mysql-4.1.12.ebuild index 480ae0b9ccfb..0e1a2c70f7e8 100644 --- a/dev-db/mysql/mysql-4.1.12.ebuild +++ b/dev-db/mysql/mysql-4.1.12.ebuild @@ -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/dev-db/mysql/mysql-4.1.12.ebuild,v 1.2 2005/05/17 17:06:49 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.12.ebuild,v 1.3 2005/05/17 17:16:26 robbat2 Exp $ inherit eutils gnuconfig flag-o-matic versionator @@ -80,7 +80,7 @@ pkg_setup() { if has_version "<=dev-db/mysql-4.1.4" \ && ! built_with_use dev-db/mysql minimal ; then mysql_upgrade_error - #die + die fi fi mysql_upgrade_warning @@ -110,7 +110,7 @@ src_unpack() { # i would really prefer to fix this at the Makefile.am level, but can't # get the software to autoreconf as distributed - too many missing files epatch "${FILESDIR}/${PN}-4.1.9-thrssl.patch" - + # PIC fixes # bug #42968 #EPATCH_OPTS="-p1 -d ${S}" \ @@ -440,7 +440,7 @@ pkg_config() { --socket=${ROOT}/var/run/mysqld/mysqld.sock \ -hlocalhost \ -e "${sql}" - + einfo "Loading \"zoneinfo\" this step may require few seconds" ${ROOT}/usr/bin/mysql \ |