gentoo resync : 25.08.2020

3 files changed, 82 insertions, 2 deletions

diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 6cbf454a8966..0ecd3f9cae00 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,7 +1,9 @@
 DIST cairo-1.16.2.gem 100352 BLAKE2B b8b02e949b33c60ebe05852efd1cd775a79dab5ab6837f973ecf1b2c1af653a7c09221892b92210b9e5a0d615732116a91e5e1e9f93229f98987c18b36514dcc SHA512 b711399ddd7afa958e3faee87b2a768f55af9ec0cef486d9edcf082a0c7a5ec90610d9a52784d55608a70befe4571e4cb1abc401a8a5b5357fa0bfff9159d239
 DIST cairo-1.16.4.gem 196608 BLAKE2B f7cc8d9e2dc5e3f6dc5a6e259f5594bd7a6cfb13c3577a870949696c25c5139b69d6809cceda664ccf7b7278536b2d551bbd42e4471154a302eb1710324c2792 SHA512 5af8536cd374255386fdc84b265deebb7ed21ef270538f0c2d6a5cdf3dcf1c913633f1ca813f197460968b20b6e592f24334b872cf822584d4de28c589160da8
 DIST cairo-1.16.5.gem 196608 BLAKE2B df84e6b0b4419471cdaacb7eaecf23b9257b8e0933dba0e3058afefc288cbb2f14acb38d4f5302f095ed37c46469eae61d934c8da2d0b1ef1cc48f06e794179f SHA512 98c10e16a3a2d964dd9b5fd450118068042e721f9655758ca567ed45f418ce1c2b9fe8cfa991a94778eb17d69fef65008d2c21244592f4f1819104bdeb76bdcc
+DIST cairo-1.16.6.gem 197120 BLAKE2B d5c1f1704592afb096d30504f2d74d27e29e6222fd1648895beab786efae071de70f942b31e2f49960ec91bd87f0297a2d3b07013e894951d4ec1e8d376e73dc SHA512 f499daa83e865d58cc29d158ce649cab9f939464a08e5d7711f6cf255fb8dcfbf52457e3d2b81aef2018ad8d0762117776049b3681c9be6abdf4f0b12e43404c
 EBUILD rcairo-1.16.2.ebuild 1793 BLAKE2B c7a07ee26d6e26d19d59ac423ab7b14f9b4df45c19511a36771c3c40edc03e18834c0df8cf4bfd28fbf8b017ae05033fe4bbe266be94dce40bab5e1f6c8c678a SHA512 c6267cc0d698413057a12072368c833ddcd777cc09c9d6ed713fce9670b45bf28a3bb7031d2a59098cdc9fa578de8da1e20e13218bf4baec0ee54029ae5816a5
 EBUILD rcairo-1.16.4.ebuild 1891 BLAKE2B 55ce6d910c377866b51d8ad3d525c56727727bb3fa04ddf28ef6c9a7424a56bde3f06c33eedd5292158ad7161b32344aece891c74503afe798cbc5fa613463cf SHA512 05b7b802b2623cba16d1677d216e35d68c340cb5d962973cfe19068708c8dee57924779b1b62599beae753d543712cf29ab9592ff4059e36a9485906e8ea1de2
-EBUILD rcairo-1.16.5.ebuild 1851 BLAKE2B 1b18f691c6666d219daedf12de256e4293ae8a77b1e939b70a8fa79670f59a8bf7ffdd8e9c49e2cdda88b314ec469b9ecc6b9fc757d54b477caa41ec5e2f141d SHA512 3a01341649ffbfbaf6c32d286cd5df1db6c318d60410e5638eb66113622b3890137f8db15707eed60fec44929ce56b53ba02cbce58b1b08f12d2023b69f2d6a9
+EBUILD rcairo-1.16.5.ebuild 1850 BLAKE2B 9c5512c5bfd2430614351e2d042112571bec231a5948f46711699f56a838ea601b36f24c2f85548722ec49bb9147f817bbfe4d70ca81a99e620960ab374f7b5e SHA512 ab5c12e5d02cdf9bb6ccf4a569c51ea12371250251f29a5864ae23c067ca010f1f03bc5b4513e9db890a3b4fe6389a027be243299a2bf77db0622fc1335bbef9
+EBUILD rcairo-1.16.6.ebuild 1812 BLAKE2B bffb4cbc3a6af87f881a3f84a405094edff6fc6219e498fb3944fe70a3d5c6236f3a2d46d607f7002aa9af6f6b360f3a509a20feb4b5d181202aac0613962637 SHA512 2f2be83f7b2de88d7112d255139518a0b308eaf86e503b4a7540035adbbf5f69ffa91c57b42cff9f3a867b87eb108837e8c423039e8490a3200bfe08b4fd4b43
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rcairo/rcairo-1.16.5.ebuild b/dev-ruby/rcairo/rcairo-1.16.5.ebuild
index ec94518c6401..73e22cc713ab 100644
--- a/dev-ruby/rcairo/rcairo-1.16.5.ebuild
+++ b/dev-ruby/rcairo/rcairo-1.16.5.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]"
diff --git a/dev-ruby/rcairo/rcairo-1.16.6.ebuild b/dev-ruby/rcairo/rcairo-1.16.6.ebuild
new file mode 100644
index 000000000000..ff61e4edeb3b
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.16.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="https://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-1.2.2
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency
+	sed -e '/native-package-installer/ s:^:#:' \
+		-e '/def required_pkg_config_package/areturn true' \
+		-e '/checking_for/,/^end/ s:^:#:' \
+		-i ext/cairo/extconf.rb || die
+	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
+
+	# Avoid test that requires unpackaged fixture
+	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.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/helper \
+		-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
+
+	dodoc -r samples
+}