dev-db/soci: version bump, bump to EAPI5

5 files changed, 13 insertions, 103 deletions

diff --git a/dev-db/soci/ChangeLog b/dev-db/soci/ChangeLog
index e16bfb5d0..5d5653a8c 100644
--- a/dev-db/soci/ChangeLog
+++ b/dev-db/soci/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-db/soci
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*soci-3.2.0 (01 Apr 2013)
+
+  01 Apr 2013; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>
+  -files/soci-2.2.0-gcc43_glibc28.patch, -files/soci-2.2.0-sqlite_fix.patch,
+  -soci-3.1.0.ebuild, +soci-3.2.0.ebuild:
+  version bump, bump to EAPI5
+
   12 Aug 2012; Mike Gilbert <floppym@gentoo.org> -soci-2.2.0.ebuild,
   soci-3.1.0.ebuild:
   Add ~amd64 keyword, remove old.
diff --git a/dev-db/soci/Manifest b/dev-db/soci/Manifest
index 588c9b4ea..85cfb90d4 100644
--- a/dev-db/soci/Manifest
+++ b/dev-db/soci/Manifest
@@ -1,6 +1,4 @@
-AUX soci-2.2.0-gcc43_glibc28.patch 3022 SHA256 20079b0ca71def2e2044ddd50ab735d7067b39949e5e1cf4d81234696937e84a SHA512 6011c8b4b0c58c032177e26c7f2f935216f72c36b0f44f07ee7c70d301b51087295691513b523c1d35d31cb6149c9f8b4f97ab0d379d89f75069e44286160031 WHIRLPOOL c767c92a03f0a766fd6fb83f511cd7860f04096749e9e30ee72558b7eba5b926d6629e25e64377548a0543a1e5efcb070ab01c0749be01aa69d17472de86d751
-AUX soci-2.2.0-sqlite_fix.patch 598 SHA256 27dde3b59b25786d5509ba1c57c86a236525c8f8b8f91444401ec62c660c31d4 SHA512 e50cd7159a362c0d56dea832cd0c57d046f04bd105d7af36f47203f277cda84de3982c999ba3776973b39178eb38dc8564a09741ecb02c2af5d457d78fd783c9 WHIRLPOOL edd7a3fb0e2b0bcb8bd0c536e1c873c274defd08d484753ced4a8d054a619aa111dd411afa0703d2361377ff704e22ab41a6f270419f13484023ceefda56bf1c
-DIST soci-3.1.0.zip 418596 SHA256 f7004cb2ac040b1fa6ce3cf7ea36e9fe5cdff92c6444ffd764ab2279d5f72449 SHA512 1315c9dceb64c1bf0ffdd6bc0e224b6613f485a3a0d22c580be7e4403f5bbdca9daade686c8e041946c383ee35f543f664e9a8d39e78ccdd0c516351dbc7596d WHIRLPOOL 8906f9c01936b729db9232a5c817183f5435a26edab330ac13dd7a77f4ed18b6dd6e4d89836666b479c5a8458ff1628a5a66dd7ef77343fd8a870d574e0cd2e4
-EBUILD soci-3.1.0.ebuild 1130 SHA256 d663fb49a79edb04572b00042ac6d3d86c8ae87fd728683294002279dd9e39e8 SHA512 ef8f793c09ee3db9e0c122ac3b623272b44fa4c7f47e0a248344ec9884ef843aece7021a4039514a830131796c722e22ccbe4c164632595d2440300ad1b2ea76 WHIRLPOOL a3ec90a89703a3926763f482b9e32421abe193e8bfa3f0a2b98c598c49f2a0341869212cb09a1acc2692b2091a2a915234650947a00de036fd1de89e040cee82
-MISC ChangeLog 1714 SHA256 db5cf80fe6b08add332f39a6aa6b043dc7423eb755ab53db9b30ae8822c28a2b SHA512 141f4c858f3549ed06f711e056f6b0b1d8782225d2f6aa23416842507a528ffdb465777e52d953867f7ca06e6ebd471b5a5797b306236527fa3dc2b2aeb752a9 WHIRLPOOL 4598c95a714a9ac471a423a009fbf16f77e24be4b0816244b9f0985b510b59f16393607fad80456fe5f7513157d4c758aaea342da158a4068e800b33c5c43b09
+DIST soci-3.2.0.zip 508645 SHA256 727c8fcc313a7d1505e584abf450f64549c52d280f947aadbf7fbae0b86a3557 SHA512 dd58abf80041b1a8b015b70d4b984d2da2d77590022f7f4501f6c50e6dc39d57653217fa9590c155cd085312fdf3ca0c336ee14c31a71c53f201b45e3e1f24de WHIRLPOOL 330a88fea986981933ade6060fab45715b102524ece289d4399d4214aa7d5388c40c69ec500ed4ba8700b05d766e5d3b05773d982b0d923c1d31086c105cb369
+EBUILD soci-3.2.0.ebuild 1130 SHA256 df47ef36080c5bf7e0b3c4a794f6206abfceb081903b609ec724fe0c305cf998 SHA512 52468f053d15c3dc68299b13d0769a6ddb965ec0960d9baba6ac5913857ad17e64a2f28c8e76347c02f72ddf24243930615521b11c1e6dc312fb9412e56c06c9 WHIRLPOOL deed81e66357050c9775379b7fa3dd612e4872eef13fd51496bc9f4967054f03a9c6bbfda70fe3a229233efaabef88adb66257bf60d7ca221344782ee95066ac
+MISC ChangeLog 1956 SHA256 64f981797ccce3660d6f005fa3736364f5f97db6e23c8bfc4c495c6496014eca SHA512 49a1905bef21facdc4ac1280b2468eaf90f5154b242256b80ad320cac3d96e72fb006ac63aaa5f5ef66f125b080eba7f78d76f4ff3db744d56d908e11221733e WHIRLPOOL 510cb3df4f29ce7011a0d8fffb8abd5968f159a410d35b25f97ace637b715c8dd68e2663d1675813ba0a9628be8ff13d4974bf8def8ab7a7cbb5ae668800b72d
 MISC metadata.xml 339 SHA256 cba62e8e3c2453d559c68615df1a6aefd5e337045706a8793ed82633af443fd0 SHA512 adcca19e38528ba9d0fbe8e30c6a82cb7c939f350bc336c38775e4d681bd1f66f5dad4af6369790f548828cd2e6b0bb5785c93739a9c97b5c01722549eac464b WHIRLPOOL 0f5adcc169db7837da424a239c4fa20a7192a7875fd25ddfff0dd13cffa0c04fcc2e90aaf0a85229d578a0e289fa089f0ba7e0d9ac635568ccfd3a78de233113
