gentoo resync : 25.08.2020

4 files changed, 94 insertions, 7 deletions

diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index a64309b956df..3607eacc46b2 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,6 +1,8 @@
 AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f41c0bf02c2fc0c71f19d4b78714e06f96d8a800a45f7c3eca80f766639036a624df24e681a9258e4bdc76bfb563498ad SHA512 7b53cd03a988cc5c949d15be8de91ffd37d4f228822cc3bec64c961c163ba60946df1d314bdf746a33a42df091f06f481f945a712515cca04539e111393246d0
 DIST jekyll-3.8.5.tar.gz 852490 BLAKE2B 3831c68c8c17b5ca14521988572849b89c8cd37f3fa4d7048adb7e25319f59a31e6174a6d25fb5ba4d33c919389f3a30cb28274cddd29ea644ec5d5aa11875e7 SHA512 2cd6bb8786fa2efc249457f72e9e1a3dc76c61a23d2ed8388fef56f1bd576897260b199edb393eb358cfe3a0b26487e40cc2fd3502c52cc9c828839b9eef624d
 DIST jekyll-4.1.0.tar.gz 1397143 BLAKE2B f7021fdc418acefa1b7e92318225ff8afff8dd84a0134906bb48ae461a94e4a71a8d0de0800ea489a3bd3eb7bfa36be4b8781e4c89729d5adc9e8ddc3b711dc3 SHA512 fdd9b28ff065a1dbe78f197c618bdd00bfeb37f66983c55ce971edcc96c3af39d926ec64b3866084dc8c21a56764ecdfb61d954123b15fe41a9de68fc951dc48
+DIST jekyll-4.1.1.tar.gz 1398438 BLAKE2B ac207d58b155e069fda40b4598d441d8fb88f22e85740082829d018dc9cefe51ca636b23a6207c37711c4d26e078f6e4913946599f0200b8e8cb065a9ceff952 SHA512 98c635b54219c9666de6496e76f3a131fc715d650d868049c0fe10d76851a027e0808609c2dce1a138c95eb2fb7e58ef978237a305484071339b4a15d5acc4d5
 EBUILD jekyll-3.8.5.ebuild 2144 BLAKE2B cb825e8834f8c0feefedd7f2cef69dbf46a3656a5a9281698b65f668cac2897c098d625fdf227460ab2f6d5e7663ff42e0f4ab985daa7fba6615148ed5f2358c SHA512 2ce9ac22ab20aed5b3861d0bbc1035bfbf8b87317935d97981ee87e469cd11764ab1a99715ffb9b99dc2743f616840da44a57f0c4766ef90c71fd018ed49aee0
-EBUILD jekyll-4.1.0.ebuild 2502 BLAKE2B 2ef03dc06618aa1cf002c71876f04afb245519644b6a186b2c8aff6f888b8effab917b80ce46c1097b0c7fc19f89d4896fb26b82d4a5007b8694f2ff14a5add9 SHA512 2c20176fb75b3ee25948d796156bdbe3633ec2708a2792d1900d409ef48d613298c784e2208aa931648e2e890c285edef9cf3126df1491a4f48bea133ea7d70c
-MISC metadata.xml 429 BLAKE2B 9a3bc0c4945b7be24fae6e0b8bfe18b33ea06d32232200b42050c18f9bd9786c3737cedec0e850312df0599d78cd9db66a4d302395017cb9d27a1cba184c4df3 SHA512 0755fd020670ebb1fbb922a1765cb2d6a4fdb4c39886ef010aee9ff4035d7e6157721060da917567d6ccac0910d1e3872896490b35eedf7c293a16bab44e3645
+EBUILD jekyll-4.1.0.ebuild 2509 BLAKE2B 6dee78779fd33557d2fb0a02e724c17c783ccb826fcc106b9fdfb99583249fc03136306fdf0f9421bcc253e4a7e9a9aa63f473f7e6749454957d59a08af00a83 SHA512 a104f7107f569836c7e37a0c80fe56e259b0b007c154421ecf83f0e0df8b11f0d5752c62f7c14b3eb9598159295259925ef510613a02345842a04a48fc4ecce2
+EBUILD jekyll-4.1.1.ebuild 2478 BLAKE2B 7ebfa111013b93c0f930c1ee67a0a7b72b70e9c3084b6781dbb2192742720e3c5d408e7189489e51d3afbfd6f5d6e3df24fc09d979eb15f9a73713675c349ffc SHA512 20d1db68d598c41702f1dafb9c6ced88b93e0f4db63f67349a7e179b35fff6fe75c21caf8a8b566204d6d403c5a2f040d375c62358b5f125b258d1b14577120b
+MISC metadata.xml 321 BLAKE2B 29660b55030baa390178266fa77f44eb0396ac4dabd22929e683d9263fa596af844cd0ba7d6ac062ae16bb03bd28dd2210d2bee0025cd440bed8fbbe22194eff SHA512 f9d8641c5df992e4b59095b7b40ebf7448a5751d9668796f96db23b829c7ac56c7d594d513421040bf7c47d1ef1b6106e4c89564071fc52cf330b043c148c9d2
diff --git a/www-apps/jekyll/jekyll-4.1.0.ebuild b/www-apps/jekyll/jekyll-4.1.0.ebuild
index c31e66aae8c2..b60329211a3f 100644
--- a/www-apps/jekyll/jekyll-4.1.0.ebuild
+++ b/www-apps/jekyll/jekyll-4.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/www-apps/jekyll/jekyll-4.1.1.ebuild b/www-apps/jekyll/jekyll-4.1.1.ebuild
new file mode 100644
index 000000000000..f6aebf2bdafd
--- /dev/null
+++ b/www-apps/jekyll/jekyll-4.1.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+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 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.4
+	>=dev-ruby/colorator-1.0
+	>=dev-ruby/em-websocket-0.5
+	dev-ruby/i18n:1
+	>=dev-ruby/kramdown-2.1:2
+	dev-ruby/kramdown-parser-gfm:1
+	dev-ruby/liquid:4
+	>=dev-ruby/mercenary-0.4.0
+	>=dev-ruby/pathutil-0.9
+	=dev-ruby/rouge-3*
+	>=dev-ruby/safe_yaml-1.0
+	>=dev-ruby/terminal-table-1.8:0
+	>=www-apps/jekyll-sass-converter-2.0
+	>=www-apps/jekyll-watch-2.0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/classifier-reborn-2.1.0
+		dev-ruby/launchy
+		>=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 -e 's/git ls-files/find -not -type d -print/' \
+		-e 's:_relative ": "./:' \
+		-i $RUBY_FAKEGEM_GEMSPEC || die
+
+	# FIXMEs:
+	# fails to find fixtures because this requires bundler
+	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
+	sed -i -e '/context "with a theme"/,/^    end/ s:^:#:' test/test_layout_reader.rb || die
+	sed -i -e '/normalize paths of rendered items/askip "test-theme"' test/test_liquid_renderer.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
+
+	# Tries to use bundler and install packages.
+	rm -f test/test_new_command.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 28188a0391e2..0bb46a0fb9bf 100644
--- a/www-apps/jekyll/metadata.xml
+++ b/www-apps/jekyll/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>bman@gentoo.org</email>
 		<name>Aaron Bauman</name>
 	</maintainer>