My first patch broke the ABI, which is bad. Fix it.

(Portage version: 2.1.2_rc2-r2)
 (Unsigned Manifest commit)

4 files changed, 15 insertions, 123 deletions

diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index e28bdaafe9c8..a6b2ee67bc59 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX mysql++-signed-char-fix.diff 1320 RMD160 1aac3f4fdf17436b1357acb03587952b69b42bdb SHA1 286d807a71197d4f26ff261d51c85e4e7ecd61de SHA256 a9ba7dab5c481792287bbcd96e0ce5beaf5f349197d8032a18abaf73f500d1f7
-MD5 ca6e0c52f1d20271027ebcf9dc37c1ad files/mysql++-signed-char-fix.diff 1320
-RMD160 1aac3f4fdf17436b1357acb03587952b69b42bdb files/mysql++-signed-char-fix.diff 1320
-SHA256 a9ba7dab5c481792287bbcd96e0ce5beaf5f349197d8032a18abaf73f500d1f7 files/mysql++-signed-char-fix.diff 1320
+AUX mysql++-signed-char-fix-try2.diff 1530 RMD160 2bd294faa8070ca99d31e0cb7643f28d0ad62274 SHA1 779d3e431c94607d854b563ac38b6c574c1e3f6c SHA256 2fe3bb616326cad0738130e1fb81c3150ec4810153646cd7886c06fc701fd112
+MD5 b1b6cacfb528076082d2957b1816be56 files/mysql++-signed-char-fix-try2.diff 1530
+RMD160 2bd294faa8070ca99d31e0cb7643f28d0ad62274 files/mysql++-signed-char-fix-try2.diff 1530
+SHA256 2fe3bb616326cad0738130e1fb81c3150ec4810153646cd7886c06fc701fd112 files/mysql++-signed-char-fix-try2.diff 1530
 AUX patch-1.7.34-typo_correction 558 RMD160 491356631f776a086be68508fa414e000554609a SHA1 be504876c5f1b6648e784750c0bb1c40a3f79e91 SHA256 659cbc29f61d980be439ccb6cd502811503b02eebc41a9f2eca695b5de0ad757
 MD5 3209530832d5be69aaf88e4c55ae8767 files/patch-1.7.34-typo_correction 558
 RMD160 491356631f776a086be68508fa414e000554609a files/patch-1.7.34-typo_correction 558
@@ -25,18 +22,18 @@ EBUILD mysql++-2.0.4.ebuild 1319 RMD160 5fa391a037bf283bfd7319781294ca5928b61d13
 MD5 10793658a309e56f6b24a88b876db8f3 mysql++-2.0.4.ebuild 1319
 RMD160 5fa391a037bf283bfd7319781294ca5928b61d13 mysql++-2.0.4.ebuild 1319
 SHA256 01a2bc72608e846c165f4d19ba10ea375875ef169499e7bd88a95e117c067fb9 mysql++-2.0.4.ebuild 1319
