Fix signedness bug on ppc, where "char" is unsigned by default.

Package-Manager: portage-2.1.2_rc2-r1

5 files changed, 120 insertions, 15 deletions

diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog
index a58df79a107e..d103bf5021c1 100644
--- a/dev-db/mysql++/ChangeLog
+++ b/dev-db/mysql++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql++
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.35 2006/06/18 22:57:44 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.36 2006/11/22 23:22:52 hansmi Exp $
+
+*mysql++-2.1.1-r1 (23 Nov 2006)
+
+  22 Nov 2006; Michael Hanselmann <hansmi@gentoo.org>
+  +files/mysql++-signed-char-fix.diff, +mysql++-2.1.1-r1.ebuild:
+  Fix signedness bug on ppc, where "char" is unsigned by default.
 
 *mysql++-2.1.1 (18 Jun 2006)
 
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 81f7f5fc503b..107e3077994a 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,6 +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 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
@@ -21,14 +22,18 @@ EBUILD mysql++-2.0.4.ebuild 1321 RMD160 87284595f732c876bad76e63bfc17258370d624c
 MD5 5e750c5bb811880fe4781cd2d8e7fe58 mysql++-2.0.4.ebuild 1321
 RMD160 87284595f732c876bad76e63bfc17258370d624c mysql++-2.0.4.ebuild 1321
 SHA256 b06cca9667cf9aa5c79afd8f1857760b0e206bac433a88d060d13dcb3ce3833c mysql++-2.0.4.ebuild 1321
+EBUILD mysql++-2.1.1-r1.ebuild 1380 RMD160 de6138225a25fb5ffd46ff17cf5a51859f417ade SHA1 f2e1f81b58e44c1b793bac8c58a24dc6ac40d18c SHA256 fdd9c4a7d30ab7926c18502d42d9677eb3906b40bbcd73060baa5ab9a4cf0da9
+MD5 c54f332d749b197ddc5fa11e9c05029c mysql++-2.1.1-r1.ebuild 1380
+RMD160 de6138225a25fb5ffd46ff17cf5a51859f417ade mysql++-2.1.1-r1.ebuild 1380
+SHA256 fdd9c4a7d30ab7926c18502d42d9677eb3906b40bbcd73060baa5ab9a4cf0da9 mysql++-2.1.1-r1.ebuild 1380
 EBUILD mysql++-2.1.1.ebuild 1279 RMD160 f9266aaaf8760d468b91a70a78ccff4d1698b05d SHA1 51be3968d41270991943381f6c1c5d0f3a5c04c0 SHA256 5b1bad0574f8a701cd408927da6f4555cf946d04b27a7f0fbec07297c4c2bd90
 MD5 5bba5193db43cd017af5314f0ce115f1 mysql++-2.1.1.ebuild 1279
 RMD160 f9266aaaf8760d468b91a70a78ccff4d1698b05d mysql++-2.1.1.ebuild 1279
 SHA256 5b1bad0574f8a701cd408927da6f4555cf946d04b27a7f0fbec07297c4c2bd90 mysql++-2.1.1.ebuild 1279
-MISC ChangeLog 5611 RMD160 82123cc32651f2f8de675b0072729bed45ae0620 SHA1 c45e871324efb2649ea688bb83d847d7a14488c0 SHA256 c11e44ac0f658f866c7df736a1c48f798ab5fa72a50365a1f3bc9e38f8d11601
-MD5 ee416517a99745b327433ad2fa0896c2 ChangeLog 5611
-RMD160 82123cc32651f2f8de675b0072729bed45ae0620 ChangeLog 5611
-SHA256 c11e44ac0f658f866c7df736a1c48f798ab5fa72a50365a1f3bc9e38f8d11601 ChangeLog 5611
+MISC ChangeLog 5832 RMD160 42eb6863d6859f51d5a8ac0f4a3122f1ddd5f9c5 SHA1 2d9084e48abe94ba6d93fed9bc5846af249bd0d2 SHA256 adaf7eb90814fa21fe3478a3a59294ecd9deb2f903fdc2394f3430554af59f7b
+MD5 77bf8ee0547a51bf53c48b4def3067ec ChangeLog 5832
+RMD160 42eb6863d6859f51d5a8ac0f4a3122f1ddd5f9c5 ChangeLog 5832
+SHA256 adaf7eb90814fa21fe3478a3a59294ecd9deb2f903fdc2394f3430554af59f7b ChangeLog 5832
 MISC metadata.xml 158 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 SHA1 e5826687b0a91fba71e62888faa74fe37f44045a SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 metadata.xml 158
@@ -45,10 +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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEldqJKolR564NvWYRAkUBAJ9mANXNbLScTkmVhk7IZr07icmhXQCfbG5w
-3qVktF9Uy3ZHsS6x61bKb7I=
-=/nKU
------END PGP SIGNATURE-----
+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
diff --git a/dev-db/mysql++/files/digest-mysql++-2.1.1-r1 b/dev-db/mysql++/files/digest-mysql++-2.1.1-r1
new file mode 100644
index 000000000000..5fc16a885b3d
--- /dev/null
+++ b/dev-db/mysql++/files/digest-mysql++-2.1.1-r1
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..192e40586522
--- /dev/null
+++ b/dev-db/mysql++/files/mysql++-signed-char-fix.diff
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000000..0b04cd4d8bf1
--- /dev/null
+++ b/dev-db/mysql++/mysql++-2.1.1-r1.ebuild
@@ -0,0 +1,53 @@
+# 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.1 2006/11/22 23:22:52 hansmi 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}
+		>=dev-db/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
+}