gentoo resync : 18.08.2019

5 files changed, 7 insertions, 93 deletions

diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index afd5acca4c5c..34891ad2841b 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,13 +1,7 @@
-DIST rouge-1.11.1.tar.gz 491281 BLAKE2B dbdc4c874f1f8fb03fc8f5c368539ea218fb4f7de36e73718bef5f657509990a634a3520d0c689db85de5f7bda6f7ae79103b2e8a1e44f6314c2253491fbd8cc SHA512 0419c4c1ca4fa4acc250349d9fd72164c7f293facc31588e5cffb533f3d321787cd3cc50acd7bfd13037d1ba77ee2f91ec37ddaeeb80180f6958f05d52181f56
-DIST rouge-3.1.1.gem 282624 BLAKE2B 07074cda2634330fe26bedc370c85967f892fa239160f594ef57cb2d577812b025eda066e703b165ff72b491f718b0046afeeae7a9377ccef0315939193d1485 SHA512 3132dd891e66bbf557953bb7d0ab95be6d6978b75b37ba1ba50f2471aee1666d4228c253dbedd4a12fab6b584bba85d2327d6437788f0a9001248d9a4be1bf7c
-DIST rouge-3.3.0.gem 331776 BLAKE2B c258479642d0f89f7aa0ec6366525b43e899056cdc374b2cdaef4949968eff664ba6dd9ff07f33cf9606ba1f759288e665104bfe3b5bca3446f35ec56cb506b6 SHA512 b4d043d1df7c286f7a81c85c770144da3acab946c3c53570f3d530dba9414023641c52a8ee338abddfd178e2037e7390e61f344fa4d88a690e184f180a4da35c
-DIST rouge-3.5.1.tar.gz 722730 BLAKE2B 6244eb7cb74354325a4e992464ab25222f2fbe20acac1baee1a9049b5b4c4056160a0a5b7bc71a893439e974a4e58d260e8207d8a7c2f37d649e1c43d2a4ad5b SHA512 e8f6e8dabae41ca374217b3dcb3a1de6b3a46752b4af122a9731083de2e18e04b2f2a173dfa35b845d76c70530457c276b4da2098ed07d451bd2e86c12e17e18
 DIST rouge-3.6.0.tar.gz 727487 BLAKE2B d5430e0dec82244c8c5fc0df3de318556f3b6c24579b34a724f20953765ab9fabfd79c5aeab3ff9d16f5f4c7db531b0b9d511938b8836207f4a64050a4bff112 SHA512 b5ec4d6325a752033d8c1e1bbe1618840bf2b5c556391ae8d978971a520f83a49d7244f0386193c947689d84d61d98137b8d8a06ed83e3c1d6769923a1c6c1c1
 DIST rouge-3.7.0.tar.gz 761581 BLAKE2B 681b8447a0f56e774f155ca735fa57b18a58f7ba3a55f995c3b42927392c91891facee557ed85a9faae86a9fa3301aedca995cff9a9b3d729c1be8e0cbdb8b97 SHA512 9360a4e0d564435da1481503222794e4b5649b4ece1b410d079c69f10e89e20bdf08c9d04663919cfbb7ce7b7cf0688604649c42c2442750bb1301d68e78248f
