Add patch for GCC 4.3. Fix quoting issues.

Package-Manager: portage-2.2_pre5

4 files changed, 37 insertions, 8 deletions

diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog
index aaed0c54bb32..241751d82613 100644
--- a/dev-db/mysql++/ChangeLog
+++ b/dev-db/mysql++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql++
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.50 2008/01/16 05:37:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.51 2008/04/21 03:00:49 dirtyepic Exp $
+
+  21 Apr 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/mysql++-2.3.2-gcc-4.3.patch, mysql++-2.3.2.ebuild:
+  Add patch for GCC 4.3. Fix quoting issues.
 
   16 Jan 2008; Robin H. Johnson <robbat2@gentoo.org>
   -files/patch-1.7.34-typo_correction, -mysql++-1.7.26.ebuild,
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index fe2b32c73677..7eb92565cc55 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mysql++-2.3.2-gcc-4.3.patch 358 RMD160 d6723bcc4ae1f5983ec8b2205e2f2505934ff7af SHA1 91521be39f51b8ccaa15071e9a766f4c91c57492 SHA256 0251cb84e6a768f2a2a4a280f1aa8988b314770993aceeb204c5d6a7afbb11d1
 AUX mysql++-signed-char-fix-try2.diff 1530 RMD160 2bd294faa8070ca99d31e0cb7643f28d0ad62274 SHA1 779d3e431c94607d854b563ac38b6c574c1e3f6c SHA256 2fe3bb616326cad0738130e1fb81c3150ec4810153646cd7886c06fc701fd112
 DIST mysql++-2.2.2.tar.gz 1709697 RMD160 87c6c5ddfe45f2607c1256d8e15aefa3ddd91d9a SHA1 1223167c86957cf4e2c9e4f6665c904be8d14655 SHA256 a13b798c4082d663610c6457ee41a2e949ec4740c7fd9faafc33411d92d59565
 DIST mysql++-2.3.2.tar.gz 1627115 RMD160 3f713ec5311dc791a328310c43bfb0174dc2d8d9 SHA1 7c56160b128c02193db3386f2f9e7dbe7ae093b2 SHA256 3544b964964bc8981118119e82e4883dc9d1de8a72861a19e6687719ed3efce9
 EBUILD mysql++-2.2.2-r1.ebuild 1572 RMD160 a72de098f15dbc99241f9d11e4981943b92590af SHA1 e24bc9d3350b7600771417cec225701e0009f5b8 SHA256 271414989c3999eb49c428290c73f1db66ae7e92ed9b3bc77aadfea98d9ab182
-EBUILD mysql++-2.3.2.ebuild 1496 RMD160 8e4885e96c5bf207df8cb3ba7f5b5e1dbb26adeb SHA1 acef6d5ca31d12e910ab61ed1cce23eaa2bf8e2d SHA256 de9323dcef3c43927c3da72af4305294dd43b56580b29c1ae605d5661bfd0563
-MISC ChangeLog 7942 RMD160 eeb90922985567dcb9dcb1303525c9c0cec219ae SHA1 3a58eb49bbb00064e589b9e777e1c968b1fa1905 SHA256 2697e605bc11d0ca7979724905c1ae70eb4c1f153029e723e7167e7b45cd5e87
+EBUILD mysql++-2.3.2.ebuild 1544 RMD160 3325ff6250f490a4aff03be08d02d62d2cc39fb8 SHA1 80ade9db6913d46191ef9ffe271c440776ba7cbd SHA256 d9ca48eac917a806308a0b4f2bbd838ded99061d0bbb4e7b0eae799f499193b4
+MISC ChangeLog 8098 RMD160 9750df7109e7b65fd8d498f5cfb2fa072de6f1be SHA1 a4094ec0f04d65a89086bd7633277b67cd4deec1 SHA256 91544557d930c5b9f180658b0c47826215194bd3c48552d05a4e4e06383e7821
 MISC metadata.xml 158 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 SHA1 e5826687b0a91fba71e62888faa74fe37f44045a SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgMA0kACgkQiqiDRvmkBmKHiwCcCO9zpJ+gk53i5DurvaP0AUPU
+q90AnAmvpFkVU7xumS2A4wKZBFyufNq1
+=pcMh
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql++/files/mysql++-2.3.2-gcc-4.3.patch b/dev-db/mysql++/files/mysql++-2.3.2-gcc-4.3.patch
new file mode 100644
index 000000000000..f9456e8f88e5
--- /dev/null
+++ b/dev-db/mysql++/files/mysql++-2.3.2-gcc-4.3.patch
@@ -0,0 +1,11 @@
+diff -Naur mysql++-2.3.2-orig/lib/const_string.h mysql++-2.3.2/lib/const_string.h
+--- mysql++-2.3.2-orig/lib/const_string.h	2008-03-22 16:16:39.000000000 -0600
++++ mysql++-2.3.2/lib/const_string.h	2008-03-22 16:18:47.000000000 -0600
+@@ -35,6 +35,7 @@
+ #include <iostream>
+ #include <stdexcept>
+ #include <string>
++#include <cstring>
+ 
+ namespace mysqlpp {
+ 
diff --git a/dev-db/mysql++/mysql++-2.3.2.ebuild b/dev-db/mysql++/mysql++-2.3.2.ebuild
index 55bd4ad5e56b..006093f8d6c1 100644
--- a/dev-db/mysql++/mysql++-2.3.2.ebuild
+++ b/dev-db/mysql++/mysql++-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-2.3.2.ebuild,v 1.2 2008/01/16 05:36:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-2.3.2.ebuild,v 1.3 2008/04/21 03:00:49 dirtyepic Exp $
 
 inherit eutils
 
@@ -18,9 +18,12 @@ RDEPEND="${DEPEND}
 		>=virtual/mysql-4.0"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
-	for i in ${S}/lib/*.h ; do
+
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+
+	for i in "${S}"/lib/*.h ; do
 		sed -i \
 			-e '/#include </s,mysql.h,mysql/mysql.h,g' \
 			-e '/#include </s,mysql_version.h,mysql/mysql_version.h,g' \
@@ -46,10 +49,10 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	# install the docs and HTML pages
 	dodoc README* CREDITS ChangeLog HACKERS Wishlist
 	dodoc doc/*
-	cp -ra doc/html ${D}/usr/share/doc/${PF}/html
+	cp -ra doc/html "${D}"/usr/share/doc/${PF}/html
 	prepalldocs
 }