dev-db/mysqlwrapped: Version bump to 1.6.1, fixes bug 251246, add ~amd64 keyword

svn path=/sunrise/; revision=7883

5 files changed, 66 insertions, 15 deletions

diff --git a/dev-db/mysqlwrapped/ChangeLog b/dev-db/mysqlwrapped/ChangeLog
index f18f95dce..3a6399d08 100644
--- a/dev-db/mysqlwrapped/ChangeLog
+++ b/dev-db/mysqlwrapped/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-db/mysqlwrapped
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Feb 2009; Christian Ruppert (idl0r) <spooky85@gmail.com>
+  -mysqlwrapped-1.6.ebuild, +mysqlwrapped-1.6.1.ebuild,
+  +files/gcc-4.3.patch, +files/Makefile.patch:
+  Version bump to 1.6.1, fixes bug 251246, add ~amd64 keyword
+
   04 Dec 2006; Jakub Moc <jakub@gentoo.org> mysqlwrapped-1.6.ebuild:
   Migration to virtual/mysql
 
diff --git a/dev-db/mysqlwrapped/Manifest b/dev-db/mysqlwrapped/Manifest
index 1b35024ee..1b43b376c 100644
--- a/dev-db/mysqlwrapped/Manifest
+++ b/dev-db/mysqlwrapped/Manifest
@@ -1,4 +1,6 @@
-DIST mysqlwrapped-1.6.tar.gz 16902 RMD160 b7c66ef2dd324927787b07becd218404ddcaa5cb SHA1 fc103755e71fa3b6219725d5bb01225a9858ea02 SHA256 7fe6d37cadf287ac488533a8f5359b6c37b7d6f2f1902b91d14e0f7ddeedcc16
-EBUILD mysqlwrapped-1.6.ebuild 782 RMD160 0c78d56cd0ef6c6c11f01f59d0ee262fdeed83e0 SHA1 850728eefa52ea1f1e2c8600e6aa4c1a0b8f38e6 SHA256 609c7b154db15e69a33883ecdfd38db036f92114a0a343b6b46590a6b7987682
-MISC ChangeLog 344 RMD160 c15c9c7cd28061f35811ec634f6daa4bb41443d8 SHA1 c5c6370987b1d4999e62a3d1d81080ab770ad0eb SHA256 c7cf79ac5d36a50c058dc9abf6bd8be77d42ccbb470f8cdca0a8691ff78fcfd4
+AUX Makefile.patch 783 RMD160 1716160f82ac3099893288f9fd8e8effeee6f982 SHA1 492702d168008182742f60a6462c30c79f23ea2e SHA256 9db7563d9c2ec6c7dda5b9dc060b4205aa81c27f7d18f443feee148bd072e2ef
+AUX gcc-4.3.patch 530 RMD160 a1be483e7dde069586e3c3153cca14944dc984d1 SHA1 24af200421cc4ef47aee2fb0af7c91a80496d75b SHA256 e6fee6a00acf177c3ee95b19117a02c8354b6e593ee7538b76406e37b6f50be3
+DIST mysqlwrapped-1.6.1.tar.gz 17148 RMD160 5beeb40ef8f3083116f59f4d206142ddf4fa5a14 SHA1 0d293ff61175ab4238b594938eae150718c7fd56 SHA256 5878debf6988509c22fbf9acac1f80d55a7f06ae3a0324ef22f01408c3357ff6
+EBUILD mysqlwrapped-1.6.1.ebuild 799 RMD160 81353217cc5aa5dcac38a3cabd867e8fa207880d SHA1 7e7276a8f75fda0997f233e26114056fb2471e8c SHA256 adcd15f690c2d1f780d435dddd7b646cac4381776d2e2bfa685a24a5f5e005ea
+MISC ChangeLog 572 RMD160 ca9c4410bfcb5aef6000d21388b45f1ccbe83875 SHA1 0f8447b3f40b6f49df611b573606efe72f7ccc63 SHA256 52a498ebc00942548420b9207266657b983a3c85ebffe00e82b5dd052a476a84
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-db/mysqlwrapped/files/Makefile.patch b/dev-db/mysqlwrapped/files/Makefile.patch
new file mode 100644
index 000000000..a60c99740
--- /dev/null
+++ b/dev-db/mysqlwrapped/files/Makefile.patch
@@ -0,0 +1,27 @@
+--- Makefile.old	2009-02-08 17:38:08.226620286 +0100
++++ Makefile	2009-02-08 17:53:04.181366093 +0100
+@@ -6,8 +6,13 @@ INSTALL_LIB =	$(INSTALL_PREFIX)/lib
+ INSTALL_INCLUDE = $(INSTALL_PREFIX)/include
+ INSTALL =	/usr/bin/install
+ 
+-INCLUDE =	-I/usr/devel/include 
+-CFLAGS =	-Wall -g -O2 $(INCLUDE) -MD
++INCLUDE ?=	-I/usr/devel/include 
++CFLAGS ?=	-Wall -g -O2 $(INCLUDE) -MD
++
++ifeq ($(shell sh -c 'uname -m 2>/dev/null'), x86_64)
++	CFLAGS += -fPIC
++endif
++	
+ # namespace
+ #CFLAGS +=	-DMYSQLW_NAMESPACE=mysqlw
+ CPPFLAGS =	$(CFLAGS)
+@@ -19,7 +24,7 @@ PROGS =		
+ all:		$(PROGS) libmysqlwrapped.a libmysqlwrapped.h
+ 
+ t:		t.o enum_t.o set_t.o
+-		g++ -o $@ $^ $(LIBS)
++		$(CXX) -o $@ $^ $(LIBS)
+ 		
+ LIBM =		Database.o Query.o StderrLog.o SysLog.o enum_t.o set_t.o 
+ libmysqlwrapped.a: \
diff --git a/dev-db/mysqlwrapped/files/gcc-4.3.patch b/dev-db/mysqlwrapped/files/gcc-4.3.patch
new file mode 100644
index 000000000..7bcdced2b
--- /dev/null
+++ b/dev-db/mysqlwrapped/files/gcc-4.3.patch
@@ -0,0 +1,20 @@
+--- SysLog.cpp.old	2009-02-08 17:31:14.470369293 +0100
++++ SysLog.cpp	2009-02-08 17:31:42.767521159 +0100
+@@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ 
+ #include <mysql/mysql.h>
+ #include <syslog.h>
++#include <cstring>
+ 
+ #include "Database.h"
+ #include "Query.h"
+--- enum_t.cpp.old	2009-02-08 17:32:03.038369612 +0100
++++ enum_t.cpp	2009-02-08 17:32:22.060617856 +0100
+@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #pragma warning(disable:4786)
+ #endif
+ 
++#include <cstring>
+ #include "enum_t.h"
+ 
+ 
diff --git a/dev-db/mysqlwrapped/mysqlwrapped-1.6.ebuild b/dev-db/mysqlwrapped/mysqlwrapped-1.6.1.ebuild
index 284ae6efb..89f79b038 100644
--- a/dev-db/mysqlwrapped/mysqlwrapped-1.6.ebuild
+++ b/dev-db/mysqlwrapped/mysqlwrapped-1.6.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="Another C++ wrapper for the MySQL C API"
 HOMEPAGE="http://www.alhem.net/project/mysql/index.html"
@@ -21,11 +21,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	sed -i \
-		-e 's/\(CPPFLAGS\) =/\1+=/' \
-		-e 's/-Wall -g -O2/-fPIC/' \
-		-e 's#/usr/devel#/usr#' \
-		Makefile || die "sed failed"
+	epatch "${FILESDIR}/gcc-4.3.patch" \
+		"${FILESDIR}/Makefile.patch"
 }
 
 src_compile() {
@@ -33,9 +30,9 @@ src_compile() {
 }
 
 src_install() {
-	dolib libmysqlwrapped.a
+	dolib libmysqlwrapped.a || die "dolib failed"
 	insinto /usr/include
-	doins libmysqlwrapped.h
+	doins libmysqlwrapped.h || die "doins failed"
 
-	dodoc Changelog README
+	dodoc Changelog README || die "dodoc failed"
 }