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
