Version bumped

4 files changed, 113 insertions, 2 deletions

diff --git a/dev-db/mysqlcc/Manifest b/dev-db/mysqlcc/Manifest
index 95d837722e64..f698d1e3ef1e 100644
--- a/dev-db/mysqlcc/Manifest
+++ b/dev-db/mysqlcc/Manifest
@@ -1,9 +1,9 @@
-MD5 d5e9abb3f14bcbbf87f3d5f19b9237b2 ChangeLog 3502
+MD5 554abb51290b02b4d7a4e32b05b730fe ChangeLog 3625
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 9f313aea593f1e6c58f116c2e86fb510 mysqlcc-0.8.7-r1.ebuild 1658
 MD5 d8717cdcfc4f917a46e3817e810168ee mysqlcc-0.9.2.ebuild 1757
 MD5 5a0468d9c79896eb8559ef5bb9cfeb33 mysqlcc-0.9.3.ebuild 1697
-MD5 5a0468d9c79896eb8559ef5bb9cfeb33 mysqlcc-0.9.4.ebuild 1697
+MD5 8985e140d9dfce8d9ee7f8c64cc678f3 mysqlcc-0.9.4.ebuild 1700
 MD5 efaa2abbdf5d66f7120aabe7c54e8c8b files/digest-mysqlcc-0.8.7-r1 69
 MD5 3cc836a398f018fc7036b02ea4cd75bd files/digest-mysqlcc-0.9.2 69
 MD5 5e526165be4127bf54ef503255d56f16 files/digest-mysqlcc-0.9.3 69
@@ -13,3 +13,4 @@ MD5 397bed4d44baa6b402b5d58c33bde803 files/mysqlcc-0.9.2-libmysqlclientac.patch
 MD5 e48e1ab6620b5a1832372ff3da78ea86 files/mysqlcc-0.9.2-qmakespec.patch 631
 MD5 397bed4d44baa6b402b5d58c33bde803 files/mysqlcc-0.9.3-libmysqlclientac.patch 1556
 MD5 9a87cc1a1583e9c362223e05accc456a files/digest-mysqlcc-0.9.4 69
+MD5 397bed4d44baa6b402b5d58c33bde803 files/mysqlcc-0.9.4-libmysqlclientac.patch 1556
diff --git a/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4 b/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4
new file mode 100644
index 000000000000..fc4c802ddded
--- /dev/null
+++ b/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4
@@ -0,0 +1 @@
+MD5 26ee3528dce690b227d8bfb71b46ae66 mysqlcc-0.9.4-src.tar.gz 747244
diff --git a/dev-db/mysqlcc/files/mysqlcc-0.9.4-libmysqlclientac.patch b/dev-db/mysqlcc/files/mysqlcc-0.9.4-libmysqlclientac.patch
new file mode 100644
index 000000000000..f6db1a6a6bd1
--- /dev/null
+++ b/dev-db/mysqlcc/files/mysqlcc-0.9.4-libmysqlclientac.patch
@@ -0,0 +1,46 @@
+--- acinclude.m4.orig	2003-03-04 01:07:26.000000000 -0800
++++ acinclude.m4	2003-03-04 12:46:35.000000000 -0800
+@@ -6,34 +6,15 @@
+         AC_MSG_CHECKING([for libmysqlclient])
+         AC_MSG_RESULT()
+ 
+-        mysql_ok=no
+-
+-        SAVE_LIBS=$LIBS
+-    
+-        mysql_lib="$mysql_lib /usr/lib /usr/lib/mysql \
+-                   /usr/local/lib /usr/local/lib/mysql \
+-                   /usr/local/mysql/lib"
+-    
+-        for dir in $mysql_lib; do
+-            if test "x$mysql_found" != "xyes"
+-            then
+-                AC_CHECK_FILE("$dir/libmysqlclient.a",
+-                              mysql_found=yes, mysql_found=no)
+-                if test "x$mysql_found" = "xyes"
+-                then
+-                    LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB"
+-                    MYSQL_LIB="$dir/libmysqlclient.a $LIBZ_LIB"
+-                    AC_SUBST(MYSQL_LIB)
+-                    AC_CHECK_LIB(mysqlclient, mysql_real_connect,
+-                                 mysql_ok=yes, mysql_ok=no)
+-                fi
+-            fi
+-        done
+-
+-        if test "x$mysql_ok" != "xyes"
+-        then
+-            AC_MSG_ERROR([Could not find libmysqlclient in '$mysql_lib'])
+-        fi
++	# dependencies are guaranteed to ensure we have mysql_config
++	# available, and it is a much cleaner way of discovering what
++	# must be linked against libmysqlclient, that transparently
++	# covers USE="ssl" and other issues.
++	# Robert Coie <rac@gentoo.org> 2003.03.04
++
++	mysql_ok=yes
++	MYSQL_LIB=`mysql_config --libs`
++	LIBS="${LIBS} ${MYSQL_LIB}"
+ ])
+ 
+ 
diff --git a/dev-db/mysqlcc/mysqlcc-0.9.4.ebuild b/dev-db/mysqlcc/mysqlcc-0.9.4.ebuild
new file mode 100644
index 000000000000..c4c66cce3871
--- /dev/null
+++ b/dev-db/mysqlcc/mysqlcc-0.9.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlcc/mysqlcc-0.9.4.ebuild,v 1.1 2003/12/29 10:01:37 mholzer Exp $
+
+inherit eutils
+
+S=${WORKDIR}/${P}-src
+DESCRIPTION="a MySQL GUI Client"
+HOMEPAGE="http://www.mysql.com/"
+SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQLCC/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="ssl"
+
+DEPEND="virtual/glibc
+	>=dev-db/mysql-4.0.0
+	>=x11-libs/qt-3.0.5"
+
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}; epatch ${FILESDIR}/${P}-libmysqlclientac.patch
+}
+
+src_compile() {
+	# The config.sub in this distribution appears to be very stale
+	# so we replace it with one from a known better source.  I am
+	# not attached to using 1.4, but it seemed like it had the best
+	# chance of compatibility.
+	# Robert Coie <rac@gentoo.org> 2003.03.03
+	if [ -e /usr/share/automake-1.4/config.sub ]; then
+		cp /usr/share/automake-1.4/config.sub ${S}
+	fi
+	cd ${S}; autoreconf -f;
+
+	if [ "`use ssl`" ]; then
+		SUBLIBS="${SUBLIBS} -lssl"
+		echo "libs now ${SUBLIBS}"
+	fi
+
+	QMAKESPEC="linux-g++" LIBS=${LIBS} econf --with-qt=${QTDIR} || die
+
+	cp Makefile Makefile.orig
+	sed -e "s:CFLAGS   = -pipe -Wall -W -O2:CFLAGS   = ${CFLAGS}:" \
+		-e "s:CXXFLAGS = -pipe -Wall -W -O2:CXXFLAGS = ${CXXFLAGS}:" \
+		Makefile.orig > Makefile
+
+	QTDIR=$QTDIR
+	emake || die
+}
+
+src_install() {
+	dobin mysqlcc
+	dodir /usr/share/mysqlcc
+	insinto /usr/share/mysqlcc
+	doins warning.wav information.wav error.wav syntax.txt
+	dodir /usr/share/mysqlcc/translations
+	insinto /usr/share/mysqlcc/translations
+	doins translations/*.qm  translations/*.ts
+}