diff --git a/dev-db/soci/files/soci-2.2.0-gcc43_glibc28.patch b/dev-db/soci/files/soci-2.2.0-gcc43_glibc28.patch
deleted file mode 100644
index acd7eb1a6..000000000
--- a/dev-db/soci/files/soci-2.2.0-gcc43_glibc28.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur soci-2.2.0.orig/src/backends/empty/test/test-empty.cpp soci-2.2.0/src/backends/empty/test/test-empty.cpp
---- soci-2.2.0.orig/src/backends/empty/test/test-empty.cpp	2008-06-18 18:37:17.000000000 +0200
-+++ soci-2.2.0/src/backends/empty/test/test-empty.cpp	2008-06-18 18:42:08.000000000 +0200
-@@ -9,6 +9,7 @@
- #include "soci-empty.h"
- #include <iostream>
- #include <string>
-+#include <cstdlib>
- #include <cassert>
- #include <ctime>
- 
-diff -Naur soci-2.2.0.orig/src/backends/mysql/common.h soci-2.2.0/src/backends/mysql/common.h
---- soci-2.2.0.orig/src/backends/mysql/common.h	2008-06-18 18:37:17.000000000 +0200
-+++ soci-2.2.0/src/backends/mysql/common.h	2008-06-18 18:47:10.000000000 +0200
-@@ -9,6 +9,7 @@
- #define MYSQL_COMMON_H_INCLUDED
- 
- #include "soci-mysql.h"
-+#include <ctime>
- 
- namespace SOCI {
- 
-diff -Naur soci-2.2.0.orig/src/backends/mysql/session.cpp soci-2.2.0/src/backends/mysql/session.cpp
---- soci-2.2.0.orig/src/backends/mysql/session.cpp	2008-06-18 18:37:17.000000000 +0200
-+++ soci-2.2.0/src/backends/mysql/session.cpp	2008-06-18 18:50:01.000000000 +0200
-@@ -12,7 +12,8 @@
- #include <cctype>
- #include <cerrno>
- #include <ciso646>
--
-+#include <cstdlib>
-+#include <climits>
- 
- #ifdef _MSC_VER
- #pragma warning(disable:4355)
-diff -Naur soci-2.2.0.orig/src/backends/mysql/standard-into-type.cpp soci-2.2.0/src/backends/mysql/standard-into-type.cpp
---- soci-2.2.0.orig/src/backends/mysql/standard-into-type.cpp	2008-06-18 18:37:17.000000000 +0200
-+++ soci-2.2.0/src/backends/mysql/standard-into-type.cpp	2008-06-18 18:51:40.000000000 +0200
-@@ -11,7 +11,8 @@
- #include <soci.h>
- #include <soci-platform.h>
- #include "common.h"
--
-+#include <cstdlib>
-+#include <cstring>
- #include <ciso646>
- 
- #ifdef _MSC_VER
-diff -Naur soci-2.2.0.orig/src/backends/mysql/standard-use-type.cpp soci-2.2.0/src/backends/mysql/standard-use-type.cpp
---- soci-2.2.0.orig/src/backends/mysql/standard-use-type.cpp	2008-06-18 18:37:17.000000000 +0200
-+++ soci-2.2.0/src/backends/mysql/standard-use-type.cpp	2008-06-18 18:54:01.000000000 +0200
-@@ -13,6 +13,7 @@
- #include <soci-platform.h>
- #include <ciso646>
- #include <limits>
-+#include <cstring>
- 
- #ifdef _MSC_VER
- #pragma warning(disable:4355)
-diff -Naur soci-2.2.0.orig/src/backends/mysql/vector-into-type.cpp soci-2.2.0/src/backends/mysql/vector-into-type.cpp
---- soci-2.2.0.orig/src/backends/mysql/vector-into-type.cpp	2008-06-18 18:37:17.000000000 +0200
-+++ soci-2.2.0/src/backends/mysql/vector-into-type.cpp	2008-06-18 18:59:01.000000000 +0200
-@@ -12,6 +12,7 @@
- #include <soci.h>
- #include <soci-platform.h>
- #include <ciso646>
-+#include <cstdlib>
- 
- #ifdef _MSC_VER
- #pragma warning(disable:4355)
-diff -Naur soci-2.2.0.orig/src/core/soci.h soci-2.2.0/src/core/soci.h
---- soci-2.2.0.orig/src/core/soci.h	2008-06-18 18:37:17.000000000 +0200
-+++ soci-2.2.0/src/core/soci.h	2008-06-18 18:40:27.000000000 +0200
-@@ -13,6 +13,8 @@
- #include <vector>
- #include <ostream>
- #include <sstream>
-+#include <typeinfo>
-+#include <memory>
- #include <ctime>
- #include <cassert>
- 
diff --git a/dev-db/soci/files/soci-2.2.0-sqlite_fix.patch b/dev-db/soci/files/soci-2.2.0-sqlite_fix.patch
deleted file mode 100644
index 654efe52b..000000000
--- a/dev-db/soci/files/soci-2.2.0-sqlite_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru soci-2.2.0/src/backends/sqlite3/statement.cpp soci-2.2.0.new/src/backends/sqlite3/statement.cpp
---- soci-2.2.0/src/backends/sqlite3/statement.cpp	2006-11-08 15:01:51.000000000 +0100
-+++ soci-2.2.0.new/src/backends/sqlite3/statement.cpp	2007-05-03 19:55:25.000000000 +0200
-@@ -183,6 +183,9 @@
- StatementBackEnd::execFetchResult 
- Sqlite3StatementBackEnd::bindAndExecute(int number)
- {
-+#if (SQLITE_VERSION_NUMBER > 3003009)
-+    using sqlite_api::sqlite3_destructor_type;
-+#endif
-     StatementBackEnd::execFetchResult retVal = eNoData;
- 
-     int rows = static_cast<int>(useData_.size());
diff --git a/dev-db/soci/soci-3.1.0.ebuild b/dev-db/soci/soci-3.2.0.ebuild
index 48fe0e87d..8b817405c 100644
--- a/dev-db/soci/soci-3.1.0.ebuild
+++ b/dev-db/soci/soci-3.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit cmake-utils