-EBUILD mysql++-2.1.1-r1.ebuild 1379 RMD160 436f9934156d54370a8768973c0dc3951dfe042f SHA1 f75fdac904dc5451e296d9a0d7c6bfa773acdb9d SHA256 5c8a3d1ae03099ef2550bf40b038d36ea0b78c2ab8808bcf01df94c29dac8e9c
-MD5 da6d43ba36f8235649cf9d6c27816ae3 mysql++-2.1.1-r1.ebuild 1379
-RMD160 436f9934156d54370a8768973c0dc3951dfe042f mysql++-2.1.1-r1.ebuild 1379
-SHA256 5c8a3d1ae03099ef2550bf40b038d36ea0b78c2ab8808bcf01df94c29dac8e9c mysql++-2.1.1-r1.ebuild 1379
+EBUILD mysql++-2.1.1-r2.ebuild 1386 RMD160 69cf33926a617d2e802759a9c83b52a1e52a385b SHA1 7ad5c2cc9cca3eb529ef6af173aab540f1ed606d SHA256 8ef4ad6cf31be69faed04cf36610ad55fdb7970fb8aeda08a4fa278d1a9d8f3a
+MD5 b74a6926a1397b09e6c245e447c221ae mysql++-2.1.1-r2.ebuild 1386
+RMD160 69cf33926a617d2e802759a9c83b52a1e52a385b mysql++-2.1.1-r2.ebuild 1386
+SHA256 8ef4ad6cf31be69faed04cf36610ad55fdb7970fb8aeda08a4fa278d1a9d8f3a mysql++-2.1.1-r2.ebuild 1386
 EBUILD mysql++-2.1.1.ebuild 1280 RMD160 dc31f23feadfc0a32a3b58725845670c84f3113d SHA1 d527ccc71975a50b7b33d3d074088bcb75eb711e SHA256 ad5637fcf9496036a197122418d262afcad59737b88efb883909e12a52bb7be8
 MD5 75d1c17d5e36c1fcfb5eb288dc4c4797 mysql++-2.1.1.ebuild 1280
 RMD160 dc31f23feadfc0a32a3b58725845670c84f3113d mysql++-2.1.1.ebuild 1280
 SHA256 ad5637fcf9496036a197122418d262afcad59737b88efb883909e12a52bb7be8 mysql++-2.1.1.ebuild 1280
-MISC ChangeLog 6031 RMD160 97a5abb054053678fdb6ca2758ddd78485376188 SHA1 eff4c638f8ce718b9d3814a8b4bf988df8289343 SHA256 666e2f6692ccf65808cd4126f8f2760360a3f24e9627c7cbd87948a5dde11cf4
-MD5 8b31b0fc0fa2f52fe50f611ad9e0e79f ChangeLog 6031
-RMD160 97a5abb054053678fdb6ca2758ddd78485376188 ChangeLog 6031
-SHA256 666e2f6692ccf65808cd4126f8f2760360a3f24e9627c7cbd87948a5dde11cf4 ChangeLog 6031
+MISC ChangeLog 6409 RMD160 836645f59c04416c9b3955ef2289eb66c1b0a937 SHA1 b5c47c4885139ce0306fb36fccdc054cd123603e SHA256 b0df334a6052fcf70d523934a23aee7ac36f0d665f4e64131ce71d3852acaccb
+MD5 c56979e789d06a7ccc62ae57f01cce67 ChangeLog 6409
+RMD160 836645f59c04416c9b3955ef2289eb66c1b0a937 ChangeLog 6409
+SHA256 b0df334a6052fcf70d523934a23aee7ac36f0d665f4e64131ce71d3852acaccb ChangeLog 6409
 MISC metadata.xml 158 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 SHA1 e5826687b0a91fba71e62888faa74fe37f44045a SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 metadata.xml 158
@@ -53,13 +50,6 @@ SHA256 6cc625e553da72a148c3919f5e36af8e3be3b9f44edbec65a1d7e64650800504 files/di
 MD5 caefa54e465a932e8c68e613361300f0 files/digest-mysql++-2.1.1 244
 RMD160 9382b0560a1da84b071f3ac9ec97c66b43390587 files/digest-mysql++-2.1.1 244
 SHA256 8b449a0fa4585918c8b261ce8bca475897aec0adc01943e7340b97733be86857 files/digest-mysql++-2.1.1 244
