From 080a6315580b734e3e79f9420b207b495b4bc693 Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Fri, 1 Sep 2017 09:45:16 -0400
Subject: dev-db/mysql++: Fix build for Bug 629492 and general build cleanup

Installed files are unchanged

Package-Manager: Portage-2.3.8, Repoman-2.3.3
---
 dev-db/mysql++/mysql++-3.2.3.ebuild | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'dev-db/mysql++/mysql++-3.2.3.ebuild')

diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3.ebuild
index 01ad02be6ce0..7491c26b1fbc 100644
--- a/dev-db/mysql++/mysql++-3.2.3.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils
+inherit autotools libtool flag-o-matic
 
 DESCRIPTION="C++ API interface to the MySQL database"
 HOMEPAGE="http://tangentsoft.net/mysql++/"
@@ -19,16 +19,28 @@ DEPEND="${RDEPEND}"
 DOCS=( CREDITS.txt HACKERS.txt Wishlist doc/ssqls-pretty )
 
 src_prepare() {
+	# Bug filed upstream about deprecated std::auto_ptr
+	append-cxxflags $(test-flags-CXX -Wno-deprecated-declarations)
+	# Bad symlink for libtool in the archive
+	rm "${S}/ltmain.sh" || die
 	eapply "${FILESDIR}/${PN}-3.2.1-gold.patch"
+	eapply "${FILESDIR}/${PN}-3.2.3-mariadb-10.2.patch"
 	eapply_user
+	_elibtoolize --auto-ltdl --install --copy --force
+	elibtoolize
 	# Current MySQL libraries are always with threads and slowly being removed
 	sed -i -e "s/mysqlclient_r/mysqlclient/" "${S}/configure" || die
 	rm "${S}/doc/"README-*-RPM.txt || die
 }
 
 src_configure() {
-	local myconf="--enable-thread-check --with-mysql=${EPREFIX}/usr"
-	econf ${myconf}
+	local myconf=(
+		--enable-thread-check
+		--with-mysql="${EPREFIX}/usr"
+		--with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)"
+		--with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)"
+	)
+	econf "${myconf[@]}"
 }
 
 src_install() {
-- 
cgit v1.2.3