From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/mysql2/
Date: Wed, 28 Aug 2019 11:17:46 +0000 (UTC) [thread overview]
Message-ID: <1566991043.1023b00a2f872c4a56459e384d1e34a2cbec2ef7.whissi@gentoo> (raw)
commit: 1023b00a2f872c4a56459e384d1e34a2cbec2ef7
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 11:02:06 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 11:17:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1023b00a
dev-ruby/mysql2: rev bump to ease migration to dev-db/mysql-connector-c
Commit 66bf25c026c2c6136cc99b2c2657f46d0c790f10 replaced
virtual/libmysqlclient dependency with dev-db/mysql-connector-c atom
without a rev bump.
To avoid unecessary user interaction for users not using emerge's
--changed-deps=y because we are already pushing towards removal of
virtual/libmysqlclient (see commit 08b83d736f77fd5dffa9cd5f6b1b44771726ce94),
this commit will now force the re-installation through rev bump
to ease migration.
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild | 20 ++++---------
...l2-0.4.10-r1.ebuild => mysql2-0.4.10-r3.ebuild} | 0
dev-ruby/mysql2/mysql2-0.4.10.ebuild | 34 ----------------------
...{mysql2-0.5.1.ebuild => mysql2-0.5.1-r1.ebuild} | 0
...{mysql2-0.5.2.ebuild => mysql2-0.5.2-r2.ebuild} | 0
...sql2-0.5.2-r1.ebuild => mysql2-0.5.2-r3.ebuild} | 0
6 files changed, 5 insertions(+), 49 deletions(-)
diff --git a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
index a22fbdcd7a2..db127e8a393 100644
--- a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
# Tests require a live MySQL database but should all pass.
RUBY_FAKEGEM_TASK_TEST=""
@@ -19,23 +19,13 @@ HOMEPAGE="https://github.com/brianmario/mysql2"
LICENSE="MIT"
SLOT="0.4"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="mysql mariadb"
-REQUIRED_USE="^^ ( mariadb mysql )"
+IUSE=""
-MDEPEND="mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )"
-DEPEND="${DEPEND} ${MDEPEND}"
-RDEPEND="${RDEPEND} ${MDEPEND}"
+DEPEND="${DEPEND} dev-db/mysql-connector-c"
+RDEPEND="${RDEPEND} dev-db/mysql-connector-c:="
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
+ ${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
}
each_ruby_compile() {
diff --git a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r3.ebuild
similarity index 100%
copy from dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
copy to dev-ruby/mysql2/mysql2-0.4.10-r3.ebuild
diff --git a/dev-ruby/mysql2/mysql2-0.4.10.ebuild b/dev-ruby/mysql2/mysql2-0.4.10.ebuild
deleted file mode 100644
index db127e8a393..00000000000
--- a/dev-ruby/mysql2/mysql2-0.4.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} dev-db/mysql-connector-c"
-RDEPEND="${RDEPEND} dev-db/mysql-connector-c:="
-
-each_ruby_configure() {
- ${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || 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.1.ebuild b/dev-ruby/mysql2/mysql2-0.5.1-r1.ebuild
similarity index 100%
rename from dev-ruby/mysql2/mysql2-0.5.1.ebuild
rename to dev-ruby/mysql2/mysql2-0.5.1-r1.ebuild
diff --git a/dev-ruby/mysql2/mysql2-0.5.2.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r2.ebuild
similarity index 100%
rename from dev-ruby/mysql2/mysql2-0.5.2.ebuild
rename to dev-ruby/mysql2/mysql2-0.5.2-r2.ebuild
diff --git a/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r3.ebuild
similarity index 100%
rename from dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
rename to dev-ruby/mysql2/mysql2-0.5.2-r3.ebuild
next reply other threads:[~2019-08-28 11:17 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 11:17 Thomas Deutschmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-25 10:22 [gentoo-commits] repo/gentoo:master commit in: dev-ruby/mysql2/ Hans de Graaff
2025-04-01 16:57 Hans de Graaff
2025-04-01 16:57 Hans de Graaff
2025-02-08 10:16 Arthur Zamarin
2024-02-09 7:49 Hans de Graaff
2024-01-21 8:41 Hans de Graaff
2023-09-16 9:27 Sam James
2023-03-28 22:54 Sam James
2023-01-23 7:17 Hans de Graaff
2023-01-23 7:17 Hans de Graaff
2022-05-04 5:26 Hans de Graaff
2022-05-01 9:12 Hans de Graaff
2021-11-08 5:43 Hans de Graaff
2021-11-08 2:51 Yixun Lan
2021-11-07 12:06 Hans de Graaff
2021-09-18 7:59 Hans de Graaff
2021-09-18 7:59 Hans de Graaff
2021-02-13 9:51 Hans de Graaff
2020-09-16 6:18 Hans de Graaff
2020-08-08 5:49 Hans de Graaff
2020-04-20 17:05 Sergei Trofimovich
2020-04-20 17:05 Sergei Trofimovich
2020-04-20 17:05 Sergei Trofimovich
2020-02-27 6:05 Hans de Graaff
2020-02-27 6:05 Hans de Graaff
2019-11-28 6:18 Hans de Graaff
2019-08-24 10:30 Thomas Deutschmann
2019-05-13 16:46 Mikle Kolyada
2019-04-11 6:49 Hans de Graaff
2019-01-31 7:35 Hans de Graaff
2018-07-27 5:22 Hans de Graaff
2018-07-27 5:22 Hans de Graaff
2018-07-24 9:25 Hans de Graaff
2018-07-08 3:36 Hans de Graaff
2018-04-13 6:20 Hans de Graaff
2018-03-21 6:41 Hans de Graaff
2018-02-04 15:15 Hans de Graaff
2018-02-04 15:15 Hans de Graaff
2017-11-16 7:05 Hans de Graaff
2017-11-16 7:05 Hans de Graaff
2017-08-11 5:16 Hans de Graaff
2017-07-11 5:04 Hans de Graaff
2017-07-11 5:04 Hans de Graaff
2017-07-03 5:35 Hans de Graaff
2017-07-01 13:45 Alexis Ballier
2017-05-05 5:11 Hans de Graaff
2017-05-05 5:11 Hans de Graaff
2016-10-23 5:40 Hans de Graaff
2016-10-23 5:40 Hans de Graaff
2016-04-19 21:45 Manuel Rüger
2016-04-19 21:45 Manuel Rüger
2016-03-24 6:17 Hans de Graaff
2016-03-24 6:17 Hans de Graaff
2016-02-24 21:22 Manuel Rüger
2016-02-24 21:22 Manuel Rüger
2015-11-26 7:13 Hans de Graaff
2015-10-04 9:00 Hans de Graaff
2015-10-04 9:00 Hans de Graaff
2015-09-16 19:50 Manuel Rüger
2015-09-12 0:29 Manuel Rüger
2015-08-26 5:59 Hans de Graaff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1566991043.1023b00a2f872c4a56459e384d1e34a2cbec2ef7.whissi@gentoo \
--to=whissi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox