| 1 |
commit: e5d9cca13d3c920b81e5a74bca153a6a1b97b25b |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 4 20:24:50 2013 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 4 20:24:50 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e5d9cca1 |
| 7 |
|
| 8 |
dev-db/mysql++ changed merged to tree. |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
dev-db/mysql++/Manifest | 1 - |
| 14 |
.../mysql++/files/mysql++-3.0-gcc-as-needed.patch | 130 -------------------- |
| 15 |
dev-db/mysql++/metadata.xml | 5 - |
| 16 |
dev-db/mysql++/mysql++-3.1.0.ebuild | 49 -------- |
| 17 |
4 files changed, 0 insertions(+), 185 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest |
| 20 |
deleted file mode 100644 |
| 21 |
index 37bb913..0000000 |
| 22 |
--- a/dev-db/mysql++/Manifest |
| 23 |
+++ /dev/null |
| 24 |
@@ -1 +0,0 @@ |
| 25 |
-DIST mysql++-3.1.0.tar.gz 1944101 SHA256 256c39a583e7d60947916851754c626312428e9b1d8af3309e34d64ff8404e92 SHA512 bb57bbf03c80edabff701132877f407ecfa1b76958d7655415c59ec939e80fbe250951a16c3d5ea6988dd2c778b623605cb65bf810501f392be2f6b6ad07ad90 WHIRLPOOL 0b5274e0fbc1b2cb40ade9699ddc46d5837e66f3a506502f4dae5f5de4689ac2ccf3989a674db073a36075c541046b174e80bbac3d7df393bd61ef3bfc99fd32 |
| 26 |
|
| 27 |
diff --git a/dev-db/mysql++/files/mysql++-3.0-gcc-as-needed.patch b/dev-db/mysql++/files/mysql++-3.0-gcc-as-needed.patch |
| 28 |
deleted file mode 100644 |
| 29 |
index d240761..0000000 |
| 30 |
--- a/dev-db/mysql++/files/mysql++-3.0-gcc-as-needed.patch |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,130 +0,0 @@ |
| 33 |
-=== modified file 'lib/refcounted.h' |
| 34 |
---- a/lib/refcounted.h 2012-10-18 11:37:55.322732178 -0300 |
| 35 |
-+++ b/lib/refcounted.h 2012-10-18 11:40:10.303349659 -0300 |
| 36 |
-@@ -29,6 +29,7 @@ |
| 37 |
- #define MYSQLPP_REFCOUNTED_H |
| 38 |
- |
| 39 |
- #include <memory> |
| 40 |
-+#include <cstddef> |
| 41 |
- |
| 42 |
- namespace mysqlpp { |
| 43 |
- |
| 44 |
-=== modified file 'ssx/genv2.cpp' |
| 45 |
---- a/ssx/genv2.cpp 2013-02-14 12:29:16.523261203 -0500 |
| 46 |
-+++ b/ssx/genv2.cpp 2013-02-14 12:29:29.983070930 -0500 |
| 47 |
-@@ -35,6 +35,7 @@ |
| 48 |
- #include <iostream> |
| 49 |
- #include <fstream> |
| 50 |
- #include <typeinfo> |
| 51 |
-+#include <cstring> |
| 52 |
- |
| 53 |
- using namespace std; |
| 54 |
- |
| 55 |
-== modified file 'Makefile.in' |
| 56 |
---- a/Makefile.in 2013-02-14 13:14:10.954718894 -0500 |
| 57 |
-+++ b/Makefile.in 2013-02-14 13:15:23.463679996 -0500 |
| 58 |
-@@ -471,87 +471,87 @@ |
| 59 |
- $(RANLIB) $@ |
| 60 |
- |
| 61 |
- ssqlsxlat$(EXEEXT): $(SSQLSXLAT_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) |
| 62 |
-- $(CXX) -o $@ $(SSQLSXLAT_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp -lmysqlpp_ssqls2parse $(LIBS) |
| 63 |
-+ $(CXX) -o $@ $(SSQLSXLAT_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp -lmysqlpp_ssqls2parse $(LDFLAGS) $(LIBS) |
| 64 |
- |
| 65 |
- $(__ssqlsxlat___mac_setfilecmd) |
| 66 |
- |
| 67 |
- test_array_index$(EXEEXT): $(TEST_ARRAY_INDEX_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 68 |
-- $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 69 |
-+ $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 70 |
- |
| 71 |
- $(__test_array_index___mac_setfilecmd) |
| 72 |
- |
| 73 |
- test_cpool$(EXEEXT): $(TEST_CPOOL_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 74 |
-- $(CXX) -o $@ $(TEST_CPOOL_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 75 |
-+ $(CXX) -o $@ $(TEST_CPOOL_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 76 |
- |
| 77 |
- $(__test_cpool___mac_setfilecmd) |
| 78 |
- |
| 79 |
- test_datetime$(EXEEXT): $(TEST_DATETIME_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 80 |
-- $(CXX) -o $@ $(TEST_DATETIME_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 81 |
-+ $(CXX) -o $@ $(TEST_DATETIME_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 82 |
- |
| 83 |
- $(__test_datetime___mac_setfilecmd) |
| 84 |
- |
| 85 |
- test_inttypes$(EXEEXT): $(TEST_INTTYPES_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 86 |
-- $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 87 |
-+ $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 88 |
- |
| 89 |
- $(__test_inttypes___mac_setfilecmd) |
| 90 |
- |
| 91 |
- test_insertpolicy$(EXEEXT): $(TEST_INSERTPOLICY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 92 |
-- $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 93 |
-+ $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 94 |
- |
| 95 |
- $(__test_insertpolicy___mac_setfilecmd) |
| 96 |
- |
| 97 |
- test_manip$(EXEEXT): $(TEST_MANIP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 98 |
-- $(CXX) -o $@ $(TEST_MANIP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 99 |
-+ $(CXX) -o $@ $(TEST_MANIP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 100 |
- |
| 101 |
- $(__test_manip___mac_setfilecmd) |
| 102 |
- |
| 103 |
- test_null_comparison$(EXEEXT): $(TEST_NULL_COMPARISON_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 104 |
-- $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 105 |
-+ $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 106 |
- |
| 107 |
- $(__test_null_comparison___mac_setfilecmd) |
| 108 |
- |
| 109 |
- test_query_copy$(EXEEXT): $(TEST_QUERY_COPY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 110 |
-- $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 111 |
-+ $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 112 |
- |
| 113 |
- $(__test_query_copy___mac_setfilecmd) |
| 114 |
- |
| 115 |
- test_qssqls$(EXEEXT): $(TEST_QSSQLS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 116 |
-- $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 117 |
-+ $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 118 |
- |
| 119 |
- $(__test_qssqls___mac_setfilecmd) |
| 120 |
- |
| 121 |
- test_qstream$(EXEEXT): $(TEST_QSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 122 |
-- $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 123 |
-+ $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 124 |
- |
| 125 |
- $(__test_qstream___mac_setfilecmd) |
| 126 |
- |
| 127 |
- test_sqlstream$(EXEEXT): $(TEST_SQLSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 128 |
-- $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 129 |
-+ $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 130 |
- |
| 131 |
- $(__test_sqlstream___mac_setfilecmd) |
| 132 |
- |
| 133 |
- test_ssqls2$(EXEEXT): $(TEST_SSQLS2_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) |
| 134 |
-- $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp -lmysqlpp_ssqls2parse $(LIBS) |
| 135 |
-+ $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp -lmysqlpp_ssqls2parse $(LDFLAGS) $(LIBS) |
| 136 |
- |
| 137 |
- $(__test_ssqls2___mac_setfilecmd) |
| 138 |
- |
| 139 |
- test_string$(EXEEXT): $(TEST_STRING_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 140 |
-- $(CXX) -o $@ $(TEST_STRING_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 141 |
-+ $(CXX) -o $@ $(TEST_STRING_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 142 |
- |
| 143 |
- $(__test_string___mac_setfilecmd) |
| 144 |
- |
| 145 |
- test_tcp$(EXEEXT): $(TEST_TCP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 146 |
-- $(CXX) -o $@ $(TEST_TCP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 147 |
-+ $(CXX) -o $@ $(TEST_TCP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 148 |
- |
| 149 |
- $(__test_tcp___mac_setfilecmd) |
| 150 |
- |
| 151 |
- test_uds$(EXEEXT): $(TEST_UDS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 152 |
-- $(CXX) -o $@ $(TEST_UDS_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 153 |
-+ $(CXX) -o $@ $(TEST_UDS_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 154 |
- |
| 155 |
- $(__test_uds___mac_setfilecmd) |
| 156 |
- |
| 157 |
- test_wnp$(EXEEXT): $(TEST_WNP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) |
| 158 |
-- $(CXX) -o $@ $(TEST_WNP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) |
| 159 |
-+ $(CXX) -o $@ $(TEST_WNP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS) |
| 160 |
- |
| 161 |
- $(__test_wnp___mac_setfilecmd) |
| 162 |
- |
| 163 |
|
| 164 |
diff --git a/dev-db/mysql++/metadata.xml b/dev-db/mysql++/metadata.xml |
| 165 |
deleted file mode 100644 |
| 166 |
index 716e7d4..0000000 |
| 167 |
--- a/dev-db/mysql++/metadata.xml |
| 168 |
+++ /dev/null |
| 169 |
@@ -1,5 +0,0 @@ |
| 170 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 171 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 172 |
-<pkgmetadata> |
| 173 |
-<herd>mysql</herd> |
| 174 |
-</pkgmetadata> |
| 175 |
|
| 176 |
diff --git a/dev-db/mysql++/mysql++-3.1.0.ebuild b/dev-db/mysql++/mysql++-3.1.0.ebuild |
| 177 |
deleted file mode 100644 |
| 178 |
index c467031..0000000 |
| 179 |
--- a/dev-db/mysql++/mysql++-3.1.0.ebuild |
| 180 |
+++ /dev/null |
| 181 |
@@ -1,49 +0,0 @@ |
| 182 |
-# Copyright 1999-2013 Gentoo Foundation |
| 183 |
-# Distributed under the terms of the GNU General Public License v2 |
| 184 |
-# $Header: $ |
| 185 |
- |
| 186 |
-EAPI="5" |
| 187 |
- |
| 188 |
-inherit eutils |
| 189 |
- |
| 190 |
-DESCRIPTION="C++ API interface to the MySQL database" |
| 191 |
-HOMEPAGE="http://tangentsoft.net/mysql++/" |
| 192 |
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz" |
| 193 |
- |
| 194 |
-LICENSE="LGPL-2" |
| 195 |
-SLOT="0/3" |
| 196 |
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 197 |
-IUSE="" |
| 198 |
- |
| 199 |
-RDEPEND=">=virtual/mysql-4.0" |
| 200 |
-DEPEND="${RDEPEND} |
| 201 |
- || ( >=sys-devel/gcc-3 >=sys-devel/gcc-apple-4 )" |
| 202 |
- |
| 203 |
-src_prepare() { |
| 204 |
- epatch "${FILESDIR}"/${PN}-3.0-gcc-as-needed.patch |
| 205 |
- |
| 206 |
- for i in "${S}"/lib/*.h ; do |
| 207 |
- sed -i \ |
| 208 |
- -e '/#include </s,mysql.h,mysql/mysql.h,g' \ |
| 209 |
- -e '/#include </s,mysql_version.h,mysql/mysql_version.h,g' \ |
| 210 |
- "${i}" |
| 211 |
- done |
| 212 |
- epatch_user |
| 213 |
-} |
| 214 |
- |
| 215 |
-src_configure() { |
| 216 |
- local myconf |
| 217 |
- use prefix || local EPREFIX= |
| 218 |
- myconf="--enable-thread-check --with-mysql=${EPREFIX}/usr" |
| 219 |
- |
| 220 |
- CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ |
| 221 |
- econf ${myconf} |
| 222 |
-} |
| 223 |
- |
| 224 |
-src_install() { |
| 225 |
- emake DESTDIR="${D}" install |
| 226 |
- # install the docs and HTML pages |
| 227 |
- dodoc README* CREDITS* ChangeLog HACKERS.txt Wishlist doc/ssqls-pretty |
| 228 |
- dodoc -r doc/pdf/ doc/refman/ doc/userman/ |
| 229 |
- dohtml -r doc/html/ |
| 230 |
-} |
Archives