gentoo resync : 23.03.2018

6 files changed, 46 insertions, 59 deletions

diff --git a/dev-ruby/database_cleaner/Manifest b/dev-ruby/database_cleaner/Manifest
index 0fdf4dad873f..cae25c2aa4df 100644
--- a/dev-ruby/database_cleaner/Manifest
+++ b/dev-ruby/database_cleaner/Manifest
@@ -1,9 +1,5 @@
-DIST database_cleaner-1.5.3.gem 56832 BLAKE2B 3b775c84c8887bfd603a5aec2410b4c7c9e0e98ab71709350ee5e0872b760ec88e60b13709bb17e296e55e780a42247019545e282c9d1b25d07d1583b3583534 SHA512 0f497dd852c5447f9f46586cd1d0c774dbc21813708c4e82777ef824b370d49a6508b721953d778d93ba3e5c71c0f0786e66db3be99b9426e0f41e57d4b09241
-DIST database_cleaner-1.6.0.gem 55296 BLAKE2B 6125deaefdc396a43e632cce488a67e2d97cb734947fa2bbe71206ffc08246d9a0f160dd8792987aa22a9b753f5c75c902a8a58bd0364f010a20e685a6ac47cf SHA512 e9a711d85c76b66d632a82328f13282c4c3b2bd87ecedd81ac83198bdccdbf82c6b6e8ca1d3b9330183e12ae422280600f83ec299526a3cedbb93fa9e2e332f4
-DIST database_cleaner-1.6.1.gem 55296 BLAKE2B 2d6e88a95e416bbfa06ea6417c2a8f770b82fb3dcf41381be9f307a2ab91b4850bb45478c6334f198d3203eccce33f515740fa127cd2a3a207d9f70c944f6a6d SHA512 fb6b2f271079e2c365b3ccc5d3f9cae2dd5ff6e9769889a2765ccf95c348bca7d33b22d6b167f8850c6483340105635e8593009c5a7a77acbf8c0fb3d9a7d548
+AUX database_cleaner-1.6.2-table-quote.patch 1721 BLAKE2B ecf7b79cd6205b2977eb2316ffa7302f35800dfc12f115c308df424cd6b30c62f2ff649214e50189def8cb516916ccec840e301fc337c2ad72bc3f3b24dc3187 SHA512 d8b3aa504c3da30518b74600d2c1482cd3335674cdf1066d280a81848c77d3ca6aaf1a56cbb68736e6d8065e368d6a72b5a2ed711bb1509b2e2b0607258678f2
 DIST database_cleaner-1.6.2.gem 53760 BLAKE2B f36c8d4d020dd6aa7a170d2a01a4daf9413aeb41747649c862ae864d5c18ee17d16630688486d2c9b643390828f08ab7a53b2e92c752c8b73c7f4389529268ac SHA512 b28c622d6792517bf013783007829868faf68502a47d4d1bd029f627d6594edfd1f3c53533daeb2c84bae3c97d76bea8a68699531dc908661e326ecca8f2644b
