Gentoo Archives: gentoo-commits

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