commit:     4345009f526408a141c6d2817c8363369623147a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  5 16:28:45 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 16:28:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4345009f

dev-db/mysql++: drop old

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-db/mysql++/Manifest                            |   3 -
 dev-db/mysql++/files/mysql++-2.3.2-gcc-4.3.patch   |  11 -
 dev-db/mysql++/files/mysql++-3.2.3-as-needed.patch | 254 ---------------------
 .../mysql++/files/mysql++-3.2.3-mariadb-10.2.patch |  29 ---
 dev-db/mysql++/files/mysql++-3.2.4-as-needed.patch | 178 ---------------
 dev-db/mysql++/mysql++-2.3.2-r1.ebuild             |  49 ----
 dev-db/mysql++/mysql++-3.2.3-r1.ebuild             |  55 -----
 dev-db/mysql++/mysql++-3.2.4.ebuild                |  61 -----
 8 files changed, 640 deletions(-)

diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 9306eee95b2..620a479d9d3 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,4 +1 @@
-DIST mysql++-2.3.2.tar.gz 1627115 BLAKE2B 
058ed41485474e4283a7200aa57398e85162f697f017ccfde7974b85457bb827d17bfdd522ef46818d42a75751a0eeb6ade39ded73e0265ee6811eb2769df3ea
 SHA512 
b546c8369550e541c1a0b1b0e301fdd298a771cb709ad6c6ea3450a8f8bbe7533989a82d1c19cd9bf9a261d7a1fc4c3760919d3d5e3e43b5d698b75b7abf07f7
-DIST mysql++-3.2.3.tar.gz 3241023 BLAKE2B 
5faa5711c7ed7c64346013bd1ca6e7dc20e5b23d33983a719c892bbd1002f3986206df6cfef54316f11aa480f18dbc0a2cf6944f9572f3a7dca24cdb73099eb9
 SHA512 
b6b0a9856ede9e5e08be0f5ed1689b1256f8cf31c3afbb9c9e7f68d0734380e25909ef31cd04be6b253c86b2f881df10f3793a2d3e32042375dbbab4b0700d0a
-DIST mysql++-3.2.4.tar.gz 4594696 BLAKE2B 
7e0553b0e22bb3607a914fc7756ec192465af546749b0147a97558fb3d397e504f4552dcbc783f5bcc934e51fd1dac863e5479c4af3053d394a51c94cd825ee0
 SHA512 
69e23c211240854b59951bdb1cecc57f2f818d822a977942177e65195900dbdcc62d598c3e90c18f4a0a37e5340df7a149719c45b791de59c03d1f1259c5f4fd
 DIST mysql++-3.2.5.tar.gz 4748218 BLAKE2B 
ffceddb360cf6f0f38b7647f68e52ad9b659642c598c2aab7736813bf61d07316900d843749c2f9f4c753bd2087711ca712cc430f12b3a475c63ae3e5b11aff7
 SHA512 
5fa042a350322fa74afa28dc5e53f15cad32517001ab817493bf0d13a64e6559712f5e61184ef38a97bc8fe69f8732aaf436bc5d1663e4873f8baebee2e00892

