Cleanup a few minor things.

4 files changed, 15 insertions, 11 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/Manifest b/dev-db/mysql/Manifest
index afa8c12a5659..31c114b9f143 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,5 +1,5 @@
 MD5 a088b749386760cae4d09caf14f39c84 mysql-4.0.22-r1.ebuild 9269
-MD5 5fbcfef88204488f93362e1b1ae57029 mysql-4.0.24-r2.ebuild 13729
+MD5 1975292a4eeae0ebd6c3e077d42f22c1 mysql-4.0.24-r2.ebuild 13727
 MD5 ca4242e577d3b1b6f69cfa80142c320f mysql-3.23.58.ebuild 6640
 MD5 a4e6b738e389c33c3c9e19b8fb5b8fa3 mysql-4.0.23.ebuild 9040
 MD5 80c210f51c3c19afc810c5fb9fc67c7b mysql-4.0.23-r2.ebuild 9407
@@ -10,9 +10,9 @@ MD5 9bb11a2e8c8e579009cb712fd7a8bf66 mysql-4.0.22-r2.ebuild 9602
 MD5 d436e793baae2f71669b96381ce2959b mysql-3.23.58-r1.ebuild 6759
 MD5 135c8d82ff80aa2d7d3b1df75719dd00 mysql-4.1.8.ebuild 9087
 MD5 be85068e1f8dd9340882814ae10e1763 mysql-4.0.23-r1.ebuild 9160
-MD5 8351f8ad1438dd1f32b35dfb325899aa mysql-4.1.12.ebuild 15531
+MD5 e9a52cb618c165c3de8d9b4a3e6a4a8f mysql-4.1.12.ebuild 15528
 MD5 f26f6906248f45f5f0d23248a39c03a4 mysql-4.0.24.ebuild 9816
-MD5 463eeab51f80ad586fcebd7cf6c9605b ChangeLog 31439
+MD5 d8688fbdf79fd006399678fe8906a416 ChangeLog 31570
 MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
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 \