gentoo resync : 24.12.2018

3 files changed, 88 insertions, 1 deletions

diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 691787ced907..ca82846398bc 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,4 +1,6 @@
 AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f41c0bf02c2fc0c71f19d4b78714e06f96d8a800a45f7c3eca80f766639036a624df24e681a9258e4bdc76bfb563498ad SHA512 7b53cd03a988cc5c949d15be8de91ffd37d4f228822cc3bec64c961c163ba60946df1d314bdf746a33a42df091f06f481f945a712515cca04539e111393246d0
 DIST jekyll-3.6.2.tar.gz 740389 BLAKE2B c51e8b1545bfd1bab64c890fdf8d53087e27b3ba2fac07d286d009f1c4b6efb81d3528d239f73a73afa68d1f2d320e816c7015bf385dc9e27cad13d1b4279a50 SHA512 3af17f32098bf1012393d0ad47269ef305138553735ede9c65e461c8f1e1033008a01805c8c96f9aa0f4682f7e68a9cff3eda83a70660a334161ec3d04ce9c72
+DIST jekyll-3.8.5.tar.gz 852490 BLAKE2B 3831c68c8c17b5ca14521988572849b89c8cd37f3fa4d7048adb7e25319f59a31e6174a6d25fb5ba4d33c919389f3a30cb28274cddd29ea644ec5d5aa11875e7 SHA512 2cd6bb8786fa2efc249457f72e9e1a3dc76c61a23d2ed8388fef56f1bd576897260b199edb393eb358cfe3a0b26487e40cc2fd3502c52cc9c828839b9eef624d
 EBUILD jekyll-3.6.2.ebuild 2061 BLAKE2B fdc85cfc7fa1beffe671f5d54bed57ace5ac9f2023e438b02e889ebf9b49e7c66a432e8adbc8b0575fdf296bc181886d05987c8eb39b169c6062b6b3dff3c81a SHA512 9fe2223b9cf6e1c95657b1312232794eb416b7902551a9a4573c134ce0fef348667b3ee5de688bc525aa44d6b4c474b2d5b2da3a0739f99f60f908c589d8f2bb
-MISC metadata.xml 325 BLAKE2B c29145c8eacfee5164b55192ebd77d0b4134179380ac4c5f0ac29b1f708dc0cb1d91748ad68aca73380466451efcfe03c1115ebc706c16a70b527b2e3360a7d2 SHA512 02b93ff17a615bde6a2074bed7dc0d64c0cea0d11002e48fe5a132b3d8044c0329a5a69f62f917eadf8fb090ef1ea7ce99bd78496fd738a1d327599dde7582e2
+EBUILD jekyll-3.8.5.ebuild 2116 BLAKE2B 08cce5c39040f258b6c4594fa6923faf2ed1da1f1c9969115adeb2705cd8dc84d0055c0e538c10728f137781858f9bf53cd2025629053ef8b9bc4b48a4c95ed8 SHA512 6341fd4808d3b7b39e82636379c96bf9a3d2fe0a7dc920c58505e4e7e7de9d2cdb3436790aea17f652daf3280560912c7a3b3e043aa0f16a3ff2fd56ddf33c62
+MISC metadata.xml 429 BLAKE2B 9a3bc0c4945b7be24fae6e0b8bfe18b33ea06d32232200b42050c18f9bd9786c3737cedec0e850312df0599d78cd9db66a4d302395017cb9d27a1cba184c4df3 SHA512 0755fd020670ebb1fbb922a1765cb2d6a4fdb4c39886ef010aee9ff4035d7e6157721060da917567d6ccac0910d1e3872896490b35eedf7c293a16bab44e3645
diff --git a/www-apps/jekyll/jekyll-3.8.5.ebuild b/www-apps/jekyll/jekyll-3.8.5.ebuild
new file mode 100644
index 000000000000..fdab590b1702
--- /dev/null
+++ b/www-apps/jekyll/jekyll-3.8.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
+RUBY_FAKEGEM_EXTRAINSTALL="features"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+DESCRIPTION="A simple, blog aware, static site generator"
+HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.4
+	>=dev-ruby/colorator-1.0i
+	>=dev-ruby/em-websocket-0.5
+	>=dev-ruby/i18n-0.7:0.7
+	>=dev-ruby/kramdown-1.14
+	>=dev-ruby/liquid-4.0:4
+	>=dev-ruby/mercenary-0.3.3
+	>=dev-ruby/pathutil-0.9
+	>=dev-ruby/safe_yaml-1.0
+	>=dev-ruby/rouge-1.7:0
+	>=www-apps/jekyll-sass-converter-1.0
+	>=www-apps/jekyll-watch-2.0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/classifier-reborn-2.1.0
+		dev-ruby/launchy
+		>=dev-ruby/pygments_rb-0.6.0
+		>=dev-ruby/rdiscount-2.0
+		>=dev-ruby/redcarpet-3.2.3
+		dev-ruby/rspec-mocks
+		>=dev-ruby/shoulda-3
+		dev-ruby/test-unit:2
+		www-apps/jekyll-coffeescript
+	)
+"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
+
+	# Drop tests requiring bundler
+	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
+	rm test/test_plugin_manager.rb || die
+
+	# Replace git command in gemspec
+	sed -i 's/git ls-files -z/find -not -type d -print0/' $RUBY_FAKEGEM_GEMSPEC || die
+
+	# FIXMEs:
+	# fails to find fixtures
+	rm test/test_theme.rb || die
+	rm test/test_theme_assets_reader.rb || die
+	sed -i -e '/^    should.*theme/,/^    end$/d' \
+		-e '/^      should.*theme/,/^      end$/d' test/test_site.rb || die
+	# partially requires 'toml'
+	rm test/test_configuration.rb || die
+	# pygments tests fail because of line numbering
+	sed -i -e '/^  context.*pygments/,/^  end$/d' test/test_tags.rb || die
+	sed -i -e '/^    context.*pygments/,/^    end$/d' test/test_redcarpet.rb || die
+}
+
+src_test() {
+	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
+
+	ruby-ng_src_test
+}
diff --git a/www-apps/jekyll/metadata.xml b/www-apps/jekyll/metadata.xml
index 482fe238b680..28188a0391e2 100644
--- a/www-apps/jekyll/metadata.xml
+++ b/www-apps/jekyll/metadata.xml
@@ -5,6 +5,10 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jekyll/jekyll</remote-id>
 	</upstream>