From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 33C3C59CA2 for ; Sat, 13 Feb 2016 03:19:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08A4CE07A0; Sat, 13 Feb 2016 03:19:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27AACE07A0 for ; Sat, 13 Feb 2016 03:19:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D539B340A13 for ; Sat, 13 Feb 2016 03:19:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7A9B8F8 for ; Sat, 13 Feb 2016 03:18:56 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1455333494.972caa8864e48a48aa50d58f6900435a2a36fa19.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mariadb-connector-c/ChangeLog dev-db/mariadb-connector-c/Manifest dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild X-VCS-Directories: dev-db/mariadb-connector-c/files/ dev-db/mariadb-connector-c/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 972caa8864e48a48aa50d58f6900435a2a36fa19 X-VCS-Branch: master Date: Sat, 13 Feb 2016 03:18:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ac3ca8ae-78fb-4275-b672-ad2045f406eb X-Archives-Hash: bf61634edb9539b64e03818c03be09a9 commit: 972caa8864e48a48aa50d58f6900435a2a36fa19 Author: Brian Evans gentoo org> AuthorDate: Sat Feb 13 03:18:14 2016 +0000 Commit: Brian Evans gentoo org> CommitDate: Sat Feb 13 03:18:14 2016 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=972caa88 dev-db/mariadb-connector-c: Version bump Package-Manager: portage-2.2.27 Manifest-Sign-Key: 0xD1F781EFF9F4A3B6 dev-db/mariadb-connector-c/ChangeLog | 6 ++ dev-db/mariadb-connector-c/Manifest | 25 +++----- .../files/gentoo-layout-2.2.2.patch | 24 ++++++++ .../mariadb-connector-c-2.2.2.ebuild | 72 ++++++++++++++++++++++ 4 files changed, 112 insertions(+), 15 deletions(-) diff --git a/dev-db/mariadb-connector-c/ChangeLog b/dev-db/mariadb-connector-c/ChangeLog index aae4bd6..2457265 100644 --- a/dev-db/mariadb-connector-c/ChangeLog +++ b/dev-db/mariadb-connector-c/ChangeLog @@ -1,3 +1,9 @@ +*mariadb-connector-c-2.2.2 (13 Feb 2016) + + 13 Feb 2016; Brian Evans + +files/gentoo-layout-2.2.2.patch, +mariadb-connector-c-2.2.2.ebuild: + dev-db/mariadb-connector-c: Version bump + 15 Aug 2015; Brian Evans mariadb-connector-c-2.0.0-r1.ebuild, mariadb-connector-c-2.1.0.ebuild, mariadb-connector-c-9999.ebuild: diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest index f2d8d4d..7358e41 100644 --- a/dev-db/mariadb-connector-c/Manifest +++ b/dev-db/mariadb-connector-c/Manifest @@ -2,23 +2,18 @@ Hash: SHA256 DIST mariadb-connector-c-2.1.0-src.tar.gz 1912888 SHA256 568050b89463af7610d458669fd9eee06dcc9405689aca8a526ac8c013b59167 SHA512 1bf06ed2fe2a39c15bbd48029b2e6aaf0a9b4704f18e0caa9f356f6b41c8e57e5170e83e875929eb77ec631250f983d1cf8d60d78156b1e6795518a1a346bbe7 WHIRLPOOL 205319d1e4b47f41f2e5f409f66ba9101d7a041ac7550f3886471db02ae329d671a12ebd2177bbec83d2f99baa603589ca8d45fe09ed7f4f20c26a9150ed0624 +DIST mariadb-connector-c-2.2.2-src.tar.gz 519724 SHA256 93f56ad9f08bbaf0da8ef03bc96f7093c426ae40dede60575d485e1b99e6406b SHA512 8e7b35345de3ae3902b74613646c17641e441548ec87eb97c635c98dcddb0862411a625d9e82ba62324babe21d0d099a241b074826f0b396b425a80e714dd355 WHIRLPOOL e09d535186726cad6c880327e2045176a8bc773675381262bcff071ecccbdaa6b2fc802250cedf9d3a5f8848fa178fba9a8e236e3d3d988800826176376b91b1 DIST mariadb_client-2.0.0-src.tar.gz 1923436 SHA256 fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 SHA512 7be7454dedc218bb5cdeae5d54c461129cc4611d0e380c4d2bf60bc276e85ea0ae52b0dcf8a41edef0e0e678e1392c2ddcebb9c4a75ad4625808fd0cc7522c75 WHIRLPOOL be699bbda7d86a8708347fcfdc0ebdc17f1fe6ee6e4d1b839e849673450849ab4838eee8d6995a45009a899dbe88d63f7e09dc94933b598b16709db92958aa55 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJVz8uUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE -MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2a6YP/31jEv+FjVwcuXO5twJo/GDD -TvolosUT979zeD8/VHlrLykAsDJIIqUlVPeHA9bdJ+FvksFvKqi5bZmHJiKcc93z -Spvu/z0s8T1BRez5GK3R0iljabebGKkpIg+s3CfFrOlXtyuco+7m/vG+GfAvaqZP -61yMWVc8Exj0BtiQCSMFaCLeueVcyW3Np7dvp+jPXG4A+pILLJigq/mOp8Gf+aSb -8WZbhqaXipuYc5IONjEdyROabKBfp2PsuU/I+TNPo1aF5mgfQ6YUBok2h5A8+i1R -jOvUMP45kt7AannwTrnPU8l0KbGhvwBhI2HF30BggPDEjFTlLitv/xaDUJUEaYpm -d24PtCP3fPOetEX9v5K+dIde/XeGdhmLA02yyh2oH9Ryvmkawu/+n7UHR5YVS3/F -N0lBgK1QlpoWlI3mhlyh/vh7dbzQxsJSISNUipS79HIot4JNgxoneawOZDbGXhnO -xxReUHb8AkN8hY1TnaUquXNBtZ5BQpqQkcLEoeZMZEIZ9FX4mvd8ZldmEYhGQmTP -UkEATZiKn8PhVMkAOiaUONpIX38D+EzfUBfxnOEem0TF0P8rgDsjEfzkOAuWmrun -F8WIBNwPpcZjVm2y7h8lwCTJUl0o2qkMkk+Acw/1y8eOUlO+fW3LMGu7xBrFmoP+ -f5w97K+BgCuRL7ulssrQ -=48nq +iQF8BAEBCABmBQJWvqB2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0 +RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44drH8H/0UNsMpIuoPMkj176qCbHiKI +pE2AyIf3GcLi95sPDEUO5IhQRAcOulxaMQfLctVSb2Yp1iCVrSS89cNC2AAnkyrb +ZHBpWMFdf4Fg8SyfIJfaYkrGayXoOabum1HVlfsvz6bgQvHqCBjrPL8Q4rFCZtKM +MJXBw1kXLdwPVKkQDgf4Id3Ganu+euVd8KLLuifXIvgVu+fNbJ0kMULK83DaAMiE +3buUD8MDEtI0QmYoGVr0LWnbvpnHSql+nmrk+7P1hn/Drn3xSBhytcLNVBu16lKZ +tgKwgb2ahLJrdzE0y4rtuaOcuhEp+Np186/qX+wnIxEPmJX7g8v3RB2om9rOmUo= +=GltZ -----END PGP SIGNATURE----- diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch b/dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch new file mode 100644 index 0000000..dd43133 --- /dev/null +++ b/dev-db/mariadb-connector-c/files/gentoo-layout-2.2.2.patch @@ -0,0 +1,24 @@ +diff -aurN a/cmake/install.cmake b/cmake/install.cmake +--- a/cmake/install.cmake 2015-12-08 02:50:35.000000000 -0500 ++++ b/cmake/install.cmake 2016-02-12 21:40:46.599011426 -0500 +@@ -120,12 +120,6 @@ + SET(PREFIX_INSTALL_DIR_${INSTALL_LAYOUT} ${PREFIX_INSTALL_DIR}) + ENDIF() + +-IF(NOT SUFFIX_INSTALL_DIR) +- SET(SUFFIX_INSTALL_DIR_${INSTALL_LAYOUT} "mariadb") +-ELSE() +- SET(SUFFIX_INSTALL_DIR_${INSTALL_LAYOUT} ${SUFFIX_INSTALL_DIR}) +-ENDIF() +- + FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS" "PREFIX" "SUFFIX" "PLUGIN") + SET(${dir}_INSTALL_DIR ${${dir}_INSTALL_DIR_${INSTALL_LAYOUT}}) + MARK_AS_ADVANCED(${dir}_INSTALL_DIR) +--- a/mariadb_config/CMakeLists.txt 2016-02-12 21:21:06.981021227 -0500 ++++ b/mariadb_config/CMakeLists.txt 2016-02-12 22:06:02.397130410 -0500 +@@ -33,4 +33,4 @@ + # Installation + # + INSTALL(TARGETS mariadb_config +- DESTINATION "bin") ++ DESTINATION ${BIN_INSTALL_DIR}) diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild new file mode 100644 index 0000000..4c91c54 --- /dev/null +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VCS_INHERIT="" +if [[ "${PV}" == 9999 ]] ; then + VCS_INHERIT="git-r3" + EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git" + KEYWORDS="" +else + MY_PN=${PN#mariadb-} + SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV}/${P}-src.tar.gz?serve -> ${P}-src.tar.gz" + S="${WORKDIR}" + KEYWORDS="~amd64 ~x86" +fi + +inherit cmake-utils multilib-minimal ${VCS_INHERIT} + +MULTILIB_CHOST_TOOLS=( /usr/sbin/mariadb_config ) + +MULTILIB_WRAPPED_HEADERS+=( + /usr/include/mariadb/my_config.h +) + +DESCRIPTION="C client library for MariaDB/MySQL" +HOMEPAGE="http://mariadb.org/" +LICENSE="LGPL-2.1" + +SLOT="0/2" +IUSE="mysqlcompat +ssl static-libs" + +DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] + virtual/libiconv:=[${MULTILIB_USEDEP}] + ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + " +RDEPEND="${DEPEND} + mysqlcompat? ( + !dev-db/mysql + !dev-db/mysql-cluster + !dev-db/mariadb + !dev-db/mariadb-galera + !dev-db/percona-server + !dev-db/mysql-connector-c ) + " +PATCHES=( "${FILESDIR}/fix-mariadb_config-2.1.0.patch" + "${FILESDIR}/gentoo-layout-2.2.2.patch" ) + +multilib_src_configure() { + mycmakeargs+=( + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DWITH_EXTERNAL_ZLIB=ON + -DWITH_OPENSSL=$(usex ssl ON OFF) + -DWITH_MYSQLCOMPAT=$(usex mysqlcompat ON OFF) + -DLIB_INSTALL_DIR=$(get_libdir) + -DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin + -DDOCS_INSTALL_DIR=share/docs + -DBIN_INSTALL_DIR=sbin + ) + cmake-utils_src_configure +} + +multilib_src_install_all() { + if ! use static-libs ; then + find "${D}" -name "*.a" -delete || die + fi + if use mysqlcompat ; then + dosym /usr/sbin/mariadb_config /usr/bin/mysql_config + dosym mariadb /usr/include/mysql + fi +}