diff --git a/dev-db/mysql++/files/mysql++-2.3.2-gcc-4.3.patch 
b/dev-db/mysql++/files/mysql++-2.3.2-gcc-4.3.patch
deleted file mode 100644
index f9456e8f88e..00000000000
--- a/dev-db/mysql++/files/mysql++-2.3.2-gcc-4.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur mysql++-2.3.2-orig/lib/const_string.h 
mysql++-2.3.2/lib/const_string.h
---- mysql++-2.3.2-orig/lib/const_string.h      2008-03-22 16:16:39.000000000 
-0600
-+++ mysql++-2.3.2/lib/const_string.h   2008-03-22 16:18:47.000000000 -0600
-@@ -35,6 +35,7 @@
- #include <iostream>
- #include <stdexcept>
- #include <string>
-+#include <cstring>
- 
- namespace mysqlpp {
- 

diff --git a/dev-db/mysql++/files/mysql++-3.2.3-as-needed.patch 
b/dev-db/mysql++/files/mysql++-3.2.3-as-needed.patch
deleted file mode 100644
index f4172076eec..00000000000
--- a/dev-db/mysql++/files/mysql++-3.2.3-as-needed.patch
+++ /dev/null
@@ -1,254 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -529,87 +529,87 @@
-       $(RANLIB) $@
- 
- ssqlsxlat$(EXEEXT): $(SSQLSXLAT_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) 
$(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
--      $(CXX) -o $@ $(SSQLSXLAT_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
-lmysqlpp_ssqls2parse -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLSXLAT_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
-lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__ssqlsxlat___mac_setfilecmd)
- 
- test_array_index$(EXEEXT): $(TEST_ARRAY_INDEX_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
$(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_array_index___mac_setfilecmd)
- 
- test_cpool$(EXEEXT): $(TEST_CPOOL_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_CPOOL_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_cpool___mac_setfilecmd)
- 
- test_datetime$(EXEEXT): $(TEST_DATETIME_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_DATETIME_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_DATETIME_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_datetime___mac_setfilecmd)
- 
- test_inttypes$(EXEEXT): $(TEST_INTTYPES_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_inttypes___mac_setfilecmd)
- 
- test_insertpolicy$(EXEEXT): $(TEST_INSERTPOLICY_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
$(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_insertpolicy___mac_setfilecmd)
- 
- test_manip$(EXEEXT): $(TEST_MANIP_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_MANIP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_MANIP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_manip___mac_setfilecmd)
- 
- test_null_comparison$(EXEEXT): $(TEST_NULL_COMPARISON_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
$(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_null_comparison___mac_setfilecmd)
- 
- test_query_copy$(EXEEXT): $(TEST_QUERY_COPY_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
$(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_query_copy___mac_setfilecmd)
- 
- test_qssqls$(EXEEXT): $(TEST_QSSQLS_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_qssqls___mac_setfilecmd)
- 
- test_qstream$(EXEEXT): $(TEST_QSTREAM_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_qstream___mac_setfilecmd)
- 
- test_sqlstream$(EXEEXT): $(TEST_SQLSTREAM_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_sqlstream___mac_setfilecmd)
- 
- test_ssqls2$(EXEEXT): $(TEST_SSQLS2_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) 
$(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
--      $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
-lmysqlpp_ssqls2parse -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
-lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_ssqls2___mac_setfilecmd)
- 
- test_string$(EXEEXT): $(TEST_STRING_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_STRING_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_STRING_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_string___mac_setfilecmd)
- 
- test_tcp$(EXEEXT): $(TEST_TCP_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_TCP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_TCP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_tcp___mac_setfilecmd)
- 
- test_uds$(EXEEXT): $(TEST_UDS_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_UDS_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_UDS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_uds___mac_setfilecmd)
- 
- test_wnp$(EXEEXT): $(TEST_WNP_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_WNP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_WNP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
-       
-       $(__test_wnp___mac_setfilecmd)
- 
-@@ -619,122 +619,122 @@
-       $(RANLIB) $@
- 
- cgi_jpeg$(EXEEXT): $(CGI_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(CGI_JPEG_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(CGI_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__cgi_jpeg___mac_setfilecmd)
- 
- cpool$(EXEEXT): $(CPOOL_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(CPOOL_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__cpool___mac_setfilecmd)
- 
- dbinfo$(EXEEXT): $(DBINFO_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(DBINFO_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(DBINFO_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__dbinfo___mac_setfilecmd)
- 
- deadlock$(EXEEXT): $(DEADLOCK_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(DEADLOCK_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(DEADLOCK_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__deadlock___mac_setfilecmd)
- 
- fieldinf$(EXEEXT): $(FIELDINF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(FIELDINF_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(FIELDINF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__fieldinf___mac_setfilecmd)
- 
- for_each$(EXEEXT): $(FOR_EACH_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(FOR_EACH_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(FOR_EACH_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__for_each___mac_setfilecmd)
- 
- load_jpeg$(EXEEXT): $(LOAD_JPEG_OBJECTS) 
$(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(LOAD_JPEG_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(LOAD_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__load_jpeg___mac_setfilecmd)
- 
- multiquery$(EXEEXT): $(MULTIQUERY_OBJECTS) 
$(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(MULTIQUERY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(MULTIQUERY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__multiquery___mac_setfilecmd)
- 
- resetdb$(EXEEXT): $(RESETDB_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(RESETDB_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(RESETDB_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__resetdb___mac_setfilecmd)
- 
- simple1$(EXEEXT): $(SIMPLE1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SIMPLE1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SIMPLE1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__simple1___mac_setfilecmd)
- 
- simple2$(EXEEXT): $(SIMPLE2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SIMPLE2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SIMPLE2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__simple2___mac_setfilecmd)
- 
- simple3$(EXEEXT): $(SIMPLE3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SIMPLE3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SIMPLE3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__simple3___mac_setfilecmd)
- 
- ssqls1$(EXEEXT): $(SSQLS1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__ssqls1___mac_setfilecmd)
- 
- ssqls2$(EXEEXT): $(SSQLS2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__ssqls2___mac_setfilecmd)
- 
- ssqls3$(EXEEXT): $(SSQLS3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__ssqls3___mac_setfilecmd)
- 
- ssqls4$(EXEEXT): $(SSQLS4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS4_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__ssqls4___mac_setfilecmd)
- 
- ssqls5$(EXEEXT): $(SSQLS5_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS5_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS5_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__ssqls5___mac_setfilecmd)
- 
- ssqls6$(EXEEXT): $(SSQLS6_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS6_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS6_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__ssqls6___mac_setfilecmd)
- 
- store_if$(EXEEXT): $(STORE_IF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(STORE_IF_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(STORE_IF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__store_if___mac_setfilecmd)
- 
- tquery1$(EXEEXT): $(TQUERY1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TQUERY1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TQUERY1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__tquery1___mac_setfilecmd)
- 
- tquery2$(EXEEXT): $(TQUERY2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TQUERY2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TQUERY2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__tquery2___mac_setfilecmd)
- 
- tquery3$(EXEEXT): $(TQUERY3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TQUERY3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TQUERY3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__tquery3___mac_setfilecmd)
- 
- tquery4$(EXEEXT): $(TQUERY4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TQUERY4_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TQUERY4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__tquery4___mac_setfilecmd)
- 
- transaction$(EXEEXT): $(TRANSACTION_OBJECTS) 
$(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TRANSACTION_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TRANSACTION_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
-       
-       $(__transaction___mac_setfilecmd)
- 

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
deleted file mode 100644
index ff814650e00..00000000000
--- a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/lib/dbdriver.cpp
-+++ b/lib/dbdriver.cpp
-@@ -257,7 +257,11 @@
-       }
-       
-       if ((n == 1) &&
-+#ifdef CLIENT_LONG_PASSWORD
-                       (o >= CLIENT_LONG_PASSWORD) &&
-+#else
-+                      (o >= CLIENT_MYSQL) &&
-+#endif
- #if MYSQL_VERSION_ID > 40000  // highest flag value varies by version
-                       (o <= CLIENT_MULTI_RESULTS)
- #else
---- a/lib/common.h
-+++ b/lib/common.h
-@@ -130,12 +130,6 @@
-       #define MYSQLPP_PATH_SEPARATOR '/'
- #endif
- 
--#if defined(MYSQLPP_MYSQL_HEADERS_BURIED)
--#     include <mysql/mysql_version.h>
--#else
--#     include <mysql_version.h>
--#endif
--
- namespace mysqlpp {
- 
- /// \brief Alias for 'true', to make code requesting exceptions more

diff --git a/dev-db/mysql++/files/mysql++-3.2.4-as-needed.patch 
b/dev-db/mysql++/files/mysql++-3.2.4-as-needed.patch
deleted file mode 100644
index 0de56d99294..00000000000
--- a/dev-db/mysql++/files/mysql++-3.2.4-as-needed.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-https://bugs.gentoo.org/635414
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -408,55 +408,55 @@ $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT): 
$(SSQLS2PARSE_OBJECTS) $(DLLPREFIX)mys
-       $(RANLIB) $@
- 
- ssqlsxlat$(EXEEXT): $(SSQLSXLAT_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) 
$(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
--      $(CXX) -o $@ $(SSQLSXLAT_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
-lmysqlpp_ssqls2parse -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLSXLAT_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
-lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_array_index$(EXEEXT): $(TEST_ARRAY_INDEX_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
$(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- test_cpool$(EXEEXT): $(TEST_CPOOL_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_CPOOL_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_datetime$(EXEEXT): $(TEST_DATETIME_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_DATETIME_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_DATETIME_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_inttypes$(EXEEXT): $(TEST_INTTYPES_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_insertpolicy$(EXEEXT): $(TEST_INSERTPOLICY_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
$(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- test_manip$(EXEEXT): $(TEST_MANIP_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_MANIP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_MANIP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_null_comparison$(EXEEXT): $(TEST_NULL_COMPARISON_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
$(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- test_query_copy$(EXEEXT): $(TEST_QUERY_COPY_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
$(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- test_qssqls$(EXEEXT): $(TEST_QSSQLS_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_qstream$(EXEEXT): $(TEST_QSTREAM_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_sqlstream$(EXEEXT): $(TEST_SQLSTREAM_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_ssqls2$(EXEEXT): $(TEST_SSQLS2_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) 
$(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
--      $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
-lmysqlpp_ssqls2parse -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp 
-lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_string$(EXEEXT): $(TEST_STRING_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_STRING_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_STRING_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_tcp$(EXEEXT): $(TEST_TCP_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_TCP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_TCP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_uds$(EXEEXT): $(TEST_UDS_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_UDS_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_UDS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- test_wnp$(EXEEXT): $(TEST_WNP_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TEST_WNP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp 
$(LIBS)
-+      $(CXX) -o $@ $(TEST_WNP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) 
-L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
- 
- $(LIBPREFIX)mysqlpp_excommon$(LIBEXT): $(EXCOMMON_OBJECTS) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
-       rm -f $@
-@@ -464,76 +464,76 @@ $(LIBPREFIX)mysqlpp_excommon$(LIBEXT): 
$(EXCOMMON_OBJECTS) $(DLLPREFIX)mysqlpp$(
-       $(RANLIB) $@
- 
- cgi_jpeg$(EXEEXT): $(CGI_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(CGI_JPEG_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(CGI_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- cpool$(EXEEXT): $(CPOOL_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(CPOOL_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- dbinfo$(EXEEXT): $(DBINFO_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(DBINFO_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(DBINFO_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- deadlock$(EXEEXT): $(DEADLOCK_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(DEADLOCK_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(DEADLOCK_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- fieldinf$(EXEEXT): $(FIELDINF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(FIELDINF_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(FIELDINF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- for_each$(EXEEXT): $(FOR_EACH_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(FOR_EACH_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(FOR_EACH_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- load_jpeg$(EXEEXT): $(LOAD_JPEG_OBJECTS) 
$(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(LOAD_JPEG_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(LOAD_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- multiquery$(EXEEXT): $(MULTIQUERY_OBJECTS) 
$(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(MULTIQUERY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(MULTIQUERY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- resetdb$(EXEEXT): $(RESETDB_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(RESETDB_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(RESETDB_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- simple1$(EXEEXT): $(SIMPLE1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SIMPLE1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SIMPLE1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- simple2$(EXEEXT): $(SIMPLE2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SIMPLE2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SIMPLE2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- simple3$(EXEEXT): $(SIMPLE3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SIMPLE3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SIMPLE3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- ssqls1$(EXEEXT): $(SSQLS1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- ssqls2$(EXEEXT): $(SSQLS2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- ssqls3$(EXEEXT): $(SSQLS3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- ssqls4$(EXEEXT): $(SSQLS4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS4_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- ssqls5$(EXEEXT): $(SSQLS5_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS5_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS5_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- ssqls6$(EXEEXT): $(SSQLS6_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(SSQLS6_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(SSQLS6_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- store_if$(EXEEXT): $(STORE_IF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(STORE_IF_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(STORE_IF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- tquery1$(EXEEXT): $(TQUERY1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TQUERY1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TQUERY1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- tquery2$(EXEEXT): $(TQUERY2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TQUERY2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TQUERY2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- tquery3$(EXEEXT): $(TQUERY3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TQUERY3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TQUERY3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- tquery4$(EXEEXT): $(TQUERY4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TQUERY4_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TQUERY4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- transaction$(EXEEXT): $(TRANSACTION_OBJECTS) 
$(LIBPREFIX)mysqlpp_excommon$(LIBEXT) 
$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
--      $(CXX) -o $@ $(TRANSACTION_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. 
-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  
-lmysqlpp_excommon -lmysqlpp $(LIBS)
-+      $(CXX) -o $@ $(TRANSACTION_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon 
-lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ 
@MYSQLPP_EXTRA_LIBS@
- 
- Makefile: configure.ac install.hta.in mysql++.bkl mysql++.spec.in 
doc/userman/userman.dbx.in lib/Doxyfile.in lib/mysql++.h.in ssx/Doxyfile.in
-       bakefile_gen

diff --git a/dev-db/mysql++/mysql++-2.3.2-r1.ebuild 
b/dev-db/mysql++/mysql++-2.3.2-r1.ebuild
deleted file mode 100644
index 6fc8b2c2745..00000000000
--- a/dev-db/mysql++/mysql++-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="http://tangentsoft.net/mysqlpp/";
-SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-db/mysql-connector-c:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/html/{refman,userman} )
-DOCS=( README{,.cygwin,.examples,.mingw,.unix,.vc} CREDITS ChangeLog
-       HACKERS Wishlist doc/pdf doc/README.devel doc/README.manuals
-       doc/refman doc/ssqls-pretty doc/userman )
-
-src_prepare() {
-       eapply "${FILESDIR}"/${P}-gcc-4.3.patch
-
-       for i in "${S}"/lib/*.h ; do
-               sed -i \
-                       -e '/#include </s,mysql.h,mysql/mysql.h,g' \
-                       -e '/#include 
</s,mysql_version.h,mysql/mysql_version.h,g' \
-                       "${i}" || die "Failed to sed ${i} for fixing MySQL 
includes"
-       done
-       sed -i 's/mysqlclient_r/mysqlclient/' "${S}/configure" || die
-       eapply_user
-}
-
-src_configure() {
-       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}
-}

diff --git a/dev-db/mysql++/mysql++-3.2.3-r1.ebuild 
b/dev-db/mysql++/mysql++-3.2.3-r1.ebuild
deleted file mode 100644
index 9a15b6e90ae..00000000000
--- a/dev-db/mysql++/mysql++-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/mysqlpp/releases/${P}.tar.gz";
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND="dev-db/mysql-connector-c:="
-DEPEND="${RDEPEND}"
-DOCS=( CREDITS.txt HACKERS.txt Wishlist doc/ssqls-pretty )
-PATCHES=(
-       "${FILESDIR}"/${PN}-3.2.1-gold.patch
-       "${FILESDIR}"/${PN}-3.2.3-mariadb-10.2.patch
-       "${FILESDIR}"/${PN}-3.2.3-as-needed.patch
-)
-
-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
-
-       default
-
-       _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"
-               --with-mysql-lib="${EPREFIX}$(mysql_config 
--variable=pkglibdir)"
-               --with-mysql-include="${EPREFIX}$(mysql_config 
--variable=pkgincludedir)"
-       )
-       econf "${myconf[@]}"
-}
-
-src_install() {
-       default
-       # install the docs and HTML pages
-       use doc && dodoc -r doc/pdf/ doc/refman/ doc/userman/ doc/html/
-}

diff --git a/dev-db/mysql++/mysql++-3.2.4.ebuild 
b/dev-db/mysql++/mysql++-3.2.4.ebuild
deleted file mode 100644
index 2edd2c0ee98..00000000000
--- a/dev-db/mysql++/mysql++-3.2.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool flag-o-matic
-
-DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="https://tangentsoft.net/mysql++/";
-SRC_URI="https://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz";
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND="|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )"
-DEPEND="${RDEPEND}"
-DOCS=( CREDITS.txt HACKERS.md doc/ssqls-pretty )
-PATCHES=(
-       "${FILESDIR}"/${PN}-3.2.1-gold.patch
-       "${FILESDIR}"/${PN}-3.2.4-as-needed.patch
-       "${FILESDIR}"/${PN}-3.2.4-only-unit-tests.patch
-)
-
-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
-
-       default
-
-       # we don't use eautoreconf to avoid dev-util/bakefile
-       _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"
-               --with-mysql-lib="${EPREFIX}$(mysql_config 
--variable=pkglibdir)"
-               --with-mysql-include="${EPREFIX}$(mysql_config 
--variable=pkgincludedir)"
-       )
-       econf "${myconf[@]}"
-}
-
-src_test() {
-       ONLY_UNIT_TESTS=1 "${S}"/dtest || die
-}
-
-src_install() {
-       default
-       # install the docs and HTML pages
-       use doc && dodoc -r doc/pdf/ doc/refman/ doc/userman/ doc/html/
-}

Reply via email to