-EBUILD rouge-1.11.1-r2.ebuild 744 BLAKE2B 61a929c20ed0a4386aaee1baa071277b72b5bdc22dcb8b4e278e5fba31abef62a64c21dffde27676c328973d5e381bf065456440069b37c1eb23f7c950c66c5e SHA512 d13003b5f6f0cb862f0efb37c367e6fc3d530a02f633016c717a2ad80b8d17e9ff8ae4f9a0128a8b57456966060c686de0772361edad019761716f7affbc4907
-EBUILD rouge-3.1.1.ebuild 724 BLAKE2B 9b1729e60b9dea282962915ac1965df67dbd766e01f19ecf3411e960ea8a73be4c1938fd0e510f2f62b70a2e4857f075c7acb2879cfc171283d01fef8689e3d5 SHA512 aedf60ef96875687137921a431702d287dcbc383389eb5cadb180b4dbb38520794f3b0384edfca0a341f546d45809525abbf90a7d4a02211b93d4315231b0261
-EBUILD rouge-3.3.0.ebuild 724 BLAKE2B df5a4e380dee8ef4aa916012f0831ec9c1aa319164263e7e9322afb1384f7073dd6d4fbdcceca8f8376d3576fc939c6a0edc7e03d62cd71ed8b4df7808448f8d SHA512 91395c9c7c703b71711a2ae921fe8258127e92146039d11641f2bd80b3c90def36ba050b296c029319ea23292ce1f3dd4c2afc3ca8daaddac79f8ad0b52adfb8
-EBUILD rouge-3.5.1.ebuild 788 BLAKE2B 5f2ed26c77a9e7803e98b1567cd6bd6cf8f7f39b6d8183d46f13d56f66266acc6f9858be5798f7b9fef7e9a5e1fde371fa066ec0bfc4ff8102a5d253a4ce9279 SHA512 de48694c84a4ad326a0417024aad10f583f6c30d946c93595942be22ddba143cf3a5855b7714c12f64892ec28468aec6424a96f5d4cd895097c53623cc575c99
+DIST rouge-3.8.0.tar.gz 755720 BLAKE2B aca1ccbd601ee080958ccf09ab8932dc556065945f4cc2ee9b9bf5531ff41cec676005b0c7540aa058b3346c5eabac4351dd6a291ff148c9b5dfc682f7579336 SHA512 16a1cf9e9eae466c55f236f10d10bf0f5f4d523f6a680c1130b02115384691c1e2fbb14b59a6be1b9df77cc67fdb0ffe026cff6d0150230afe53f26b4c254dde
 EBUILD rouge-3.6.0.ebuild 834 BLAKE2B 26ec04db0b005b7acd3b7c2ff685f33f0d51c4f414c38820a33745692faaf623cca80352891eb56a52ceb1878c983082d941fcac8533fb1ef26d9ac6328113ec SHA512 d6a84fc49e075e24f45c3739125dd0d03737844204ab94e59e4392f07db25d02e08f58d8ab1a2c5e0d66171318aaf59a2f07f2a03db6a14c1676c150cfd8fd66
 EBUILD rouge-3.7.0.ebuild 879 BLAKE2B c388823f3f9773ed2c3a0a2bf596ae94270abb071d783823264dbb8eeb136374f79f0689e16246826ecd31e4f03410d2b2951eb9766121d0c053615a3e422c1a SHA512 6943800ab239efa86373d1797654f16ce739c4225282565bc2156c6511a7433e4915446c6d777abd470f26021de943bd08b021b2e3f897285ff8639d8daad3a7
+EBUILD rouge-3.8.0.ebuild 917 BLAKE2B 7d5479ce54b4372c4d71cad96f2f012c9a013c5a5ada37d930a4b3299c69fe90c9ad78145da3103100a0b7806c69bdc3e2b6cf6c6d937734e0999bbaef67c2b4 SHA512 7880f210d33664bb78b41b3104b8ed2cb841e7bccb4e2531d21d6ba332f054ef8d37b80fcbaf0bcbda432980193646ed23d496687c357e1ef5be2a118d409b1b
 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
deleted file mode 100644
index cd22a64c59ad..000000000000
--- a/dev-ruby/rouge/rouge-1.11.1-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-3.1.1.ebuild b/dev-ruby/rouge/rouge-3.1.1.ebuild
deleted file mode 100644
index 32aa6979c55d..000000000000
--- a/dev-ruby/rouge/rouge-3.1.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="ruby23 ruby24 ruby25"
-
-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-1.11.1-r2:0"
-
-RESTRICT="test"
-# Depends on dev-ruby/minitest-power_assert, which is not packaged yet.
diff --git a/dev-ruby/rouge/rouge-3.3.0.ebuild b/dev-ruby/rouge/rouge-3.3.0.ebuild
deleted file mode 100644
index 1edff6ffcae4..000000000000
--- a/dev-ruby/rouge/rouge-3.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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-1.11.1-r2:0"
-
-RESTRICT="test"
-# Depends on dev-ruby/minitest-power_assert, which is not packaged yet.
diff --git a/dev-ruby/rouge/rouge-3.5.1.ebuild b/dev-ruby/rouge/rouge-3.8.0.ebuild
index 879afb2a3bfb..6bb5004eb3fa 100644
--- a/dev-ruby/rouge/rouge-3.5.1.ebuild
+++ b/dev-ruby/rouge/rouge-3.8.0.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
@@ -24,7 +26,8 @@ ruby_add_rdepend "dev-ruby/redcarpet
 	!!<dev-ruby/rouge-1.11.1-r2:0"
 
 all_ruby_prepare() {
-	rm -f tasks/changelog.rake || die
+	rm -f tasks/update/changelog.rake || die
 
 	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
 }