-MD5 caefa54e465a932e8c68e613361300f0 files/digest-mysql++-2.1.1-r1 244
-RMD160 9382b0560a1da84b071f3ac9ec97c66b43390587 files/digest-mysql++-2.1.1-r1 244
-SHA256 8b449a0fa4585918c8b261ce8bca475897aec0adc01943e7340b97733be86857 files/digest-mysql++-2.1.1-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFZbaYKolR564NvWYRArlFAJ98dTEAFPxoWxyzReXo0MHw2cF+BACglkzA
-wcPDSafcdZsyu7yLHTloKY0=
-=WrFe
------END PGP SIGNATURE-----
+MD5 caefa54e465a932e8c68e613361300f0 files/digest-mysql++-2.1.1-r2 244
+RMD160 9382b0560a1da84b071f3ac9ec97c66b43390587 files/digest-mysql++-2.1.1-r2 244
+SHA256 8b449a0fa4585918c8b261ce8bca475897aec0adc01943e7340b97733be86857 files/digest-mysql++-2.1.1-r2 244
diff --git a/dev-db/mysql++/files/digest-mysql++-2.1.1-r1 b/dev-db/mysql++/files/digest-mysql++-2.1.1-r1
deleted file mode 100644
index 5fc16a885b3d..000000000000
--- a/dev-db/mysql++/files/digest-mysql++-2.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a42b3422b37c65f88be9162a969d164 mysql++-2.1.1.tar.gz 1855521
-RMD160 bfeeade2be22e761c494e26f46059df2fbc858ac mysql++-2.1.1.tar.gz 1855521
-SHA256 fcd05ac5b4ef0b7b196636907f0ab14860a4b889bd3b3e4f2acc919e2bb05a53 mysql++-2.1.1.tar.gz 1855521
diff --git a/dev-db/mysql++/files/mysql++-signed-char-fix.diff b/dev-db/mysql++/files/mysql++-signed-char-fix.diff
deleted file mode 100644
index 192e40586522..000000000000
--- a/dev-db/mysql++/files/mysql++-signed-char-fix.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru mysql++-2.1.1.orig/lib/qparms.h mysql++-2.1.1/lib/qparms.h
---- mysql++-2.1.1.orig/lib/qparms.h	2006-04-05 06:44:49.000000000 +0200
-+++ mysql++-2.1.1/lib/qparms.h	2006-11-23 00:11:05.000000000 +0100
-@@ -232,7 +232,7 @@
- 	/// \param b the 'before' value
- 	/// \param o the 'option' value
- 	/// \param n the 'num' value
--	SQLParseElement(std::string b, char o, char n) :
-+	SQLParseElement(std::string b, char o, short int n) :
- 	before(b),
- 	option(o),
- 	num(n)
-@@ -241,7 +241,7 @@
- 	
- 	std::string before;		///< string inserted before the parameter
- 	char option;			///< the parameter option, or blank if none
--	char num;				///< the parameter position to use
-+	short int num;			///< the parameter position to use
- };
- 
- } // end namespace mysqlpp
-diff -ru mysql++-2.1.1.orig/lib/query.cpp mysql++-2.1.1/lib/query.cpp
---- mysql++-2.1.1.orig/lib/query.cpp	2006-04-05 06:44:49.000000000 +0200
-+++ mysql++-2.1.1/lib/query.cpp	2006-11-23 00:16:04.000000000 +0100
-@@ -220,7 +220,7 @@
- 				}
- 
- 				// Finished parsing parameter; save it.
--				parse_elems_.push_back(SQLParseElement(str, option, char(n)));
-+				parse_elems_.push_back(SQLParseElement(str, option, n));
- 				str = "";
- 				name = "";
- 			}
-@@ -304,7 +304,7 @@
- {
- 	sbuffer_.str("");
- 
--	char num;
-+	short int num;
- 	SQLString* ss;
- 	SQLQueryParms* c;
- 
diff --git a/dev-db/mysql++/mysql++-2.1.1-r1.ebuild b/dev-db/mysql++/mysql++-2.1.1-r1.ebuild
deleted file mode 100644
index 525c1fc65952..000000000000
--- a/dev-db/mysql++/mysql++-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-2.1.1-r1.ebuild,v 1.2 2006/11/23 14:44:19 vivo 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=">=sys-devel/gcc-3"
-RDEPEND="${DEPEND}
-		>=virtual/mysql-4.0"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch "${FILESDIR}/mysql++-signed-char-fix.diff"
-}
-
-src_compile() {
-	gnuconfig_update
-	local myconf
-	# we want C++ exceptions turned on
-	myconf="--enable-exceptions"
-	# give threads a try
-	myconf="${myconf} --enable-thread-check"
-	# 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
-}