6 files changed, 154 insertions, 15 deletions
diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog
index 14de8ff4f967..204ad0b56aee 100644
--- a/dev-db/mysql++/ChangeLog
+++ b/dev-db/mysql++/ChangeLog
@@ -1,8 +1,144 @@
 # ChangeLog for dev-db/mysql++
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.1 2002/12/11 22:57:52 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
+*mysql++-2.0.4 (13 Sep 2005)
+
+  13 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> +mysql++-2.0.4.ebuild:
+  Bug #105554, version bump.
+
+*mysql++-1.7.26 (17 May 2005)
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org> +mysql++-1.7.34.ebuild, 
+  +files/patch-1.7.34-typo_correction:
+  version bump, bug #91311.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> mysql++-1.7.26.ebuild:
+  stable on amd64
+
+  13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  -files/mysql++-1.7.9-gcc_throw.patch, -files/mysql++-1.7.9-missing.patch,
+  -files/mysql++-1.7.9-mysql4-gcc295.patch,
+  -files/mysql++-1.7.9-mysql4-gcc3.patch,
+  -files/mysql++-1.7.9-r5_gcc333.patch, -files/mysql++-1.7.9_example.patch,
+  -files/mysql++-1.7.9_gcc333.patch, -mysql++-1.7.9-r3.ebuild,
+  -mysql++-1.7.9-r4.ebuild:
+  Remove old builds as they were broken in lots of cases on modern systems.
+
+  28 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> mysql++-1.7.26.ebuild:
+  Stable on ppc.
+
+  17 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> mysql++-1.7.26.ebuild:
+  Stable on alpha, bug 78029.
+
+  15 Jan 2005; Jason Wever <weeve@gentoo.org> mysql++-1.7.26.ebuild:
+  Stable on sparc wrt bug #78029.
+
+  14 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  -mysql++-1.7.9-r2.ebuild, -mysql++-1.7.9-r5.ebuild,
+  -mysql++-1.7.9-r6.ebuild, -mysql++-1.7.9.ebuild:
+  Remove some broken old versions, and stabilize .26 on x86.
+
+*mysql++-1.7.26 (10 Jan 2005)
+
+  10 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> +mysql++-1.7.26.ebuild:
+  Bug #72069, a new upstream version finally (after 3 years), and we can now
+  rip out all of the nasty patching.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  14 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9.ebuild:
+  bug #60345.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> mysql++-1.7.9-r1.ebuild,
+  mysql++-1.7.9-r2.ebuild, mysql++-1.7.9-r3.ebuild, mysql++-1.7.9-r4.ebuild,
+  mysql++-1.7.9-r5.ebuild, mysql++-1.7.9-r6.ebuild, mysql++-1.7.9.ebuild:
+  sync IUSE (missing)
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> mysql++-1.7.9-r3.ebuild:
+  Stable on sparc.
+
+*mysql++-1.7.9-r6 (18 Jun 2004)
+
+  18 Jun 2004; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r6.ebuild:
+  fix bug bug #54220, and bug #49823 hopefully.
+
+*mysql++-1.7.9-r5 (13 May 2004)
+
+  13 May 2004; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r5.ebuild,
+  files/mysql++-1.7.9-r5_gcc333.patch:
+  fix bug #50442 in -r5.
+
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> mysql++-1.7.9-r4.ebuild:
+  Stable on alpha.
+
+*mysql++-1.7.9-r4 (03 May 2004)
+
+  03 May 2004; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r4.ebuild,
+  files/mysql++-1.7.9_gcc333.patch:
+  patch for gcc3.3.3, bug #49590.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> mysql++-1.7.9-r1.ebuild,
+  mysql++-1.7.9-r2.ebuild, mysql++-1.7.9-r3.ebuild:
+  Add die following econf for bug 48950
+
+  12 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> mysql++-1.7.9-r3.ebuild:
+  added gnuconfig_update for amd64 only; marked ~amd64 (fixes bug #47296)
+
+*mysql++-1.7.9-r3 (26 Oct 2003)
+
+  26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r3.ebuild,
+  files/mysql++-1.7.9-missing.patch:
+  new revision to fix bug #29840
+
+  16 Sep 2003; Seemant Kulleen <seemant@gentoo.org> mysql++-1.7.9-r2.ebuild:
+  compiles on gcc-3.3 now
+
+*mysql++-1.7.9-r2 (17 Aug 2003)
+
+  17 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r2.ebuild:
+  add latest patches, should fix #23621
+
+  02 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r1.ebuild:
+  $A should NOT be quoted at all in an unpack call
+
+  12 Jun 2003; <msterret@gentoo.org> mysql++-1.7.9.ebuild:
+  fix Header
+
+*mysql++-1.7.9-r1 (08 May 2003)
+
+  11 May 2003; Robin Johnson <robbat2@gentoo.org> mysql++-1.7.9-r1.ebuild:
+  Moved to stable on x86.
+
+  08 May 2003; Robin Johnson <robbat2@gentoo.org> : mysql++-1.7.9-r1.ebuild,
+  files/mysql++-1.7.9-gcc_throw.patch,
+  files/mysql++-1.7.9-mysql4-gcc295.patch,
+  files/mysql++-1.7.9-mysql4-gcc3.patch, files/mysql++-gcc-3.2.patch:
+  Import many fixes for MySQL++ so it works with MySQLv4, as well as removing
+  warnings and other bumpf. Also made sure CFLAGS/CXXFLAGS get used in the
+  compile (they were not previously).
+  Moved the include directory to /usr/include/mysql++ due to breakage caused
+  by the large number of files put into it (it overwrote some other headers); 
+  This may break some other code, testing is needed!
+  Bugs #15688, #20635 resolved.
+  Now use epatch instead of patch to apply patches easier as well.
+  
 *mysql++-1.7.9 (11 Dec 2002)
+  
+  08 May 2003; Robin Johnson <robbat2@gentoo.org> mysql++-1.7.9.ebuild:
+  Moved files/mysql++-gcc-3.2.patch to DISTDIR and gzipped it.
+  Also changed mysql++-gcc-3.2.patch to use the gzipped version
+
+  09 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  mysql++-1.7.9.ebuild:
+  Patching only if gcc3. Closes #12773.
+
+  16 Mar 2003; <rac@gentoo.org> mysql++-1.7.9.ebuild:
+  Change DISTFILES to DISTDIR for gcc 3.0 patch - fix bug #17640
+
+  13 Jan 2003; Ryan Phillips <rphillips@gentoo.org> :
+  Removed gcc 3.0 and moved it to ibiblio... removing bloat
 
   11 Dec 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   Initial version
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 0a6d328365dc..f77acd19dd0b 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,6 +1,9 @@
-MD5 da09be5b667366019db93ea42670c02c ChangeLog 554
-MD5 50887df9dae488f9721a7791af0810bb mysql++-1.7.9.ebuild 1543
-MD5 1ae3ec3d9b5337f7805820b0f2d4338c mysql++-1.7.9.ebuild.org 1540
-MD5 bfb4832312c6add08412a9367bab5d19 files/digest-mysql++-1.7.9 133
-MD5 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203
-MD5 f4467c7ece50c1e366a80887cc2618b1 files/mysql++-gcc-3.2.patch 12811
+MD5 88516f8b28e9cd9fb72310d2da338721 mysql++-1.7.34.ebuild 1778
+MD5 5e750c5bb811880fe4781cd2d8e7fe58 mysql++-2.0.4.ebuild 1321
+MD5 e896a14164f3557f60938f4874e9548f mysql++-1.7.26.ebuild 1722
+MD5 e226f2fbbc6ec167a1f9bf78f0504720 ChangeLog 5467
+MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
+MD5 3209530832d5be69aaf88e4c55ae8767 files/patch-1.7.34-typo_correction 558
+MD5 629a86ff2c7bff12eab3da2b4bc58dca files/digest-mysql++-2.0.4 66
+MD5 65084d7d1a78fed8de0e81c773c9eeab files/digest-mysql++-1.7.26 66
+MD5 4148208d24ae6b00dd0ccd48445903af files/digest-mysql++-1.7.34 67
diff --git a/dev-db/mysql++/metadata.xml b/dev-db/mysql++/metadata.xml
index dbfe84ca36cf..716e7d4301bd 100644
--- a/dev-db/mysql++/metadata.xml
+++ b/dev-db/mysql++/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql-bugs</herd>
+<herd>mysql</herd>
 </pkgmetadata>
diff --git a/dev-db/mysql++/mysql++-1.7.26.ebuild b/dev-db/mysql++/mysql++-1.7.26.ebuild
index 680a18adefa5..5f68be7ae578 100644
--- a/dev-db/mysql++/mysql++-1.7.26.ebuild
+++ b/dev-db/mysql++/mysql++-1.7.26.ebuild
@@ -1,8 +1,8 @@
 # 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++-1.7.26.ebuild,v 1.1 2005/01/10 21:16:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.26.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
-inherit gcc eutils gnuconfig
+inherit eutils gnuconfig
 
 DESCRIPTION="C++ API interface to the MySQL database"
 # This is the download page but includes links to other places
@@ -11,7 +11,7 @@ SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~hppa ~mips ~sparc ~ppc ~amd64"
+KEYWORDS="x86 alpha ~hppa ~mips sparc ppc amd64"
 IUSE=""
 
 DEPEND=">=dev-db/mysql-4.0
@@ -33,7 +33,7 @@ src_compile() {
 	myconf="${myconf} --includedir=/usr/include/mysql++"
 	# not including the directives to where MySQL is because it seems to
 	# find it just fine without
-	
+
 	# force the cflags into place otherwise they get totally ignored by
 	# configure
 	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
diff --git a/dev-db/mysql++/mysql++-1.7.34.ebuild b/dev-db/mysql++/mysql++-1.7.34.ebuild
index 2905373dda77..3d2c300ad98e 100644
--- a/dev-db/mysql++/mysql++-1.7.34.ebuild
+++ b/dev-db/mysql++/mysql++-1.7.34.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++-1.7.34.ebuild,v 1.1 2005/05/17 19:15:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.34.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 inherit eutils gnuconfig
 
diff --git a/dev-db/mysql++/mysql++-2.0.4.ebuild b/dev-db/mysql++/mysql++-2.0.4.ebuild
index 32a6d1d442e6..b5bddd0bfed4 100644
--- a/dev-db/mysql++/mysql++-2.0.4.ebuild
+++ b/dev-db/mysql++/mysql++-2.0.4.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++-2.0.4.ebuild,v 1.1 2005/09/13 14:28:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-2.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 inherit eutils gnuconfig