8 files changed, 43 insertions, 120 deletions
diff --git a/dev-db/mysqlcc/ChangeLog b/dev-db/mysqlcc/ChangeLog
index 60d2f86e7e14..dbbda335589f 100644
--- a/dev-db/mysqlcc/ChangeLog
+++ b/dev-db/mysqlcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysqlcc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlcc/ChangeLog,v 1.19 2004/06/29 16:53:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlcc/ChangeLog,v 1.20 2004/08/19 23:50:14 carlo Exp $
+
+*mysqlcc-0.9.4-r1 (20 Aug 2004)
+
+  20 Aug 2004; Carsten Lohrke <carlo@gentoo.org>
+  -files/mysqlcc-0.9.3-libmysqlclientac.patch,
+  +files/mysqlcc-0.9.4-shutdown.patch, -mysqlcc-0.9.3.ebuild,
+  +mysqlcc-0.9.4-r1.ebuild, -mysqlcc-0.9.4.ebuild:
+  stable on x86, will be package.masked shortly, #60745
 
   29 Jun 2004; Aron Griffis <agriffis@gentoo.org> mysqlcc-0.9.3.ebuild,
   mysqlcc-0.9.4.ebuild:
diff --git a/dev-db/mysqlcc/Manifest b/dev-db/mysqlcc/Manifest
index 1c74ba3bb22a..c9c068ad0300 100644
--- a/dev-db/mysqlcc/Manifest
+++ b/dev-db/mysqlcc/Manifest
@@ -1,8 +1,6 @@
-MD5 ab38210780d05c446163c1ea892024f1 mysqlcc-0.9.4.ebuild 1708
-MD5 981ba7f5a6de857f66757d4ce81b045a mysqlcc-0.9.3.ebuild 1682
-MD5 224bdbabd42cf92d7d0bb8b5a9733e6f ChangeLog 4036
+MD5 ee3b8179423bb4e5812159c18d365cbd mysqlcc-0.9.4-r1.ebuild 2029
+MD5 9c0b193d9573be663376e41b16c45dc8 ChangeLog 4332
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
+MD5 9a87cc1a1583e9c362223e05accc456a files/digest-mysqlcc-0.9.4-r1 69
 MD5 397bed4d44baa6b402b5d58c33bde803 files/mysqlcc-0.9.4-libmysqlclientac.patch 1556
-MD5 397bed4d44baa6b402b5d58c33bde803 files/mysqlcc-0.9.3-libmysqlclientac.patch 1556
-MD5 5e526165be4127bf54ef503255d56f16 files/digest-mysqlcc-0.9.3 69
-MD5 9a87cc1a1583e9c362223e05accc456a files/digest-mysqlcc-0.9.4 69
+MD5 ef9a677f776e77155ed7dabdb9a12e43 files/mysqlcc-0.9.4-shutdown.patch 364
diff --git a/dev-db/mysqlcc/files/digest-mysqlcc-0.9.3 b/dev-db/mysqlcc/files/digest-mysqlcc-0.9.3
deleted file mode 100644
index 61b867889804..000000000000
--- a/dev-db/mysqlcc/files/digest-mysqlcc-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d49fa0658cd8cf81ee5f64bc942b4e9 mysqlcc-0.9.3-src.tar.gz 746154
diff --git a/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4 b/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4-r1
index fc4c802ddded..fc4c802ddded 100644
--- a/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4
+++ b/dev-db/mysqlcc/files/digest-mysqlcc-0.9.4-r1
diff --git a/dev-db/mysqlcc/files/mysqlcc-0.9.3-libmysqlclientac.patch b/dev-db/mysqlcc/files/mysqlcc-0.9.3-libmysqlclientac.patch
deleted file mode 100644
index f6db1a6a6bd1..000000000000
--- a/dev-db/mysqlcc/files/mysqlcc-0.9.3-libmysqlclientac.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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/files/mysqlcc-0.9.4-shutdown.patch b/dev-db/mysqlcc/files/mysqlcc-0.9.4-shutdown.patch
new file mode 100644
index 000000000000..f3fb35acefee
--- /dev/null
+++ b/dev-db/mysqlcc/files/mysqlcc-0.9.4-shutdown.patch
@@ -0,0 +1,14 @@
+--- shared/src/CMySQL.cpp.orig  Thu Aug  5 12:26:14 2004
++++ shared/src/CMySQL.cpp       Thu Aug  5 12:29:53 2004
+@@ -451,7 +451,11 @@
+   if (!isConnected())
+     return false;
+   
++#if  ( MYSQL_VERSION_ID >= 40103 )
++  if (mysql_shutdown(mysql,SHUTDOWN_DEFAULT) != 0)
++#else
+   if (mysql_shutdown(mysql) != 0)
++#endif
+   {
+     if (emiterror)
+       emitError();
diff --git a/dev-db/mysqlcc/mysqlcc-0.9.3.ebuild b/dev-db/mysqlcc/mysqlcc-0.9.3.ebuild
deleted file mode 100644
index 02311ac0724f..000000000000
--- a/dev-db/mysqlcc/mysqlcc-0.9.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlcc/mysqlcc-0.9.3.ebuild,v 1.6 2004/06/29 16:53:38 agriffis 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/libc
-	>=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
-}
diff --git a/dev-db/mysqlcc/mysqlcc-0.9.4.ebuild b/dev-db/mysqlcc/mysqlcc-0.9.4-r1.ebuild
index cbee1fe0e6a8..b67eeb248c71 100644
--- a/dev-db/mysqlcc/mysqlcc-0.9.4.ebuild
+++ b/dev-db/mysqlcc/mysqlcc-0.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.7 2004/06/29 16:53:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlcc/mysqlcc-0.9.4-r1.ebuild,v 1.1 2004/08/19 23:50:14 carlo Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQLC
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE="ssl"
 
 DEPEND="virtual/libc
@@ -20,11 +20,24 @@ DEPEND="virtual/libc
 
 RDEPEND=""
 
+
+pkg_setup() {
+	echo ""
+	ewarn "Development of MySQLGUI has been suspended. Please use another application."
+	ewarn "The ebuild will be masked and removed after a while"
+	echo ""
+	ewarn "Known problems: #29689, #57308 Please don't report bugs, as they won't be fixed."
+	echo ""
+}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/${P}-libmysqlclientac.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-libmysqlclientac.patch
+	epatch ${FILESDIR}/${P}-shutdown.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