diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2010-03-25 18:59:39 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-03-25 18:59:39 +0000 |
| commit | eeb1a01232b2179cb6ac893b8fa6ced3057c712a (patch) | |
| tree | ab4be0fe4a2364619ee50e0ce0f21e14e19ba4d8 /dev-db | |
| parent | Initial commit. (diff) | |
| download | gentoo-2-eeb1a01232b2179cb6ac893b8fa6ced3057c712a.tar.gz gentoo-2-eeb1a01232b2179cb6ac893b8fa6ced3057c712a.tar.bz2 gentoo-2-eeb1a01232b2179cb6ac893b8fa6ced3057c712a.zip | |
cmake QA cleanup from scarabeus.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql-connector-c++/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0_pre814.ebuild | 25 |
2 files changed, 15 insertions, 16 deletions
diff --git a/dev-db/mysql-connector-c++/ChangeLog b/dev-db/mysql-connector-c++/ChangeLog index 95813a20e607..0d42c90b75ff 100644 --- a/dev-db/mysql-connector-c++/ChangeLog +++ b/dev-db/mysql-connector-c++/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql-connector-c++ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.3 2010/03/24 22:43:25 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.4 2010/03/25 18:59:39 robbat2 Exp $ + + 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. diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0_pre814.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0_pre814.ebuild index 23e81fb89160..6db65d0a21dc 100644 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0_pre814.ebuild +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0_pre814.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.2 2010/03/24 21:37:58 robbat2 Exp $ +# $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" @@ -29,16 +29,7 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${P/_pre/~r}" -# cmake config helper function -use_cmake() { - local i_use="0" - use ${1} && i_use="1" - - echo ${i_use} -} - # cmake config that works ... -CMAKE_USE_DIR="." CMAKE_IN_SOURCE_BUILD="1" src_unpack() { @@ -57,9 +48,13 @@ src_configure() { # native lib/wrapper needs this! append-flags "-fno-strict-aliasing" - mycmakeargs="-DMYSQLCPPCONN_TRACE_ENABLE:BOOL=$(use_cmake debug) -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=0 MYSQLCPPCONN_GCOV_ENABLE:BOOL=$(use_cmake gcov) -DMYSQLCPPCONN_ICU_ENABLE:BOOL=0" + mycmakeargs=( + "-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF" + "-DMYSQLCPPCONN_ICU_ENABLE=OFF" + $(cmake-utils_use debug MYSQLCPPCONN_TRACE_ENABLE) + $(cmake-utils_use gconv MYSQLCPPCONN_GCOV_ENABLE) + ) - # configure cmake-utils_src_configure } @@ -78,13 +73,13 @@ src_install() { # fast install fails on useflag [-static-libs] # http://bugs.mysql.com/bug.php?id=52281 insinto /usr/include - doins driver/mysql_{connection,driver}.h + doins driver/mysql_{connection,driver}.h || die - dodoc ANNOUNCE* CHANGES* README + dodoc ANNOUNCE* CHANGES* README || die # examples if use examples; then insinto /usr/share/doc/${PF}/examples - doins "${S}"/examples/* + doins "${S}"/examples/* || die fi } |