commit: a05650c02b047b40e33a0063c9db0b8123bc11a4
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 09:58:04 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 09:58:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05650c0
dev-db/mysql++: Fix patch headers, SRC_URI.
Package-Manager: Portage-2.3.12, Repoman-2.3.3
dev-db/mysql++/files/mysql++-3.2.1-gold.patch | 4 ++--
dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch | 10 ++++------
dev-db/mysql++/mysql++-2.3.2.ebuild | 4 ++--
dev-db/mysql++/mysql++-3.1.0.ebuild | 4 ++--
dev-db/mysql++/mysql++-3.2.1.ebuild | 2 +-
dev-db/mysql++/mysql++-3.2.2.ebuild | 4 ++--
dev-db/mysql++/mysql++-3.2.3.ebuild | 2 +-
7 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/dev-db/mysql++/files/mysql++-3.2.1-gold.patch
b/dev-db/mysql++/files/mysql++-3.2.1-gold.patch
index 0f6bb7eb1f7..8e10752b7f0 100644
--- a/dev-db/mysql++/files/mysql++-3.2.1-gold.patch
+++ b/dev-db/mysql++/files/mysql++-3.2.1-gold.patch
@@ -1,5 +1,5 @@
---- a/Makefile.in.orig 2013-09-27 09:51:48.646667442 -0400
-+++ b/Makefile.in 2013-09-27 09:52:22.026603184 -0400
+--- a/Makefile.in
++++ b/Makefile.in
@@ -36,7 +36,7 @@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
diff --git a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
index f461daac2a4..ff814650e00 100644
--- a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
+++ b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
@@ -1,6 +1,5 @@
-diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp
---- mysql++-3.2.2-ORIG/lib/dbdriver.cpp 2017-07-14 14:56:06.206629443
+0200
-+++ mysql++-3.2.2/lib/dbdriver.cpp 2017-07-14 15:28:34.690826959 +0200
+--- a/lib/dbdriver.cpp
++++ b/lib/dbdriver.cpp
@@ -257,7 +257,11 @@
}
@@ -13,9 +12,8 @@ diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp
mysql++-3.2.2/lib/dbdriver.cpp
#if MYSQL_VERSION_ID > 40000 // highest flag value varies by version
(o <= CLIENT_MULTI_RESULTS)
#else
-diff -aurN a/lib/common.h b/lib/common.h
---- a/lib/common.h 2016-12-30 18:44:44.000000000 -0500
-+++ b/lib/common.h 2017-09-01 09:12:12.270089396 -0400
+--- a/lib/common.h
++++ b/lib/common.h
@@ -130,12 +130,6 @@
#define MYSQLPP_PATH_SEPARATOR '/'
#endif
diff --git a/dev-db/mysql++/mysql++-2.3.2.ebuild
b/dev-db/mysql++/mysql++-2.3.2.ebuild
index d6bdd7a79dc..7167c329599 100644
--- a/dev-db/mysql++/mysql++-2.3.2.ebuild
+++ b/dev-db/mysql++/mysql++-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit eutils
DESCRIPTION="C++ API interface to the MySQL database"
HOMEPAGE="http://tangentsoft.net/mysql++/";
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz";
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz";
LICENSE="LGPL-2"
SLOT="0"
diff --git a/dev-db/mysql++/mysql++-3.1.0.ebuild
b/dev-db/mysql++/mysql++-3.1.0.ebuild
index 3a2f4e8e8d4..b945531b392 100644
--- a/dev-db/mysql++/mysql++-3.1.0.ebuild
+++ b/dev-db/mysql++/mysql++-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -7,7 +7,7 @@ inherit eutils
DESCRIPTION="C++ API interface to the MySQL database"
HOMEPAGE="http://tangentsoft.net/mysql++/";
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz";
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz";
LICENSE="LGPL-2"
SLOT="0/3"
diff --git a/dev-db/mysql++/mysql++-3.2.1.ebuild
b/dev-db/mysql++/mysql++-3.2.1.ebuild
index 35ff9881cab..1ea7dc61f86 100644
--- a/dev-db/mysql++/mysql++-3.2.1.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.1.ebuild
@@ -7,7 +7,7 @@ inherit eutils
DESCRIPTION="C++ API interface to the MySQL database"
HOMEPAGE="http://tangentsoft.net/mysql++/";
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz";
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz";
LICENSE="LGPL-2"
SLOT="0/3"
diff --git a/dev-db/mysql++/mysql++-3.2.2.ebuild
b/dev-db/mysql++/mysql++-3.2.2.ebuild
index c84fd8d97a3..a7f6809512a 100644
--- a/dev-db/mysql++/mysql++-3.2.2.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -7,7 +7,7 @@ inherit eutils
DESCRIPTION="C++ API interface to the MySQL database"
HOMEPAGE="http://tangentsoft.net/mysql++/";
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz";
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz";
LICENSE="LGPL-2"
SLOT="0/3"
diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild
b/dev-db/mysql++/mysql++-3.2.3.ebuild
index 7491c26b1fb..8690b5aa2bb 100644
--- a/dev-db/mysql++/mysql++-3.2.3.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.3.ebuild
@@ -7,7 +7,7 @@ inherit autotools libtool flag-o-matic
DESCRIPTION="C++ API interface to the MySQL database"
HOMEPAGE="http://tangentsoft.net/mysql++/";
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz";
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz";
LICENSE="LGPL-2"
SLOT="0/3"
