gentoo resync : 06.05.2018

4 files changed, 39 insertions, 9 deletions

diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 8093587b7b82..60ab9fcd74c1 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,9 +1,10 @@
 DIST rouge-1.11.1.tar.gz 491281 BLAKE2B dbdc4c874f1f8fb03fc8f5c368539ea218fb4f7de36e73718bef5f657509990a634a3520d0c689db85de5f7bda6f7ae79103b2e8a1e44f6314c2253491fbd8cc SHA512 0419c4c1ca4fa4acc250349d9fd72164c7f293facc31588e5cffb533f3d321787cd3cc50acd7bfd13037d1ba77ee2f91ec37ddaeeb80180f6958f05d52181f56
-DIST rouge-2.1.0.gem 270336 BLAKE2B 6d4b145f8256392162054e5dc91d64d356babcd5f1bffd44369c23404ec58107694e37fcba21fb77c0bbf287a75cd49d136736de2c09eb6e9f19fc5f3e01314a SHA512 9ffcb1f23d22c18f3f9d68cdd6b50b8bdf154c47bd27ab656328d7fbef3fe2df544ba6caa10f6ee925aee8f0baeafcac77aa0eaab02dd71144d1269dd72432a7
-DIST rouge-2.1.1.gem 270336 BLAKE2B ab9648c82be6f7c06ef636b1179c3a9515f36339c6c32e1b07dd62b2ebb97db6baf2695dd544f1cdb1587cfd3488e4d1bd8daedb168efe6776b4af0653fbfe3e SHA512 4635e65e8a2dfb05e1bd969b137622e3754931308d23c61dfcee1f604256e5f81ddc633898cda67b66f2bb1b70e9ebc4e79f4057c168579b7b31f6b24b7cf209
 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
-EBUILD rouge-2.1.0.ebuild 695 BLAKE2B fa79d07764a44295a09af9335320f7632cb7f306581498a53f3a357125cec310708d858361e636961972397667754281b9f9a20ec046d8d906945d072ae3df8d SHA512 6aa11ecbca3628abffd4c388bbff7d84014f415bc8c4cd6ec6bdced4a2e47db70c87305cd6e6410545dc2f635f9fd786c64c91e91b497137357cbf131b81a0dd
-EBUILD rouge-2.1.1.ebuild 695 BLAKE2B fa79d07764a44295a09af9335320f7632cb7f306581498a53f3a357125cec310708d858361e636961972397667754281b9f9a20ec046d8d906945d072ae3df8d SHA512 6aa11ecbca3628abffd4c388bbff7d84014f415bc8c4cd6ec6bdced4a2e47db70c87305cd6e6410545dc2f635f9fd786c64c91e91b497137357cbf131b81a0dd
+EBUILD rouge-1.11.1-r2.ebuild 744 BLAKE2B 61a929c20ed0a4386aaee1baa071277b72b5bdc22dcb8b4e278e5fba31abef62a64c21dffde27676c328973d5e381bf065456440069b37c1eb23f7c950c66c5e SHA512 d13003b5f6f0cb862f0efb37c367e6fc3d530a02f633016c717a2ad80b8d17e9ff8ae4f9a0128a8b57456966060c686de0772361edad019761716f7affbc4907
 EBUILD rouge-2.2.0.ebuild 695 BLAKE2B fa79d07764a44295a09af9335320f7632cb7f306581498a53f3a357125cec310708d858361e636961972397667754281b9f9a20ec046d8d906945d072ae3df8d SHA512 6aa11ecbca3628abffd4c388bbff7d84014f415bc8c4cd6ec6bdced4a2e47db70c87305cd6e6410545dc2f635f9fd786c64c91e91b497137357cbf131b81a0dd
+EBUILD rouge-2.2.1.ebuild 695 BLAKE2B a2f82494aff807d5ea7f5fb2ecd36328d608ff32b1f1956d743fddde8d2eefcb129a8b9e8b3e5ed5ac2961751a5ff495ea36faee083de50289027801021bfdf1 SHA512 d37b25a631242741bf4026d715c38d9f5f08c7602934582dbd768a106f013541363f37881ed14393370aab7efdadff7ee1862e36bd12111d82be98ea536c40ca
+EBUILD rouge-3.1.1.ebuild 715 BLAKE2B 004bec7504dd8424b8c091cb69e58768c7e576d64038f98cacbfa19018ffc9b5505c630af42f557c7eee92ac983f262aa51085588c7148a9c80c177fb3b07279 SHA512 99651498d3b80e36cb803bf25226d5c89f255708d7adf24dc6a4659e81ad46f45ed656512222529bca1fa2a76b03937281253e44510943408f425c38cf6e1e1e
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-1.11.1-r2.ebuild b/dev-ruby/rouge/rouge-1.11.1-r2.ebuild
new file mode 100644
index 000000000000..cd22a64c59ad
--- /dev/null
+++ b/dev-ruby/rouge/rouge-1.11.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+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"
+
+RESTRICT="test"
+# Depends on dev-ruby/wrong, which is not packaged yet.
diff --git a/dev-ruby/rouge/rouge-2.1.0.ebuild b/dev-ruby/rouge/rouge-2.2.1.ebuild
index b87df474b268..70e9a003fa9a 100644
--- a/dev-ruby/rouge/rouge-2.1.0.ebuild
+++ b/dev-ruby/rouge/rouge-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-ruby/rouge/rouge-2.1.1.ebuild b/dev-ruby/rouge/rouge-3.1.1.ebuild
index b87df474b268..9acd15d5cec8 100644
--- a/dev-ruby/rouge/rouge-2.1.1.ebuild
+++ b/dev-ruby/rouge/rouge-3.1.1.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=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 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.