gentoo resync : 23.12.2017

3 files changed, 3 insertions, 80 deletions

diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 8c40f17d60a4..4b9e09f69127 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,7 +1,5 @@
-DIST cairo-1.14.3.gem 97792 BLAKE2B f9503ab6d9f7cc1567c8de43e908633c784b676a474a17f33464a2713f418d4fa8cae1d359aeca577e3bdd8a5fb904841c17cbeff2fe6da5b2d734e1a0632160 SHA512 aba56403ca813bdcc56c01fed76642e4115a683ed3e3d056675195d2d86fc7dfa44f0077ca47407eeea27789824171251222e6300f3f3c395bc186afb616c772
 DIST cairo-1.15.10.gem 102912 BLAKE2B 55459487e9148f5b8fbdb00901cf0af9f2fd878ec0a73563e868f98aa76c517520d63702c19f10773c51545f638b7c9ccf69c1190aa324045cb82f5f93fed701 SHA512 af3cec5bf03022a5049922aaa0366b7330ec0e2003734ee855d1d9632d2027be6e08efd8b67c02bf3d006d11d8a7e28ac3d23ce9591940dc92442c7552858907
 DIST cairo-1.15.9.gem 102400 BLAKE2B 9b2c2f04b09ab858667edb74d5ac59c8b957edd49e989403f965cda1b06f4534bae6408cc119bd54c6842372524850a8a417583b95d6b70e6f4bca2c288f9fd8 SHA512 f934a0ad283145bb4710374ccb1b149c6f6bcdc69978cbcd45de8a9da319a4611249262b6ca4f8bd5ef3955739c54b24bb278e36c421cd0af91ed14a43eb7e98
-EBUILD rcairo-1.14.3.ebuild 1587 BLAKE2B aace82fd9a50c71ef6e9570e3f5d6e1d3f70dc225e76eb0b0e982a8f9732ab60cb263b07a953d4a79d0fdec77ea6954ed6d93533dc71b04336b15cbbc6bd6e62 SHA512 2ca8fcf937bff16ef641d7f7f84452c63612d3a66b6352ba06beff3d3b32b3708a55c96b10764ac6382ffb2c5fb4a9cfd0be9f0c188f943db70d5968ea516535
-EBUILD rcairo-1.15.10.ebuild 1876 BLAKE2B 5c2dfd2ff9f912f37b9f76f67cafc370c94855ea94d9475c5748282d8b36530c41d6bd0fe131f040f284952ff58980d028b0536d7d10581a09ab7f223408896b SHA512 abf1a78cadd60b72fe156782aa906b0a64885b94464b44d1daf82ee322cec7238814896aa82482dff85703e40c07230e97e8fe5cb4ec8e3cbbdad3cd2b5a3fd6
+EBUILD rcairo-1.15.10.ebuild 1875 BLAKE2B 256811730175500a1c4d3f6399f1934b95011e5dceaf6be002b190339f494ff44053bf82b98e06ef52a8514789820f1067dfaa2f92b5ad6fb03c0f6551fc4f17 SHA512 c320fa64b25f99ddd3baa6e72fea24adf878c8639543f6f34152a6ca2d2e9ea0f52d6129bb79bd42412fb663145b3bda8d4ad847d82e6f1b5e97fbfcf1b8b1de
 EBUILD rcairo-1.15.9-r1.ebuild 1882 BLAKE2B 07e37b1dd7004aa3ed619eb1805cc7e60c0879443f412f447e4e2bb1a721941e05a3a21b34aad2845a92fbafe426ef5fa139eee809670b35819d03ff38d4f17f SHA512 2aaaa43aa0c2fd3021434cfebddb2c6af209433c798fa5c011081195fe7ab545a2ee6e919500ac55eb604442545d3111a57e7cf37fa73bf88e293b2b398b3097
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rcairo/rcairo-1.14.3.ebuild b/dev-ruby/rcairo/rcairo-1.14.3.ebuild
deleted file mode 100644
index e4e06b35ef22..000000000000
--- a/dev-ruby/rcairo/rcairo-1.14.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_NAME="cairo"
-
-# Documentation depends on files that are not distributed.
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby bindings for cairo"
-HOMEPAGE="http://cairographics.org/rcairo/"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="amd64 ~ppc ~x86"
-
-RDEPEND="${RDEPEND}
-	>=x11-libs/cairo-1.2.0[svg]"
-DEPEND="${DEPEND}
-	>=x11-libs/cairo-1.2.0[svg]"
-
-ruby_add_bdepend "
-	dev-ruby/pkg-config
-	dev-ruby/ruby-glib2
-	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 )"
-
-all_ruby_prepare() {
-	# Avoid development dependency.
-	sed -i -e '/notify/ s:^:#:' test/cairo-test-utils.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/cairo extconf.rb || die "extconf failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/cairo
-
-	# again, try to make it more standard, to install it more easily.
-	cp ext/cairo/cairo$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	# don't rely on the Rakefile because it's a mess to load with
-	# their hierarchy, do it manually.
-	${RUBY} -Ilib -r ./test/cairo-test-utils.rb \
-		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	insinto $(ruby_get_hdrdir)
-	doins ext/cairo/rb_cairo.h
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/samples
-	doins -r samples/*
-}
diff --git a/dev-ruby/rcairo/rcairo-1.15.10.ebuild b/dev-ruby/rcairo/rcairo-1.15.10.ebuild
index cbd3a06cc2d8..7ba62f34cad5 100644
--- a/dev-ruby/rcairo/rcairo-1.15.10.ebuild
+++ b/dev-ruby/rcairo/rcairo-1.15.10.ebuild
@@ -24,7 +24,7 @@ IUSE=""
 
 SLOT="0"
 LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="${RDEPEND}
 	>=x11-libs/cairo-1.2.0[svg]"
@@ -32,7 +32,7 @@ DEPEND="${DEPEND}
 	>=x11-libs/cairo-1.2.0[svg]"
 
 ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.1.5
+	>=dev-ruby/pkg-config-1.2.2
 	dev-ruby/ruby-glib2
 	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 )"