gentoo resync : 28.04.2019

4 files changed, 6 insertions, 64 deletions

diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 670d7d999ca7..92d6138fcc7e 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,10 +1,7 @@
 DIST rouge-1.11.1.tar.gz 491281 BLAKE2B dbdc4c874f1f8fb03fc8f5c368539ea218fb4f7de36e73718bef5f657509990a634a3520d0c689db85de5f7bda6f7ae79103b2e8a1e44f6314c2253491fbd8cc SHA512 0419c4c1ca4fa4acc250349d9fd72164c7f293facc31588e5cffb533f3d321787cd3cc50acd7bfd13037d1ba77ee2f91ec37ddaeeb80180f6958f05d52181f56
-DIST rouge-2.2.0.gem 271872 BLAKE2B 19908066b3e83b27af595e49d23eff381b2a551105dcab0576be9d1327b2a182da12c327b64a27207d9c458eca69ae451bd92f4b6ea5bf98dfcf1d2052314811 SHA512 5e2eedd1a35fff7dfb241d8d47d767ceb8f58c024c852830a97313dbec099ecc21e22ef20a167f48eadae351c113a69276cf6a02b9572225a06884dac438ce86
-DIST rouge-2.2.1.gem 281088 BLAKE2B 03b9ee015e3e9aa6af1572a2dd85d999e89913c0406c8d81a09df87bb24b535abdc10d7d96d6ef135fee54b592f6fefed5b32f4e7fb08fefc7c56a0833fc94a8 SHA512 98cfa6dd85fad2272374798d49922f2e4759a416f4d0aa9ac26593160a3eb6754f689fd03930b7e1276b239b839ddaf660b064c942102af323ede32862e23b73
 DIST rouge-3.1.1.gem 282624 BLAKE2B 07074cda2634330fe26bedc370c85967f892fa239160f594ef57cb2d577812b025eda066e703b165ff72b491f718b0046afeeae7a9377ccef0315939193d1485 SHA512 3132dd891e66bbf557953bb7d0ab95be6d6978b75b37ba1ba50f2471aee1666d4228c253dbedd4a12fab6b584bba85d2327d6437788f0a9001248d9a4be1bf7c
-EBUILD rouge-1.11.1-r1.ebuild 753 BLAKE2B 21ee8e84feb445d3e4c8de4487b5993504e46267f5dbf0b5ef11d135eb83e3a337c4d8e6de085e21c85641b940cdbf3f23165684afe15267f751597428f13d9f SHA512 d90113f0c313116a9ca61c0b25f55d4538eebc7aac4142798ebc83ddfa08e5d76c6e62139bec62ce0d908d319c2aa6a7940d06a38c65b7d212dd74be035cdbd7
+DIST rouge-3.3.0.gem 331776 BLAKE2B c258479642d0f89f7aa0ec6366525b43e899056cdc374b2cdaef4949968eff664ba6dd9ff07f33cf9606ba1f759288e665104bfe3b5bca3446f35ec56cb506b6 SHA512 b4d043d1df7c286f7a81c85c770144da3acab946c3c53570f3d530dba9414023641c52a8ee338abddfd178e2037e7390e61f344fa4d88a690e184f180a4da35c
 EBUILD rouge-1.11.1-r2.ebuild 744 BLAKE2B 61a929c20ed0a4386aaee1baa071277b72b5bdc22dcb8b4e278e5fba31abef62a64c21dffde27676c328973d5e381bf065456440069b37c1eb23f7c950c66c5e SHA512 d13003b5f6f0cb862f0efb37c367e6fc3d530a02f633016c717a2ad80b8d17e9ff8ae4f9a0128a8b57456966060c686de0772361edad019761716f7affbc4907
-EBUILD rouge-2.2.0.ebuild 704 BLAKE2B d49953bd18ad27d85aba59c1e40b4978964f52409e4398f9766e9a4e735bb62e4eba66df64de911dd56c958d8b7f016111b0fa2cd0ae0b2e6fa36e634f222ab3 SHA512 a0a6b2924be8e3063e715f1d11f4baefd5b90867fa24cb1ce441b10a70a58fb467df601884c102a1042d5495f64f75666a997e87a9908429082cc1f34c574871
-EBUILD rouge-2.2.1.ebuild 704 BLAKE2B d49953bd18ad27d85aba59c1e40b4978964f52409e4398f9766e9a4e735bb62e4eba66df64de911dd56c958d8b7f016111b0fa2cd0ae0b2e6fa36e634f222ab3 SHA512 a0a6b2924be8e3063e715f1d11f4baefd5b90867fa24cb1ce441b10a70a58fb467df601884c102a1042d5495f64f75666a997e87a9908429082cc1f34c574871
 EBUILD rouge-3.1.1.ebuild 724 BLAKE2B 9b1729e60b9dea282962915ac1965df67dbd766e01f19ecf3411e960ea8a73be4c1938fd0e510f2f62b70a2e4857f075c7acb2879cfc171283d01fef8689e3d5 SHA512 aedf60ef96875687137921a431702d287dcbc383389eb5cadb180b4dbb38520794f3b0384edfca0a341f546d45809525abbf90a7d4a02211b93d4315231b0261
+EBUILD rouge-3.3.0.ebuild 724 BLAKE2B df5a4e380dee8ef4aa916012f0831ec9c1aa319164263e7e9322afb1384f7073dd6d4fbdcceca8f8376d3576fc939c6a0edc7e03d62cd71ed8b4df7808448f8d SHA512 91395c9c7c703b71711a2ae921fe8258127e92146039d11641f2bd80b3c90def36ba050b296c029319ea23292ce1f3dd4c2afc3ca8daaddac79f8ad0b52adfb8
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-1.11.1-r1.ebuild b/dev-ruby/rouge/rouge-1.11.1-r1.ebuild
deleted file mode 100644
index 4942ac144619..000000000000
--- a/dev-ruby/rouge/rouge-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,28 +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_EXTRADOC="README.md CHANGELOG.md"
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
-ruby_add_rdepend "dev-ruby/redcarpet
-	!!dev-ruby/rouge:2"
-
-RESTRICT="test"
-# Depends on dev-ruby/wrong, which is not packaged yet.
diff --git a/dev-ruby/rouge/rouge-2.2.1.ebuild b/dev-ruby/rouge/rouge-2.2.1.ebuild
deleted file mode 100644
index 68f023dd1c8a..000000000000
--- a/dev-ruby/rouge/rouge-2.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-#SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
-ruby_add_rdepend "dev-ruby/redcarpet
-	!!dev-ruby/rouge:0"
-
-RESTRICT="test"
-# Depends on dev-ruby/wrong, which is not packaged yet.
diff --git a/dev-ruby/rouge/rouge-2.2.0.ebuild b/dev-ruby/rouge/rouge-3.3.0.ebuild
index 68f023dd1c8a..1edff6ffcae4 100644
--- a/dev-ruby/rouge/rouge-2.2.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -21,7 +21,7 @@ IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
 ruby_add_rdepend "dev-ruby/redcarpet
-	!!dev-ruby/rouge:0"
+	!!<dev-ruby/rouge-1.11.1-r2:0"
 
 RESTRICT="test"
-# Depends on dev-ruby/wrong, which is not packaged yet.
+# Depends on dev-ruby/minitest-power_assert, which is not packaged yet.