version bump, bug #91311.

6 files changed, 92 insertions, 4 deletions

diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog
index eb8ba4f3760c..6d8c21da91d4 100644
--- a/dev-db/mysql++/ChangeLog
+++ b/dev-db/mysql++/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2005/04/21 20:44:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.33 2005/05/17 19:15:01 robbat2 Exp $
+
+*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
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 4431a7881726..bce06de603d7 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,4 +1,7 @@
+MD5 5918f64d336862770b8081dfefccd8e9 mysql++-1.7.34.ebuild 1776
+MD5 79edf250b54e7c55177025dad391bfb1 mysql++-1.7.26.ebuild 1720
 MD5 980aa1ebff9591f15644623d909f53d6 ChangeLog 5152
 MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
-MD5 3c72a6d14f9a3d16403a8b0cd7418d9e mysql++-1.7.26.ebuild 1724
+MD5 3209530832d5be69aaf88e4c55ae8767 files/patch-1.7.34-typo_correction 558
 MD5 65084d7d1a78fed8de0e81c773c9eeab files/digest-mysql++-1.7.26 66
+MD5 4148208d24ae6b00dd0ccd48445903af files/digest-mysql++-1.7.34 67
diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.34 b/dev-db/mysql++/files/digest-mysql++-1.7.34
new file mode 100644
index 000000000000..961ccc0a8ebe
--- /dev/null
+++ b/dev-db/mysql++/files/digest-mysql++-1.7.34
@@ -0,0 +1 @@
+MD5 2ed3b7a08ff773805cb2f4f00f028274 mysql++-1.7.34.tar.gz 1526211
diff --git a/dev-db/mysql++/files/patch-1.7.34-typo_correction b/dev-db/mysql++/files/patch-1.7.34-typo_correction
new file mode 100644
index 000000000000..be810ca44006
--- /dev/null
+++ b/dev-db/mysql++/files/patch-1.7.34-typo_correction
@@ -0,0 +1,12 @@
+diff -urN ./mysql++-1.7.34-old/lib/sql_query.h ./mysql++-1.7.34/lib/sql_query.h
+--- ./mysql++-1.7.34-old/lib/sql_query.h	2005-04-30 15:24:32.000000000 +0200
++++ ./mysql++-1.7.34/lib/sql_query.h	2005-05-03 16:01:43.000000000 +0200
+@@ -315,7 +315,7 @@
+ 		// See above comment for cast rationale
+ 		dynamic_cast<std::stringstream&>(*this) << "INSERT INTO " <<
+ 				first->table() << " (" << first->field_list() <<
+-				") VALUES (" << fist->value_list() << ')';
++				") VALUES (" << first->value_list() << ')';
+ 
+ 		Iter it = first + 1;
+ 		while (it != last) {
diff --git a/dev-db/mysql++/mysql++-1.7.26.ebuild b/dev-db/mysql++/mysql++-1.7.26.ebuild
index 4e9d132dd0da..b9d4eb843a51 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.6 2005/04/21 20:44:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.26.ebuild,v 1.7 2005/05/17 19:15:01 robbat2 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
diff --git a/dev-db/mysql++/mysql++-1.7.34.ebuild b/dev-db/mysql++/mysql++-1.7.34.ebuild
new file mode 100644
index 000000000000..2905373dda77
--- /dev/null
+++ b/dev-db/mysql++/mysql++-1.7.34.ebuild
@@ -0,0 +1,66 @@
+# 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 $
+
+inherit eutils gnuconfig
+
+DESCRIPTION="C++ API interface to the MySQL database"
+# This is the download page but includes links to other places
+HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html"
+SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~hppa ~mips ~sparc ~ppc ~amd64"
+IUSE=""
+
+DEPEND=">=dev-db/mysql-4.0
+		>=sys-devel/gcc-3"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	epatch ${FILESDIR}/patch-1.7.34-typo_correction
+}
+
+src_compile() {
+	gnuconfig_update
+	local myconf
+	# we want C++ exceptions turned on
+	myconf="--enable-exceptions"
+	# We do this because of the large number of header files installed to
+	# the include directory
+	# This is a breakage compared to previous versions that installed
+	# straight to /usr/include
+	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}" \
+	econf ${myconf} || die "econf failed"
+
+	emake || die "unable to make"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	# install the docs and HTML pages
+	dodoc README LGPL
+	dodoc doc/*
+	dohtml doc/man-html/*
+	prepalldocs
+	warning_movedir
+}
+
+pkg_postinst() {
+	warning_movedir
+}
+
+warning_movedir() {
+	ewarn "The MySQL++ include directory has changed compared to previous"
+	ewarn "versions.  It was previously /usr/include, but now it is"
+	ewarn "/usr/include/mysql++"
+}
+
+