gentoo resync : 08.06.2019

3 files changed, 2 insertions, 68 deletions

diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 2df3ca22d549..2aae479ce551 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,11 +1,9 @@
 DIST ffi-git-1.10.0.tgz 166192 BLAKE2B a663da1272a41464bcc3fd6a69055615beaa75aca09da60a4459034230ddb7768573e6a91e75b0e768f16333f23e55e045b6cff3be63c5138c85070903cea869 SHA512 f4a7faa02eda8e67b4c05ecc93ed1848daa9d55ec2eaf367947dbb4cf6b0edd76db1e8232db0a17828df40c3cdabb9f7edac11b44f9de00bdb69d0c9a84d4409
 DIST ffi-git-1.11.0.tgz 156535 BLAKE2B e4c5e6406ff6603a3c41146d6ec3f07fdc3ba2243349b6a77083c195e1b9b40648950c82bcdbb846189b3162c43b23b3cabcde92a4e6f2f9fc8c4ccf03ac473d SHA512 38c66841fb33f7fe7abf0186ef48e28525b9b50450dd886716662ee8cd630374abb41a2fa5fec9cebdcae0e8ffa76ba5b36d89bd441d09a54503032c3950dd08
 DIST ffi-git-1.11.1.tgz 156715 BLAKE2B 4ea2d0f54dc6ef327c57408e568c5f728f5c387e810e25b6becab8119ebd8a20d6c834a80c1ababf3fd4fc4a4d4253146fc161f93fbf02e153f73fc812bad309 SHA512 7f6c2ae66a2ffc40b154ada2d3e2c0f81e79803ba693ce2a83d16ac6a210ac5494bcc4b28948b3b68c9802a7cacce77e4a7cb1c3c1105039c08c50e5c8137fd4
-DIST ffi-git-1.9.18.tgz 901805 BLAKE2B b04715095858d461e4a0a904185dbd603e391611ef446de385deb533d8fcbff0ada3f1865599fb51e3446df629c16d491c476e179cfa356c7d8c84e1827b2729 SHA512 49c52e5e42e436b7969c35a34b28bd7929d75372638ac5373486a1d624026c12dc682009bc101e4a2c8f1442ed6f1ba17b438cda2e02d4256622b489c4bd9945
 DIST ffi-git-1.9.25.tgz 164209 BLAKE2B aab3addb5d9138f81d0688ad628082e7aef5f96a1b046dfa57a7195dcf7432533052bb397ac8335f7b17ffece9424fad7d986065a82ac91437e0d8d27d76ac77 SHA512 94a45f4152458d6aedf50645c8074626dcde4326093a606e509c3fbcaac79a1e6a9f7df624f14946db4f3767ef6fb3e311e60531c209676e66ebbf21b07a6786
 EBUILD ffi-1.10.0.ebuild 1552 BLAKE2B 585d5be6c8ee4c59ce19767a43bc7c0fedc0dc27c9c94076d49e84156b3b0cfb17d2277cd31be1dad0be399b30fe8c7ecafb72b166bee4e61a8e498561422f97 SHA512 167427710f3068457893e51a677c1b6041cd56ef70afbf45988aa762fa4f729360858b6ea3b26958eb364973d80109f57b84da6edb707703f66272060bebf877
 EBUILD ffi-1.11.0.ebuild 1555 BLAKE2B 5632a82f896fc08b8b2603bfd5f9cdb6b904b81f5df97993b71c29f7c777655246a3cae68527f96dd9a54202c234ac7956c43fe2aaf34503a47fef666a92b6ca SHA512 9c3c415132088edf87b581091fa9a6a1178ca377b065d204a05987c2112488b6097a33a943c47f7ed52f01256dfc8eb86532208365cfa67efddbdd075cd62035
 EBUILD ffi-1.11.1.ebuild 1555 BLAKE2B 5632a82f896fc08b8b2603bfd5f9cdb6b904b81f5df97993b71c29f7c777655246a3cae68527f96dd9a54202c234ac7956c43fe2aaf34503a47fef666a92b6ca SHA512 9c3c415132088edf87b581091fa9a6a1178ca377b065d204a05987c2112488b6097a33a943c47f7ed52f01256dfc8eb86532208365cfa67efddbdd075cd62035
-EBUILD ffi-1.9.18.ebuild 1539 BLAKE2B f8a42a2d72c94d76b9f9c4178c212b429cf799ee912a7905e806a3aa14e16b361efa873feb00ce1aed50b9e8e0357029fbc805db2596720dcf6c4cfeeda1f168 SHA512 9bb9f63adea8e800990926785cb52853e5f3bfe8cf658381dd87da9eba60051d9d344b53c420816a5e31c29b0d0de88d70542041211118da7a2637d50a8b6bb2
-EBUILD ffi-1.9.25.ebuild 1537 BLAKE2B 348f396f6a4cabd71fab1d2cf1c122432a93b4986134fdda8276bb54eba3f6c040d4c94434a6a9d3d6fe729bc9525d740f3f2f6d07ab3110158188fa84e91347 SHA512 9ba767f47269db8fab5656d2a3b4c481201ad73c87b7b760c93b74046fb4c82971dc812b980e3bc80cf6cd378bc260fffe8e53799eddf4405721b4ea798e51fc
+EBUILD ffi-1.9.25.ebuild 1536 BLAKE2B 0a2619b617ea5020ab317bffbf4a2c0a0cc1e1cee48a8088a51e11eeb7cf083f9b9eec0504e1650936aa5c8d3f661db883bcf7929905c8a2d0d19a4f54a52fee SHA512 b7404417cb8ca9c045493fe7e2ae23cbf91b5dd57ef6b7d147f21f852635bb4a88c26cc2f32db26ae9c7b680bcb1cf609cde9b14c4dbbb7ea23daa240435f6cb
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.9.18.ebuild b/dev-ruby/ffi/ffi-1.9.18.ebuild
deleted file mode 100644
index efc484a7e18c..000000000000
--- a/dev-ruby/ffi/ffi-1.9.18.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" virtual/libffi"
-DEPEND+=" virtual/libffi"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ffi_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/ffi_c V=1
-	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.9.25.ebuild b/dev-ruby/ffi/ffi-1.9.25.ebuild
index 8ec0d504ae5b..479e12fa8481 100644
--- a/dev-ruby/ffi/ffi-1.9.25.ebuild
+++ b/dev-ruby/ffi/ffi-1.9.25.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" virtual/libffi"
 DEPEND+=" virtual/libffi"