gentoo resync : 26.12.2017

3 files changed, 3 insertions, 51 deletions

diff --git a/dev-ruby/ruby-xslt/Manifest b/dev-ruby/ruby-xslt/Manifest
index a430d5761b11..342da7a7c7ee 100644
--- a/dev-ruby/ruby-xslt/Manifest
+++ b/dev-ruby/ruby-xslt/Manifest
@@ -1,5 +1,3 @@
 DIST ruby-xslt-0.9.10.gem 35328 BLAKE2B aa0a627e76fcbc5626018389b5adbdbef1d54cc228f5622fd8cef4305e2d79c023c193031b8f8cc5f0e63d9c0af96edc0398beea4ac7f5eafe3dcf13ad2ff0ea SHA512 b196a517b19c6cb91ed6f4543ecfc6b58532e66f460029d2618e792cfe4078342fcb4428642328cbe6d97d1d942a6025ecff617578fc3abe2b0e414bf61ca1c4
-DIST ruby-xslt-0.9.9.gem 34816 BLAKE2B 2eb1bf9999b7f125387cc67842806a26249e3a9cf78630f0113cba4fb68d362398bf20c80a4cc8059d5c0253e80159b7958be1600890cec9c816e4275e85b316 SHA512 8c23bff3406ae2712663f81fb46525df4938aee5bf85f5497ff33108e4fb0f443ca3389dedbbb9eea233e86e51c24938f699eae2bc62cbf291c04a56a9af36ff
-EBUILD ruby-xslt-0.9.10.ebuild 1132 BLAKE2B 143f9b5757ad16974b876581e680fdae37a2e29a62d3fc728761344f38e578de5737796b7be82bf46aeeda0189b0794214c51fcc8a04f384208f91751d518ff1 SHA512 604efe839eec476fa714c01113f5b9f2d7eca993dc662f18f7a8adc6fd3ccd91e8939f7a56d0cd132f88c7132067c3b6dfb9b60986a2c5625ff17d5c203a89dd
-EBUILD ruby-xslt-0.9.9-r3.ebuild 1122 BLAKE2B 274c9b2f1c6168a8d5737be745a479efd45da5ed5fbadc5d7fefd27009c459714eed944e2e3e99b667a81ea1346b31138a82c24f6714e5fe02dc1982c8fa2b6d SHA512 1deed3ab964581ec6a30caaf3a0ff7b96dd5a496c9dd9875b1c39e2eb8abfa8d4c2dd7b6f12062deac6e12f584e08777060bf3a4cf28658106df91966626afbe
+EBUILD ruby-xslt-0.9.10.ebuild 1137 BLAKE2B 7e628a875844e0ffbf2cd7a543b86cc41dd0e7500401d9b9a9561cba73565fb915220b7ce4ed3d60f65e8a60e339ebc1ae96e6925c9b47fb74c1003c3f8849aa SHA512 1b0195060a9f20df9ef4df6c26ea96dada95d70fe40a8441aa1dc3f0002a351e32db74dd0e73faba9a7bfa60af8646aea0310b5271a80b9592b1ddd559a7ba38
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-xslt/ruby-xslt-0.9.10.ebuild b/dev-ruby/ruby-xslt/ruby-xslt-0.9.10.ebuild
index 57bd5c84d7e5..c67655251ce8 100644
--- a/dev-ruby/ruby-xslt/ruby-xslt-0.9.10.ebuild
+++ b/dev-ruby/ruby-xslt/ruby-xslt-0.9.10.ebuild
@@ -2,7 +2,7 @@
 # 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_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/glejeune/ruby-xslt"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND+=" >=dev-libs/libxslt-1.1.12"
diff --git a/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r3.ebuild b/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r3.ebuild
deleted file mode 100644
index 59a00f1ab6c9..000000000000
--- a/dev-ruby/ruby-xslt/ruby-xslt-0.9.9-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.rdoc AUTHORS.rdoc README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby class for processing XSLT"
-HOMEPAGE="http://www.rubyfr.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND+=" >=dev-libs/libxslt-1.1.12"
-RDEPEND+=" >=dev-libs/libxslt-1.1.12"
-
-all_ruby_prepare() {
-	# Remove forced -g compiler flag.
-	sed -i -e 's/-g //' ext/xslt_lib/extconf.rb || die
-
-	# One test fails but we have installed this code already for a long
-	# time so this probably isn't a regression. No upstream bug tracker
-	# to report the problem :-(
-	sed -i -e '/test_transformation_error/,/^  end/ s:^:#:' test/test.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/xslt_lib extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/xslt_lib V=1
-	cp ext/xslt_lib/xslt_lib$(get_modname) lib/xml/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -I../lib:lib -Ctest test.rb || die
-}