* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql-connector-c++/files/, dev-db/mysql-connector-c++/
@ 2011-07-30 0:48 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 2+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-30 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 561078a1cc0ecc09aea8e3e42106819288be60fc
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 00:48:04 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 00:48:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=561078a1
[dev-db/mysql-connector-c++] Added package to the overlay to bump to the 1.1.0 release.
(Portage version: 2.2.0_alpha47/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mysql-connector-c++/ChangeLog | 30 +++++++++
dev-db/mysql-connector-c++/Manifest | 25 ++++++++
.../mysql-connector-c++-1.1.0-fix-cmake.patch | 62 +++++++++++++++++++
dev-db/mysql-connector-c++/metadata.xml | 13 ++++
.../mysql-connector-c++-1.1.0.ebuild | 64 ++++++++++++++++++++
5 files changed, 194 insertions(+), 0 deletions(-)
diff --git a/dev-db/mysql-connector-c++/ChangeLog b/dev-db/mysql-connector-c++/ChangeLog
new file mode 100644
index 0000000..0d68f8d
--- /dev/null
+++ b/dev-db/mysql-connector-c++/ChangeLog
@@ -0,0 +1,30 @@
+# ChangeLog for dev-db/mysql-connector-c++
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.4 2010/03/25 18:59:39 robbat2 Exp $
+
+*mysql-connector-c++-1.1.0 (30 Jul 2011)
+
+ 30 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ +mysql-connector-c++-1.1.0.ebuild,
+ +files/mysql-connector-c++-1.1.0-fix-cmake.patch, +metadata.xml:
+ [dev-db/mysql-connector-c++] Added package to the overlay to bump to the
+ 1.1.0 release.
+
+ 25 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
+ mysql-connector-c++-1.1.0_pre814.ebuild:
+ cmake QA cleanup from scarabeus.
+
+ 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+ Ebuild submitter has agreed to be proxy maintainer as well now.
+
+ 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
+ mysql-connector-c++-1.1.0_pre814.ebuild:
+ Less global pollution per ssuominen's request.
+
+*mysql-connector-c++-1.1.0_pre814 (24 Mar 2010)
+
+ 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
+ +mysql-connector-c++-1.1.0_pre814.ebuild,
+ +files/mysql-connector-c++-1.1.0_pre814-libdir.patch, +metadata.xml:
+ Initial commit, ebuild submission by Hanno Meyer-Thurow <h.mth@web.de>.
+
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
new file mode 100644
index 0000000..dc5664f
--- /dev/null
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mysql-connector-c++-1.1.0-fix-cmake.patch 3015 RMD160 69b761631b82a1d497675c813ab3c0334f65277f SHA1 3bef25a3b29cec46db82a296a2f61a272f2a54b3 SHA256 113611bf50e8c12ff4b9dc9ddb134989456b27105bcf9e2bb0a2219a06c123f1
+DIST mysql-connector-c++-1.1.0.tar.gz 467089 RMD160 f98bf0a4c987f49054da62e1e86197049b03250a SHA1 9e8dd8025b5ef9707d3c1746dff6e8209198c5a2 SHA256 dfb8933dada706a1b3188b162fc5a9686b5ed46323bf09548ce291e8dd4545e2
+EBUILD mysql-connector-c++-1.1.0.ebuild 1605 RMD160 f1ea4d0009c5cfc4a06d1d7d98de51b78b643846 SHA1 29de3019797603f2fe42580ebe2039f957a57a5d SHA256 47af1498ff2806e8772fac235e2a302a13265e8b00740310150f690e1f79b66a
+MISC ChangeLog 1236 RMD160 8f58895ae8484e92b11dfd8c368be03a685d7652 SHA1 1535c565a917a2d79570178c3724e2dbb174fb8e SHA256 191e2a6ea857bcf0a4610b59834da044b91126a54c97a5b7bea81012b01aa44e
+MISC metadata.xml 379 RMD160 431086c55356c8f6aca5bc38f984f0645a4dfd2e SHA1 d0f27a21d581c41153c11398cedc50a861f5f8d1 SHA256 68c4224500ba7d9320df110796456903e67f3463e896d3d362bbb2dbc9297d5f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOM1TDAAoJEC8ZTXQF1qEPLtEQANP/6xKULRstWcJ9PjmpFxZ/
+1BW3zoHKFJ9jD+khcnfZJDdoF+nVJrTM4Ff//fzE9dp/H4SiMzMdDMjShGfdTOPe
+bmws/xk77iaHwEqAzDqqiikm0CBO075E431+y8l6Tbxh0e2k+twEroXlqeAas+wT
+i9RhOoqCKQHsVaTVlfJyvjgn/KnVo+9Tpg3tOi28rTMOsU4zZz33/o+qY0vYMLup
+Q23Tug7LsTXTPEv3QYFTUddj20cnl1BHuXaINbxR+pfRg4jzPvwwVAVz6fe9n+mZ
+l7NAb6TZfJxZ9uyvMx/f4DCQ3Tcc26g/p/w6l02tzpVqSeJeRSj5HCSWm7kexUA0
+m7UT5CgbcTEinlQ+R0Hsj9MffI28jKXV+BREvP09T+B6Aqi67KRxpeRvyjjGufWp
+3HU0L6WEgmA2YSySzTJEFezo59172sDbjTJC8lmp7p/xcB06B2uZqG/Y59t6ZXk7
+UAKPe1dzaXn8QDP9iZKX04FdjYOch0m+NY805VTaLDEvUll/zTIcc4lCbctaoVj4
+jQFmvhWuIreboX/kWaNFG/d1Fz9u9xrlCIJA2F5EEeEVnNfwP7UH02W9jqepqubV
+Bw9IFOioLs2PH097U6GG2SPXgoZXVMlbP/7WPGJpF7fqUo0hb/RDwhO1Atp++fhc
+OwUXzHWBhWuogn2dGGm2
+=vJ91
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch
new file mode 100644
index 0000000..6f3fef1
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch
@@ -0,0 +1,62 @@
+diff -urN mysql-connector-c++-1.1.0-orig/CMakeLists.txt mysql-connector-c++-1.1.0/CMakeLists.txt
+--- mysql-connector-c++-1.1.0-orig/CMakeLists.txt 2011-07-30 00:24:14.671033213 +0000
++++ mysql-connector-c++-1.1.0/CMakeLists.txt 2011-07-30 00:24:25.998033218 +0000
+@@ -232,7 +232,7 @@
+ "install_manifest.txt")
+ SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_DRAFT" )
+
+-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$")
++SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$")
+ SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
+ SET(CPACK_SOURCE_GENERATOR "TGZ")
+
+diff -urN mysql-connector-c++-1.1.0-orig/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
+--- mysql-connector-c++-1.1.0-orig/driver/CMakeLists.txt 2011-07-30 00:24:14.673033220 +0000
++++ mysql-connector-c++-1.1.0/driver/CMakeLists.txt 2011-07-30 00:24:48.932033247 +0000
+@@ -26,6 +26,9 @@
+
+ INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
+ INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
+ INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
+ MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
+
+@@ -149,20 +151,22 @@
+ nativeapi/native_statement_wrapper.h
+ nativeapi/mysql_native_resultset_wrapper.h
+ nativeapi/native_resultset_wrapper.h
+- ../cppconn/warning.h
+- ../cppconn/statement.h
+- ../cppconn/sqlstring.h
+- ../cppconn/resultset_metadata.h
+- ../cppconn/resultset.h
+- ../cppconn/prepared_statement.h
+- ../cppconn/parameter_metadata.h
+- ../cppconn/metadata.h
+- ../cppconn/exception.h
+- ../cppconn/driver.h
+- ../cppconn/datatype.h
+- ../cppconn/connection.h
+- ../cppconn/config.h
+- ../cppconn/build_config.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
++ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
++ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
+
+ )
+
diff --git a/dev-db/mysql-connector-c++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml
new file mode 100644
index 0000000..1f0cc66
--- /dev/null
+++ b/dev-db/mysql-connector-c++/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<use>
+<flag name='gcov'>Build coverage support</flag>
+</use>
+ <maintainer>
+ <email>h.mth@web.de</email>
+ <description>Proxied developer. Please CC on bugs.</description>
+ <name>Hanno Meyer-Thurow</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0.ebuild
new file mode 100644
index 0000000..c3b728a
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0_pre814.ebuild,v 1.3 2010/03/25 18:59:39 robbat2 Exp $
+
+EAPI="2"
+
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="http://forge.mysql.com/wiki/Connector_C++"
+URI_DIR="Connector-C++"
+SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples gcov static"
+
+DEPEND=">=virtual/mysql-5.1
+ dev-libs/boost
+ dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-cmake.patch" )
+
+src_configure() {
+ # native lib/wrapper needs this!
+ append-flags "-fno-strict-aliasing"
+
+ mycmakeargs=(
+ "-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF"
+ "-DMYSQLCPPCONN_ICU_ENABLE=OFF"
+ $(cmake-utils_use debug MYSQLCPPCONN_TRACE_ENABLE)
+ $(cmake-utils_use gconv MYSQLCPPCONN_GCOV_ENABLE)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ # make
+ cmake-utils_src_compile mysqlcppconn
+
+ # make static
+ use static && cmake-utils_src_compile mysqlcppconn-static
+}
+
+src_install() {
+ # install - ignore failure for now ...
+ emake DESTDIR="${D}" install/fast
+
+ # fast install fails on useflag [-static-libs]
+ # http://bugs.mysql.com/bug.php?id=52281
+ insinto /usr/include
+ doins driver/mysql_{connection,driver}.h || die
+
+ dodoc ANNOUNCE* CHANGES* README || die
+
+ # examples
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins "${S}"/examples/* || die
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql-connector-c++/files/, dev-db/mysql-connector-c++/
@ 2011-07-30 13:07 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 2+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-30 13:07 UTC (permalink / raw
To: gentoo-commits
commit: a21f52c48e0e1792b3aa8619100b53402d66626b
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 13:07:26 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 13:07:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a21f52c4
[dev-db/mysql-connector-c++] Dropped package now that Tomas (scarabeus) improved it and moved it to the tree.
(Portage version: 2.2.0_alpha47/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
dev-db/mysql-connector-c++/ChangeLog | 30 ---------
dev-db/mysql-connector-c++/Manifest | 25 --------
.../mysql-connector-c++-1.1.0-fix-cmake.patch | 62 -------------------
dev-db/mysql-connector-c++/metadata.xml | 13 ----
.../mysql-connector-c++-1.1.0.ebuild | 64 --------------------
5 files changed, 0 insertions(+), 194 deletions(-)
diff --git a/dev-db/mysql-connector-c++/ChangeLog b/dev-db/mysql-connector-c++/ChangeLog
deleted file mode 100644
index 0d68f8d..0000000
--- a/dev-db/mysql-connector-c++/ChangeLog
+++ /dev/null
@@ -1,30 +0,0 @@
-# ChangeLog for dev-db/mysql-connector-c++
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.4 2010/03/25 18:59:39 robbat2 Exp $
-
-*mysql-connector-c++-1.1.0 (30 Jul 2011)
-
- 30 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
- +mysql-connector-c++-1.1.0.ebuild,
- +files/mysql-connector-c++-1.1.0-fix-cmake.patch, +metadata.xml:
- [dev-db/mysql-connector-c++] Added package to the overlay to bump to the
- 1.1.0 release.
-
- 25 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
- mysql-connector-c++-1.1.0_pre814.ebuild:
- cmake QA cleanup from scarabeus.
-
- 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
- Ebuild submitter has agreed to be proxy maintainer as well now.
-
- 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
- mysql-connector-c++-1.1.0_pre814.ebuild:
- Less global pollution per ssuominen's request.
-
-*mysql-connector-c++-1.1.0_pre814 (24 Mar 2010)
-
- 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
- +mysql-connector-c++-1.1.0_pre814.ebuild,
- +files/mysql-connector-c++-1.1.0_pre814-libdir.patch, +metadata.xml:
- Initial commit, ebuild submission by Hanno Meyer-Thurow <h.mth@web.de>.
-
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
deleted file mode 100644
index dc5664f..0000000
--- a/dev-db/mysql-connector-c++/Manifest
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX mysql-connector-c++-1.1.0-fix-cmake.patch 3015 RMD160 69b761631b82a1d497675c813ab3c0334f65277f SHA1 3bef25a3b29cec46db82a296a2f61a272f2a54b3 SHA256 113611bf50e8c12ff4b9dc9ddb134989456b27105bcf9e2bb0a2219a06c123f1
-DIST mysql-connector-c++-1.1.0.tar.gz 467089 RMD160 f98bf0a4c987f49054da62e1e86197049b03250a SHA1 9e8dd8025b5ef9707d3c1746dff6e8209198c5a2 SHA256 dfb8933dada706a1b3188b162fc5a9686b5ed46323bf09548ce291e8dd4545e2
-EBUILD mysql-connector-c++-1.1.0.ebuild 1605 RMD160 f1ea4d0009c5cfc4a06d1d7d98de51b78b643846 SHA1 29de3019797603f2fe42580ebe2039f957a57a5d SHA256 47af1498ff2806e8772fac235e2a302a13265e8b00740310150f690e1f79b66a
-MISC ChangeLog 1236 RMD160 8f58895ae8484e92b11dfd8c368be03a685d7652 SHA1 1535c565a917a2d79570178c3724e2dbb174fb8e SHA256 191e2a6ea857bcf0a4610b59834da044b91126a54c97a5b7bea81012b01aa44e
-MISC metadata.xml 379 RMD160 431086c55356c8f6aca5bc38f984f0645a4dfd2e SHA1 d0f27a21d581c41153c11398cedc50a861f5f8d1 SHA256 68c4224500ba7d9320df110796456903e67f3463e896d3d362bbb2dbc9297d5f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJOM1TDAAoJEC8ZTXQF1qEPLtEQANP/6xKULRstWcJ9PjmpFxZ/
-1BW3zoHKFJ9jD+khcnfZJDdoF+nVJrTM4Ff//fzE9dp/H4SiMzMdDMjShGfdTOPe
-bmws/xk77iaHwEqAzDqqiikm0CBO075E431+y8l6Tbxh0e2k+twEroXlqeAas+wT
-i9RhOoqCKQHsVaTVlfJyvjgn/KnVo+9Tpg3tOi28rTMOsU4zZz33/o+qY0vYMLup
-Q23Tug7LsTXTPEv3QYFTUddj20cnl1BHuXaINbxR+pfRg4jzPvwwVAVz6fe9n+mZ
-l7NAb6TZfJxZ9uyvMx/f4DCQ3Tcc26g/p/w6l02tzpVqSeJeRSj5HCSWm7kexUA0
-m7UT5CgbcTEinlQ+R0Hsj9MffI28jKXV+BREvP09T+B6Aqi67KRxpeRvyjjGufWp
-3HU0L6WEgmA2YSySzTJEFezo59172sDbjTJC8lmp7p/xcB06B2uZqG/Y59t6ZXk7
-UAKPe1dzaXn8QDP9iZKX04FdjYOch0m+NY805VTaLDEvUll/zTIcc4lCbctaoVj4
-jQFmvhWuIreboX/kWaNFG/d1Fz9u9xrlCIJA2F5EEeEVnNfwP7UH02W9jqepqubV
-Bw9IFOioLs2PH097U6GG2SPXgoZXVMlbP/7WPGJpF7fqUo0hb/RDwhO1Atp++fhc
-OwUXzHWBhWuogn2dGGm2
-=vJ91
------END PGP SIGNATURE-----
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch
deleted file mode 100644
index 6f3fef1..0000000
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -urN mysql-connector-c++-1.1.0-orig/CMakeLists.txt mysql-connector-c++-1.1.0/CMakeLists.txt
---- mysql-connector-c++-1.1.0-orig/CMakeLists.txt 2011-07-30 00:24:14.671033213 +0000
-+++ mysql-connector-c++-1.1.0/CMakeLists.txt 2011-07-30 00:24:25.998033218 +0000
-@@ -232,7 +232,7 @@
- "install_manifest.txt")
- SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_DRAFT" )
-
--SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$")
-+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$")
- SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
- SET(CPACK_SOURCE_GENERATOR "TGZ")
-
-diff -urN mysql-connector-c++-1.1.0-orig/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
---- mysql-connector-c++-1.1.0-orig/driver/CMakeLists.txt 2011-07-30 00:24:14.673033220 +0000
-+++ mysql-connector-c++-1.1.0/driver/CMakeLists.txt 2011-07-30 00:24:48.932033247 +0000
-@@ -26,6 +26,9 @@
-
- INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
- INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
- INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
- MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
-
-@@ -149,20 +151,22 @@
- nativeapi/native_statement_wrapper.h
- nativeapi/mysql_native_resultset_wrapper.h
- nativeapi/native_resultset_wrapper.h
-- ../cppconn/warning.h
-- ../cppconn/statement.h
-- ../cppconn/sqlstring.h
-- ../cppconn/resultset_metadata.h
-- ../cppconn/resultset.h
-- ../cppconn/prepared_statement.h
-- ../cppconn/parameter_metadata.h
-- ../cppconn/metadata.h
-- ../cppconn/exception.h
-- ../cppconn/driver.h
-- ../cppconn/datatype.h
-- ../cppconn/connection.h
-- ../cppconn/config.h
-- ../cppconn/build_config.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
-+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
-
- )
-
diff --git a/dev-db/mysql-connector-c++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml
deleted file mode 100644
index 1f0cc66..0000000
--- a/dev-db/mysql-connector-c++/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mysql</herd>
-<use>
-<flag name='gcov'>Build coverage support</flag>
-</use>
- <maintainer>
- <email>h.mth@web.de</email>
- <description>Proxied developer. Please CC on bugs.</description>
- <name>Hanno Meyer-Thurow</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0.ebuild
deleted file mode 100644
index c3b728a..0000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0_pre814.ebuild,v 1.3 2010/03/25 18:59:39 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils cmake-utils flag-o-matic
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="http://forge.mysql.com/wiki/Connector_C++"
-URI_DIR="Connector-C++"
-SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug examples gcov static"
-
-DEPEND=">=virtual/mysql-5.1
- dev-libs/boost
- dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-cmake.patch" )
-
-src_configure() {
- # native lib/wrapper needs this!
- append-flags "-fno-strict-aliasing"
-
- mycmakeargs=(
- "-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF"
- "-DMYSQLCPPCONN_ICU_ENABLE=OFF"
- $(cmake-utils_use debug MYSQLCPPCONN_TRACE_ENABLE)
- $(cmake-utils_use gconv MYSQLCPPCONN_GCOV_ENABLE)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- # make
- cmake-utils_src_compile mysqlcppconn
-
- # make static
- use static && cmake-utils_src_compile mysqlcppconn-static
-}
-
-src_install() {
- # install - ignore failure for now ...
- emake DESTDIR="${D}" install/fast
-
- # fast install fails on useflag [-static-libs]
- # http://bugs.mysql.com/bug.php?id=52281
- insinto /usr/include
- doins driver/mysql_{connection,driver}.h || die
-
- dodoc ANNOUNCE* CHANGES* README || die
-
- # examples
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins "${S}"/examples/* || die
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-30 13:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-30 13:07 [gentoo-commits] proj/mysql:master commit in: dev-db/mysql-connector-c++/files/, dev-db/mysql-connector-c++/ Jorge Manuel B. S. Vicetto
-- strict thread matches above, loose matches on Subject: below --
2011-07-30 0:48 Jorge Manuel B. S. Vicetto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox