From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16F5D138335 for ; Fri, 27 Jul 2018 05:22:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 108FAE08C4; Fri, 27 Jul 2018 05:22:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB5C4E0871 for ; Fri, 27 Jul 2018 05:22:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BFB19335CA7 for ; Fri, 27 Jul 2018 05:22:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF70738B for ; Fri, 27 Jul 2018 05:22:51 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1532668959.5a1fde69591c721fad86009bda19acbceb5f449f.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/mysql2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/mysql2/metadata.xml dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild X-VCS-Directories: dev-ruby/mysql2/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 5a1fde69591c721fad86009bda19acbceb5f449f X-VCS-Branch: master Date: Fri, 27 Jul 2018 05:22:51 +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: c16885c5-b510-4cce-8d40-d4b5ebc56c9c X-Archives-Hash: 74ba7fd34f9aeed41d0e4e3269b2523d commit: 5a1fde69591c721fad86009bda19acbceb5f449f Author: Hans de Graaff gentoo org> AuthorDate: Fri Jul 27 05:20:42 2018 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Fri Jul 27 05:22:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a1fde69 dev-ruby/mysql2: add mariadb and mysql USE flag Compile against the mysql or mariadb C Connectors. Add mariadb and mysql USE flags to determine which connector is used. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-ruby/mysql2/metadata.xml | 3 +++ dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild | 44 +++++++++++++++++++++++++++++++++ dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild | 44 +++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+) diff --git a/dev-ruby/mysql2/metadata.xml b/dev-ruby/mysql2/metadata.xml index 91fbcba571b..9ee135bb6b8 100644 --- a/dev-ruby/mysql2/metadata.xml +++ b/dev-ruby/mysql2/metadata.xml @@ -8,4 +8,7 @@ brianmario/mysql2 + + Use mariadb bindings + diff --git a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild new file mode 100644 index 00000000000..0c94423e474 --- /dev/null +++ b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24 ruby25" + +# Tests require a live MySQL database but should all pass. +RUBY_FAKEGEM_TASK_TEST="" + +RUBY_FAKEGEM_TASK_DOC="" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit multilib ruby-fakegem + +DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql" +HOMEPAGE="https://github.com/brianmario/mysql2" + +LICENSE="MIT" +SLOT="0.4" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" +IUSE="mysql mariadb" +REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )" + +MDEPEND="mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c )" +DEPEND="${DEPEND} ${MDEPEND}" +RDEPEND="${RDEPEND} ${MDEPEND}" + +each_ruby_configure() { + local config + if use mysql ; then + config="${EPREFIX}/usr/bin/mysql_config" + fi + if use mariadb ; then + config="${EPREFIX}/usr/bin/mariadb_config" + fi + + ${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config=${config} || die +} + +each_ruby_compile() { + emake V=1 -Cext/mysql2 + cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die +} diff --git a/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild new file mode 100644 index 00000000000..3772cc9b80f --- /dev/null +++ b/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24 ruby25" + +# Tests require a live MySQL database but should all pass. +RUBY_FAKEGEM_TASK_TEST="" + +RUBY_FAKEGEM_TASK_DOC="" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit multilib ruby-fakegem + +DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql" +HOMEPAGE="https://github.com/brianmario/mysql2" + +LICENSE="MIT" +SLOT="0.5" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" +IUSE="mysql mariadb" +REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )" + +MDEPEND="mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c )" +DEPEND="${DEPEND} ${MDEPEND}" +RDEPEND="${RDEPEND} ${MDEPEND}" + +each_ruby_configure() { + local config + if use mysql ; then + config="${EPREFIX}/usr/bin/mysql_config" + fi + if use mariadb ; then + config="${EPREFIX}/usr/bin/mariadb_config" + fi + + ${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die +} + +each_ruby_compile() { + emake V=1 -Cext/mysql2 + cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die +}