gentoo resync : 24.12.2018

4 files changed, 21 insertions, 51 deletions

diff --git a/dev-ruby/charlock_holmes/Manifest b/dev-ruby/charlock_holmes/Manifest
index c30b34520ac8..5fab1e9dfc08 100644
--- a/dev-ruby/charlock_holmes/Manifest
+++ b/dev-ruby/charlock_holmes/Manifest
@@ -1,5 +1,4 @@
-DIST charlock_holmes-0.7.5.tar.gz 1192676 BLAKE2B d1e5bb3089d32ef7efa46fe54d37c71caa75b5d3a059c45d1d0275014822690031a8df894295e72be11be5ca685e90f35832dd6a06a4c482afe938da2a25ea28 SHA512 a5ee9d47d8c8386e7be9ad10e93e7bd7663713df285b33e5d8afd865570e463a9f785e568675363f9b949a8207bbcc144a7378dfb206645824e9f0abc33ec668
+AUX charlock_holmes-0.7.6-gcc5.patch 573 BLAKE2B bc7981242a1df4aac3d78362c20574249ac5ebc8d7df3d8b249945abbffa16ed185100c52091bc3394284545ece9038d5dc5e1a10ffb237b1f98acc8a4b2c43e SHA512 12a059e3bf41dc6d41b41d2596297a0c6e721ff2ce951b56fab578e11c15595af879cabce4c66a2bebbe2801a23bb8b0893dae6365a1b7de9243bd49b54ec527
 DIST charlock_holmes-0.7.6.tar.gz 1192708 BLAKE2B 9024238f225e7c5040c0550beb573615939037e0113672d7d048a9abd536d8e1d224eb1c8f6a155906074394838888960e955d0318c47fa2e1330e46275f4e99 SHA512 410a210e4fc7e9905f38e3f68375ffdf0cf73cca8a8b230d7c4165ac23503e2460692168b1eb5d69ff183e70d89e5dcfbf6688dd22b736f4adf3c9f3af18575b
-EBUILD charlock_holmes-0.7.5.ebuild 1034 BLAKE2B d4557d7ecac10ad750886599b4b8034060a5146a8928548339a81f6c223f5407f16217d1e7c99b7aed864043fb9682bb4adf9f4df415b85c5a71e7754573708a SHA512 56d3632678c3888fb5369f75ef1424954e3b7895ed3967f9621491f28c237595f314a9e4f32f03f54037cce6b48744af00070c6d860a61fa799fc24a2c328570
-EBUILD charlock_holmes-0.7.6.ebuild 1034 BLAKE2B d4557d7ecac10ad750886599b4b8034060a5146a8928548339a81f6c223f5407f16217d1e7c99b7aed864043fb9682bb4adf9f4df415b85c5a71e7754573708a SHA512 56d3632678c3888fb5369f75ef1424954e3b7895ed3967f9621491f28c237595f314a9e4f32f03f54037cce6b48744af00070c6d860a61fa799fc24a2c328570
+EBUILD charlock_holmes-0.7.6.ebuild 1081 BLAKE2B b55a9072068a1031e56b069b73923cefdce32040f7f3e94ee278d918007baf2f71b49e13b93621e1e96ff5d2095bb42d0ae680feb01496fa43690650350d7a86 SHA512 50f916abc0731fa382969b4417795eeb5f721c34767b38d37c37a855f4b0171ab1ce402f778f2133e8e76922953688e3667fc71ae66157bb933668060dad55d3
 MISC metadata.xml 352 BLAKE2B f0b9f88008f0d309ce4da3cbbe13bd43ff9d5090a4d27c3111187b98fea1bb43b3e9a421a164c4417df103c10d81a5d71bdf3fb370264b4c7783600ebff63ac4 SHA512 3e7b758723dc804702a6cd4b75a8cc866ae466bec06ce3192ddfeace2a7adf8ca44ce597fbb1f36671dada42751ccb2248a45e45036c4be94421cb97575dc765
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.7.5.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.7.5.ebuild
deleted file mode 100644
index b9bbacc1a91b..000000000000
--- a/dev-ruby/charlock_holmes/charlock_holmes-0.7.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Character encoding detecting library for Ruby using ICU"
-HOMEPAGE="https://github.com/brianmario/charlock_holmes"
-SRC_URI="https://github.com/brianmario/charlock_holmes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest )"
-
-CDEPEND="dev-libs/icu:=
-		sys-libs/zlib"
-DEPEND+=" ${CDEPEND}"
-RDEPEND+=" ${CDEPEND}"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' test/helper.rb || die
-
-	# Avoid dependency on rake-compiler
-	sed -i -e '/rake-compiler/,$ s:^:#:' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die
-}
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.7.6.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.7.6.ebuild
index b9bbacc1a91b..47c7658b1bd6 100644
--- a/dev-ruby/charlock_holmes/charlock_holmes-0.7.6.ebuild
+++ b/dev-ruby/charlock_holmes/charlock_holmes-0.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,8 @@ CDEPEND="dev-libs/icu:=
 DEPEND+=" ${CDEPEND}"
 RDEPEND+=" ${CDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.7.6-gcc5.patch )
+
 all_ruby_prepare() {
 	sed -i -e '/bundler/d' test/helper.rb || die
 
diff --git a/dev-ruby/charlock_holmes/files/charlock_holmes-0.7.6-gcc5.patch b/dev-ruby/charlock_holmes/files/charlock_holmes-0.7.6-gcc5.patch
new file mode 100644
index 000000000000..944efac19253
--- /dev/null
+++ b/dev-ruby/charlock_holmes/files/charlock_holmes-0.7.6-gcc5.patch
@@ -0,0 +1,16 @@
+--- a/ext/charlock_holmes/extconf.rb
++++ b/ext/charlock_holmes/extconf.rb
+@@ -54,11 +54,8 @@
+ have_library 'icuuc' or abort 'libicuuc missing'
+ have_library 'icudata' or abort 'libicudata missing'
+ 
+-# icu4c might be built in C++11 mode, but it also might not have been
+-icuconfig = `which icu-config`.chomp if icuconfig.empty?
+-if File.exist?(icuconfig) && `#{icuconfig} --cxxflags`.include?("c++11")
+-  $CXXFLAGS << ' -std=c++11'
+-end
++# Always use C++11
++$CXXFLAGS << ' -std=c++11'
+ 
+ $CFLAGS << ' -Wall -funroll-loops'
+ $CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']