gentoo resync : 11.02.2018

3 files changed, 3 insertions, 46 deletions

diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index 9b1996c6b6b4..3bda162ab832 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,5 +1,3 @@
-DIST redcarpet-3.3.4.tar.gz 103992 BLAKE2B 3aab8c42e6cd1bac406ebdddb06dce5e2ed66eaf8549c411788fb6db5769cff583600e971802339423d813e0ed0c836cec8125ee5c4e9ce9501e763b0c0f6f28 SHA512 bcd4123ea8d6e9cd28e78bd21d3e2aa90e6522e9fee3dd321a6c23d6450bde478054e2fde6b0c8a35d8b9af61d3b5ca3a9f2ebe19d89aea5091f7505bfe92d42
 DIST redcarpet-3.4.0.tar.gz 105525 BLAKE2B 38b28f400b7300ea49cebda9b4739193b54c322c1c20ecba50938893286ad87e44ba9e9da83eab8433af0790d76bc0db4189fc0b70a4438480fe784570809e1a SHA512 25ed1fd35ebf815f396ed819baec69aae366bafab3983a53d364b1ef0d3f18cecaa523953d12cb0e5b896c30ac86e000318f33c633047bd271362474b9b8f877
-EBUILD redcarpet-3.3.4.ebuild 1022 BLAKE2B 82710de629d37c55ae5f32a6806f4da69a0008186974c57ee3cd67c89dc41889d49ac5b59f60bb88673090f20b3542324198d15e7176b99d6d2029b81bd96bcf SHA512 3dafb2240d297ffaa76ede773449fa74d5f9d6dece8f47bebd11b5a60727e4f6fda9b435cbcd13ed40f4d11359c650eeb538191d80c2e2d4b53966e058baabf9
-EBUILD redcarpet-3.4.0.ebuild 1030 BLAKE2B dff4436448438808afb22d2c173711fd10393365b457cee5da4abb56df97f7149aefe47e787a36f7f7b1c8fac55eb6c8acc1f9921568ed699ee2b8e1311e4a8e SHA512 5e276b991ac5d6be659fe9be1c8b0665978dd78edc9c452b0966995f143fab58624f341225630328ca06dfbe2822d4d0be4bd410b1d4f369691d9f6876e317c2
+EBUILD redcarpet-3.4.0.ebuild 1030 BLAKE2B 21e1035c80b2d8f081e66eee6834e09205b360c3228ed11568c57ff3c2a9392c52878d27818cd0dc9a3aa3b2e6f23f1a74de30d9e24e3b461006a2df7d25309c SHA512 e4f1d7cfd2bd39b047d52c70f56192cd6b74de2aa332debc783e7dd6650acb860f46202f40185d4de2e97b54bd712edb3a8a5236486f3285acdb6761d448d18e
 MISC metadata.xml 339 BLAKE2B 3f8aaf2e00581b0e8a62f7a035a0bb80208dd8b4a1541cf77a3550cfaa486e800662c9f251bf02ec3e9a326dfe62d254981f04808b35700130b055488025c79b SHA512 eb85f708675bd9dd3d132e73d14e52689a94279ffc754097a986ddc3224ee21a69e7e81f1bc391725f1d2f1d41f72f8553079a10ffde7c8eb55048b7c6f089d2
diff --git a/dev-ruby/redcarpet/redcarpet-3.3.4.ebuild b/dev-ruby/redcarpet/redcarpet-3.3.4.ebuild
deleted file mode 100644
index c2efc44c0e89..000000000000
--- a/dev-ruby/redcarpet/redcarpet-3.3.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-inherit multilib ruby-fakegem
-
-SRC_URI="https://github.com/vmg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A Ruby wrapper for Upskirt"
-HOMEPAGE="https://github.com/vmg/redcarpet"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e 's/=> :compile//'  Rakefile || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s#ruby#${RUBY}#" bin/redcarpet || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/redcarpet extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/*$(get_modname) lib || die
-}
diff --git a/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild b/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
index 9e484d8cc2dc..16d2e67572d8 100644
--- a/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"