-EBUILD database_cleaner-1.5.3.ebuild 571 BLAKE2B 1cb45abf82e5509ac541a5655f87b099535a5bc535fd027cf7a2bdfa9e69abeaab8fe1e8bef54d8b2fc3e0c4156ba8d02366c923ad04ade709b33160b6e0de61 SHA512 1740160bfe4038ef9b6150f4525959776402ceed0c8d47562e20bd2a45246a57a30692d5562dbcd9af0f51997f05822834e0d7c9774b089668f847325158851d
-EBUILD database_cleaner-1.6.0.ebuild 571 BLAKE2B c8738541d6528791cf5b0ed8d9911a909397dd8272988dd19fda574cb4c0bebced0ef2ff80b240af02b7e388fd518ce7a8d67a667f867bc4d11a4415d81b4c31 SHA512 2f1c13a553ff56728da9f9a53c7c5e1fa9179b1725bb4643a5c67ee02ef498bf32ef5bb10fb19aa0f9708c4b8f9c36776f442f8e956631ad0c5c32032d4910db
-EBUILD database_cleaner-1.6.1.ebuild 571 BLAKE2B c8738541d6528791cf5b0ed8d9911a909397dd8272988dd19fda574cb4c0bebced0ef2ff80b240af02b7e388fd518ce7a8d67a667f867bc4d11a4415d81b4c31 SHA512 2f1c13a553ff56728da9f9a53c7c5e1fa9179b1725bb4643a5c67ee02ef498bf32ef5bb10fb19aa0f9708c4b8f9c36776f442f8e956631ad0c5c32032d4910db
-EBUILD database_cleaner-1.6.2.ebuild 564 BLAKE2B 7f8ce5c48f8fc006b9d344ecf34cd2e08ad713816cfbb55b824f6143d926985a820276fa02a380fd6a483fc09124293ae45b9d0e5190d00b6a3be090455c97e9 SHA512 a78d456a4facbf0ce133964145807c012228ddb16033b51f1b2735a32304fc269dce329d1fc3c0710961a972764a427132e24cd048a27b699fb5ac532427f6dc
+EBUILD database_cleaner-1.6.2-r1.ebuild 621 BLAKE2B ad312f4ce3f8efe62f479beddd80c14bbd95e5480196ce55afa1e63f83d6ca6a43d294240847aba6fbaae68bd09d1a2bb1b48981ca4ddf31ca463c89b7fc5f9a SHA512 14e72b46ee84fee2a90ae129ff3909f8fa55436623a8dee816b7a2ed8e31185b700f6851f83d98c44118f6662e5f461ffd197cc66326b90e8df1b2f5e97475bb
+EBUILD database_cleaner-1.6.2.ebuild 571 BLAKE2B 3a16d1c4c08a510c3d12f243420497a295eb5c3bc696a14a803fc9137e03d3a445448c4ca7b08ab9a853fb83de1c9c7df7c6afdf762e4e13dd43e583f8ff5408 SHA512 9688c6f8a2b50858d0b93d3d889340cea57388a712a8be85493bf316500870426a1e056c2f0931dde170c3f6bb61b60d77afc5774162c328e0eafe752dbb6f57
 MISC metadata.xml 463 BLAKE2B aa54e63c2fc7cfa83a048cc9f70789185c9cf4836f47b751b6c48035499cf65abed563b17ad84f694a2ae00c94a451bbf4b9f9d39497cce564e6a20b8da95c81 SHA512 a12b679f4afc997a2c3081569dacdded277548662d36915ea0429ef86034cf696bf66e9dfa28538ea47c42ba6839ad5042e3a3372db49fed6758b359fc1bb51c
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.5.3.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.5.3.ebuild
deleted file mode 100644
index ad88f2993514..000000000000
--- a/dev-ruby/database_cleaner/database_cleaner-1.5.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_DOC="examples"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.markdown TODO"
-
-# There are specs and features but they all require configured databases.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Strategies for cleaning databases"
-HOMEPAGE="https://github.com/bmabey/database_cleaner"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.6.1.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.6.1.ebuild
deleted file mode 100644
index 27bec6219538..000000000000
--- a/dev-ruby/database_cleaner/database_cleaner-1.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_DOC="examples"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.markdown TODO"
-
-# There are specs and features but they all require configured databases.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Strategies for cleaning databases"
-HOMEPAGE="https://github.com/bmabey/database_cleaner"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.6.0.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.6.2-r1.ebuild
index 27bec6219538..6a4f09e7b5f8 100644
--- a/dev-ruby/database_cleaner/database_cleaner-1.6.0.ebuild
+++ b/dev-ruby/database_cleaner/database_cleaner-1.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_DOC="examples"
@@ -22,3 +22,5 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-table-quote.patch" )
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.6.2.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.6.2.ebuild
index e1b551e1e95e..61a1e06221c3 100644
--- a/dev-ruby/database_cleaner/database_cleaner-1.6.2.ebuild
+++ b/dev-ruby/database_cleaner/database_cleaner-1.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_DOC="examples"
diff --git a/dev-ruby/database_cleaner/files/database_cleaner-1.6.2-table-quote.patch b/dev-ruby/database_cleaner/files/database_cleaner-1.6.2-table-quote.patch
new file mode 100644
index 000000000000..2ca8c9781247
--- /dev/null
+++ b/dev-ruby/database_cleaner/files/database_cleaner-1.6.2-table-quote.patch
@@ -0,0 +1,37 @@
+From 94f3c412b154100e53b0800622a503ee56e39a6d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20B=C3=BChmann?= <dev@uuml.de>
+Date: Sun, 27 Aug 2017 09:24:41 +0200
+Subject: [PATCH] Properly quote table names in table_stats_query
+
+---
+ lib/database_cleaner/active_record/deletion.rb | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/lib/database_cleaner/active_record/deletion.rb b/lib/database_cleaner/active_record/deletion.rb
+index 59a41c4..d172355 100644
+--- a/lib/database_cleaner/active_record/deletion.rb
++++ b/lib/database_cleaner/active_record/deletion.rb
+@@ -66,14 +66,16 @@ def table_stats_query(connection, db_name)
+       if @cache_tables && !@table_stats_query.nil?
+         return @table_stats_query
+       else
+-        @table_stats_query = connection.select_values(<<-SQL).join(' UNION ')
+-               SELECT CONCAT('SELECT \"', table_name, '\" AS table_name, COUNT(*) AS exact_row_count FROM ', table_name)
+-               FROM
+-               INFORMATION_SCHEMA.TABLES
+-               WHERE
+-               table_schema = '#{db_name}'
+-               AND #{::DatabaseCleaner::ActiveRecord::Base.exclusion_condition('table_name')};
++        tables = connection.select_values(<<-SQL)
++          SELECT table_name
++          FROM information_schema.tables
++          WHERE table_schema = '#{db_name}'
++          AND #{::DatabaseCleaner::ActiveRecord::Base.exclusion_condition('table_name')};
+         SQL
++        queries = tables.map do |table|
++          "SELECT #{connection.quote(table)} AS table_name, COUNT(*) AS exact_row_count FROM #{connection.quote_table_name(table)}"
++        end
++        @table_stats_query = queries.join(' UNION ')
+       end
+     end
+