cmake QA cleanup from scarabeus.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-db/mysql-connector-c++/ChangeLog b/dev-db/mysql-connector-c++/ChangeLog
index 95813a20e607600056071deea8abb50b62d89323..0d42c90b75ffc26aebb80f259989595c02ed7a7a 100644 (file)
--- 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++/Manifest b/dev-db/mysql-connector-c++/Manifest
index c26f4ec00616a5d71b5fe0a709e61b18daf92df8..44483082ed947faa7780b0217a2a9dce98e7d2b0 100644 (file)
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,6 +1,6 @@
 AUX mysql-connector-c++-1.1.0_pre814-libdir.patch 1592 RMD160 824260dd878311f8ab6f184a3c9f5894a2d8898a SHA1 7a1f85b059401c3b3b651f6c413ffd8ff2fa1e59 SHA256 8117b906e8bb62f7b3ae807e81a7826e4575ab76f22f49765919d06aab3c3c25
 DIST mysql-connector-c++_1.1.0~r814-1.diff.gz 5693 RMD160 c26c7a18ce087b2d286461cbcbe8714293a9cf22 SHA1 6f00b592c6d59e346a85cb4fdec181b425f4591f SHA256 4b0abf2bbc2a5092908a3f96a1b9a2dbc0d6fa47019ab664dce091d3b9318229
 DIST mysql-connector-c++_1.1.0~r814.orig.tar.gz 612017 RMD160 82f1ac597c335d3f102a941a9ed6ca3c06645f8a SHA1 12952ce4915e12d4861c119abe51f2cd75591cc8 SHA256 0cb8bffb793a0770a5d8c3cbbba36b073685493508e54e68260c51e4fe8d5d9c
-EBUILD mysql-connector-c++-1.1.0_pre814.ebuild 2183 RMD160 d6b78b85460ea86d16ab3dda6e401d8737b1b29a SHA1 c9303522162f5ab0fad8d592b66c1eb4d5ab6285 SHA256 851f50fbb37903ed215df10fedb2cad31e908fff94d258c34b76a0a09747b451
-MISC ChangeLog 798 RMD160 ef90f5c97c0edea3484574b58c928ee09bd1347d SHA1 6d1beec4d3df44f72deb5e8d313e6e28f7cfadc6 SHA256 f2a2cf13d95f3526f8451eb4dee177e266ed9a0cc6ac74f7c4c41cab69be38fc
+EBUILD mysql-connector-c++-1.1.0_pre814.ebuild 2079 RMD160 3dd8b8355cc10afe3fc68ef865c7b3963936fffa SHA1 015f845774debc47c4d8217c09f1a4caefd6be3d SHA256 f97d8a155b0f099e1b33c8003df611764bc631799c87a21061e18928338ab378
+MISC ChangeLog 930 RMD160 9c217a47aae1798f1375b4ada438a2a554f778eb SHA1 4775949708637fa891b89aad38eb95cd7b28dd14 SHA256 8a27e1f69c15c367226a73e1261dbfa4a3d3d627133314b9987ffea2ef5b5ebb
 MISC metadata.xml 379 RMD160 431086c55356c8f6aca5bc38f984f0645a4dfd2e SHA1 d0f27a21d581c41153c11398cedc50a861f5f8d1 SHA256 68c4224500ba7d9320df110796456903e67f3463e896d3d362bbb2dbc9297d5f

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 23e81fb891609a68e65a9b11f1de9fa782702ceb..6db65d0a21dcd13854d5c92ffa57baae8f1d7e9a 100644 (file)
--- 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
 }

diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 33f3521c98a428ebd5d193be213f2e76dfb39442..81e2abd91fcb0afae4303cb42aeec9f52840f9b9 100644 (file)
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -4,5 +4,5 @@ AUX redis.confd 450 RMD160 237a72f30b3ba5c77e7dd31d2dfebc2db2cea2ad SHA1 4c29881
 AUX redis.initd 859 RMD160 a5718f3b4eab11450223c21bc98ab75d408e932e SHA1 ba3237364dba1da920ec4f14c13ff2cd45062144 SHA256 8b25b60bca695a8393e381078b2a42330c1b6cc2953bbe3c1b7cbd41ca36fe5d
 DIST redis-1.2.5.tar.gz 204039 RMD160 c2c6606a4d4607f897f673cf0e32f76e51794571 SHA1 f28d840d8100586796cab02ccd8e91545a92179d SHA256 43bbb937b530cf736c19110dae8cd71d3369b2a6129654396956e62683902025
 EBUILD redis-1.2.5.ebuild 2183 RMD160 81c9de387c1aa300a2296224cc5011797a237e74 SHA1 26b7ba671a3dfebca07985e3d7ba1487d3016086 SHA256 fca827362e25ed5fa6571815cf16aa5a31e688f16b1f262d37febeb3aa315ac1
-MISC ChangeLog 687 RMD160 98e3f652d8e83e6e1e8f97081cecd4d3f7707fcf SHA1 a87c5d073be6aef9c8037961628df26aaccd1244 SHA256 cefe00ff14ad59314702b3637f59dc151d7b3645b9dc80ad7a2bae00d2416345
-MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
+MISC ChangeLog 792 RMD160 8bc31a8c6400e3ea22103e64b60de5bbdc68b13e SHA1 4df3bcf5ba30a5b606c37cb377aa1132bafca0f0 SHA256 23bee8d3f0cf69d6be75275f29b0d8f104518151956994a2182b34e537eb9ba6
+MISC metadata.xml 286 RMD160 796347dd794b46c810de136066b1c310e84e5c73 SHA1 8044d4fb86e7f0172aefb8ae554632a1a1a22210 SHA256 b32cc88172bf73d4e6d06b599b5f6cfde057fe487e5f285c081bd772711352d4