gentoo resync : 21.06.2020

26 files changed, 346 insertions, 176 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 1fe10f183030..4055ad59acec 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index a59ce3e5997e..bde3b36d178e 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,8 +1,9 @@
 AUX postinstall-en.txt 272 BLAKE2B 2042cf6fbf8d98ef144d19002c3498e4e5f6238b8d135066920ee999facf14a65ba3ed1269228dedbd7f17932a894c399379c19fcf2fccf648d7a7f30b0ffb49 SHA512 4f902e053ac38e313698269decfabe750ca41e255076972eb439f7c753dba50f09879e54df09768daf643da13c81a7bcd1f9bee834da9d29e91a5be88b38c740
-DIST baikal-0.5.2.zip 3426025 BLAKE2B ac13b42a3eab54e43761bd0ad958208b692919a61908a6467e710a045c6568e9ae616a54c6910b6828c4499b3f815bd96b9bee12608637b64182238725e21922 SHA512 58dd9e231840a76582a70abca89c8f73f1a26f06855eff6949ebca526a22d23bc06f281f51611aeb7f0cf8334c0ad490cfea962905e985d6c75e78e1c1d47e63
+AUX postinstall-v0.7-en.txt 465 BLAKE2B adefd05b835bd3e27cc12137da53837dabd23790afe95fcc3e55e2dc1825342e96e2709c8d268fd0ec465b72faae7b5bd0fade0cb30fd0df2d8196bd49ae1e1b SHA512 8e532a5b229181cf32cc4a254688cc564a4a2dc80db64545fba0e093fa227a186a544b4dfc79c798e7d1021c1e01b7fb5f663f5b981082a32f6e6a0f98211df2
 DIST baikal-0.6.0.zip 3432758 BLAKE2B db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104 SHA512 75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905
 DIST baikal-0.6.1.zip 3437686 BLAKE2B f28d3a63166a73571116759df3662c2b19c2eeeebcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00 SHA512 d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
-EBUILD baikal-0.5.2.ebuild 1448 BLAKE2B c90e53da2862e36249d70f300ea406e4203953f0896b0b238e42804c8202511bee1df4533ca6f3667e78f28e53355fc89b38015a379cc846acd448f917b2ce7f SHA512 5c2ecde3efa57c267f567cf492cf9d9f5bf754998e617cc0726f6ed642e695816949d0c13d327f96ff6ea0a45e182c20a1667c2a533c20208a79e8005efc6f52
+DIST baikal-0.7.1.zip 3596673 BLAKE2B ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5 SHA512 4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54
 EBUILD baikal-0.6.0.ebuild 1446 BLAKE2B 5944a7dd73429ee30975230eb49a4eb842ec4dbf538ff31e9d070d3aa31acd73c3f3ebcfc140d00bb28714316431e9c3125e8e8ae010debc9eaf7b0a1000070b SHA512 12b9b6a9d0c6135455502923e38218612344d37836d4d2a244f7092049a1e164482eace228b114fa6ab1423b0242ea712dbfbc046fd73254c2582373a5206e3f
 EBUILD baikal-0.6.1.ebuild 1446 BLAKE2B 5944a7dd73429ee30975230eb49a4eb842ec4dbf538ff31e9d070d3aa31acd73c3f3ebcfc140d00bb28714316431e9c3125e8e8ae010debc9eaf7b0a1000070b SHA512 12b9b6a9d0c6135455502923e38218612344d37836d4d2a244f7092049a1e164482eace228b114fa6ab1423b0242ea712dbfbc046fd73254c2582373a5206e3f
+EBUILD baikal-0.7.1.ebuild 1492 BLAKE2B 9114046fed804f9916f082c6e6a3ece77240a5eba18ea702496ddf5fa94b09f18e60225b1da01eca07dfcd192e4d615e2cf6d5d6431550918353cbc1efdc2ec9 SHA512 a3cf22f7b00d6747bce3f9c0e3cca38f24d70acb2dc79a77af3d1fd539c4e4c27030d59cfce58ae7aa3f75af7f4c074a7c05a32c7b0f91a9b4e62d035f71200f
 MISC metadata.xml 325 BLAKE2B 92c24f0b14c94c6666fe915eda815354af8f73d3f829ff414afcd4ff49b775191ee79ec9000718a795799060ccca8f10acf5ca27d861943ee5ac5c5a34d69ce0 SHA512 2b6f9ba13bbc4821f79703ba0fe5829b4ec30817b9571c05698d65cadbd52444bd3dcff42f0807f4fcdfc9269db6edb858bb0301a50546b0741929030bc196c9
diff --git a/www-apps/baikal/baikal-0.5.2.ebuild b/www-apps/baikal/baikal-0.7.1.ebuild
index 24e74850aa4a..1c55957ab51e 100644
--- a/www-apps/baikal/baikal-0.5.2.ebuild
+++ b/www-apps/baikal/baikal-0.7.1.ebuild
@@ -15,7 +15,7 @@ IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
 DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+RDEPEND=">=dev-lang/php-6[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
 	mysql? ( virtual/mysql )
 	sqlite? ( dev-db/sqlite )
 	virtual/httpd-php"
@@ -32,7 +32,7 @@ src_install() {
 	doins -r html/* html/.htaccess Core vendor
 
 	einfo "Setting up container for configuration"
-	insinto /etc/${PN}
+	dodir /etc/${PN}
 
 	einfo "Fixing symlinks"
 	local link target
@@ -42,9 +42,10 @@ src_install() {
 		rm "${link}" && ln -s "${target}" "${link}"
 	done
 	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
+	dosym /etc/${PN} "${MY_HTDOCSDIR}"/config
 	dosym . "${MY_HTDOCSDIR}"/html
 
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
 	webapp_src_install
 
 	if has_version www-servers/apache ; then
diff --git a/www-apps/baikal/files/postinstall-v0.7-en.txt b/www-apps/baikal/files/postinstall-v0.7-en.txt
new file mode 100644
index 000000000000..ab3ec6459f9b
--- /dev/null
+++ b/www-apps/baikal/files/postinstall-v0.7-en.txt
@@ -0,0 +1,9 @@
+To install, point your browser at the installation url:
+  /admin/install
+To upgrade baikal, do the same but note that starting from version 0.7.0
+baikal now uses a yaml file instead of php config.  The installer will
+try to convert your configuration, but fail to retain your MySQL
+database config (if you use that).
+  https://github.com/sabre-io/Baikal/issues/943
+Simply edit the /etc/baikal/baikal.yaml file and add the missing values
+under the database section.
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index 33cd8d34b4a4..03af72b3e134 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,3 +1,5 @@
 DIST jekyll-coffeescript-1.2.2.tar.gz 5963 BLAKE2B d71d343786f855d480694aa9bac99497b21498ed730198d5fef3f309b96bf5924ecefbf0dee9a6e2ecc9272941c58206508dc47ce0b5bd88afab500bdf07b7e3 SHA512 4b531fd69553036bae22c6f9bae2552da13eb6957e122592ebfa9253b260718a6ec66c34dda8fea83d6d2a0e01eea16c65a4915d6c730dbc6ed53632d2eae198
+DIST jekyll-coffeescript-2.0.0.tar.gz 5984 BLAKE2B 2158f138820253a4e181035dcdf7e25ac7ded26ce7b6e6d6fb5f73e18f5c7e8bbeed8b47a8b12c059b2e7e5167e41f0f9645d5d08e85ff8ab52d400b1c4eb3c7 SHA512 31742ff4a9139d56baaa657b8259c1327a3f7ea14465203907b4d98e6c2b70286f5a1a7515140638a2347db86a35645e715a527b4b85fd536176277f7cfa3400
 EBUILD jekyll-coffeescript-1.2.2.ebuild 843 BLAKE2B 26ff2f0fb6bd6e3f86784eb89103b2eaa5d447221e835bb3a6b3454ca113ba80cf6be009eb1c3e08c668b0043e17873ab000c08b0220f51d331569dd5b32aa93 SHA512 e809a9239462376d826e1b7d20c28446d6545c10523410f6318252e4bde476de9006c306bdc65fedeb1c40dd9e6ba72e9db0ded463cb5c520671fa478c84c6ac
+EBUILD jekyll-coffeescript-2.0.0.ebuild 976 BLAKE2B 2de7f2ed8f56f15f5efcae019b13f1772bd3a382ea0a59c1f59857dfa40287dc3aa42098b1f3bfe19a1c35f5fcf289c3ba465a2ad194b5befd135d064da1fa46 SHA512 f582a78d84ba93c6cbfccf14d84ab4d882af4cccf6432df90a3bfb242e29e652b7c98ad5af6e46e598ef2540be86ee50ba26aeae0595f0328db4b2c196cd14a4
 MISC metadata.xml 338 BLAKE2B 224b7454b4b3fb88128aafe4b0980619f366f5c5151d14f801bda08f2457c9a9bcac20767070cc4240ffcaed43b62382a14bc886d17a4259a9c7b9ecb0b6cb0b SHA512 01c630c47335166243996a64160cce9820e4b46086ccfba65c9ea6455c69ff94c3a0ab8760993b49e80f0f36d8375af02bc1774fba9fa020cdf7dc87c23bfded
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild
new file mode 100644
index 000000000000..b508938a3c9b
--- /dev/null
+++ b/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="jekyll-coffeescript.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/jekyll/jekyll-coffeescript/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A CoffeeScript Converter for Jekyll"
+HOMEPAGE="https://github.com/jekyll/jekyll-coffeescript"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile || die
+	sed -i -e "/^RSpec/i \
+		require 'jekyll'"\
+		-e "/^RSpec/i \
+		require 'jekyll-coffeescript'" spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find -type f -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+ruby_add_rdepend ">=dev-ruby/coffee-script-2.2
+	>=dev-ruby/coffee-script-source-1.12"
+ruby_add_bdepend "test? ( www-apps/jekyll )"
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index 94d87bddf284..16e104feab91 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1,3 +1,5 @@
 DIST jekyll-sass-converter-1.5.2.tar.gz 9004 BLAKE2B a5c0e9a3aa51e47efcc7af90682c3fdb5ab23ba8142768afb175c1edaf2edd4feb8a867aebc72d3c89cc39fe40ed1ec7d1334a473d6023c95478411178e33758 SHA512 370ac6bd150a51afc766e4eb065b55d8965e7c39070fd133ea5422db1c559d4bf84d59bd601a3565792fd90a99c32ea1ccb5ecbed0cc8e1a3a343e7923250cb2
+DIST jekyll-sass-converter-2.1.0.tar.gz 13136 BLAKE2B 9a0a477004a1967a51f894f9bdb99f5c311cbfedfa2b1f0ba1aa7756c8550099361d24347bd3ba8d61fdc5c6c0058cc06be0c87145bb52e67fb65348112f5937 SHA512 336420ee5cf099af94c6f6d9a1cf5bae971f4720f625040f722f502acf05b94e17fdfaac4ccab8b1e58768b653df6c4640dfc835a6425a56a41ddfe709e7009d
 EBUILD jekyll-sass-converter-1.5.2.ebuild 709 BLAKE2B 773a9d2288c32fae6494eebd531e83ab41f4aed9c16783545a516eed2dec66104e92bc564fac950587f70c57f2d1ee376e17b8e45fa91662e8399dfb721a03ed SHA512 8a499a2490eba86e0429ab233c1475c1e06a1073a398b57f55e25e1697756a83fb2022f0c49bb137b5d50eb9a8ed2f7d186f5530b546c953218db792e3a5ed64
+EBUILD jekyll-sass-converter-2.1.0.ebuild 950 BLAKE2B f60cda92a6a46624b2acf5bba5bbcbfe981c0b3ea188cd6bf86854d1adab25cc2ac8c569400661e476fd212fbb937ff7eb7040095a627d75f4ea44c9459913cc SHA512 8fff2d2df1454a8005a6fc5c1ad3fe10d0b28166641bdfeaf866dd99a2299d3d81d14350ccdcacdc90a0645efc9addcf88339c399f78b82947d4b3b6d7db03f5
 MISC metadata.xml 340 BLAKE2B 2e117f6e85b11458811aa3cab607946ca1baaf9b6022c02d1ffffa62da6be9443624e31642a6bc793a0fda23c6b84c91df7f4413de7ea84217fd984c7a5c4a58 SHA512 db6a48ae69a3e29603aa912dbc716f790f4d47e33a2fa416d71716b34f75122ae9f28d17fb97bdc1472e71f3dc311087443ed494c4e06eb500c4345c5cf37603
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.1.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.1.0.ebuild
new file mode 100644
index 000000000000..dd31e7061403
--- /dev/null
+++ b/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="jekyll-sass-converter.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A basic Sass converter for Jekyll"
+HOMEPAGE="https://github.com/jekyll/jekyll-sass-converter"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sassc-2.0.1:2"
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -type f -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e "1irequire 'tmpdir'" spec/scss_converter_spec.rb || die
+
+	# Avoid specs that require the minima theme
+	sed -i -e '/with valid sass paths in a theme/,/^  end/ s:^:#:' spec/scss_converter_spec.rb || die
+}
diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest
index cca83382e988..64d923106b94 100644
--- a/www-apps/jekyll-sitemap/Manifest
+++ b/www-apps/jekyll-sitemap/Manifest
@@ -1,3 +1,5 @@
 DIST jekyll-sitemap-0.13.0.tar.gz 65036 BLAKE2B 88477a9c1ee57975927e9b2a6044322d2c838eb3beded1263158ce4574fbc524453763c55026f88039746e77cbb7ff169dc2601fd0cb65f67d60a4a4252ec040 SHA512 97966c37c7126ac8d9d51069c8d5c448523fa06a7b2136baa1742495e21c76d0264a145e72896b4843111f519a9ddb4d7eab35bc1ea0130a3a77c3ff59066364
+DIST jekyll-sitemap-1.4.0.tar.gz 68362 BLAKE2B df3b55198b5f5f7f26f76c0f164ecbfb11a5d0dd8c5f8fd191cdf2fa090585b7f5c072460b1f78fc0e4cf058366a05a249975f2c72424f2fb8cb5c94ec1e72c4 SHA512 1c2f1bfb72576b45a26be657b39ac18c13da33fbdf69dbf0dbb58cae96c826a838ea5145f2f664796b15cfe098ac7f2ddc21d8145ee105b2dd17a14af076151b
 EBUILD jekyll-sitemap-0.13.0.ebuild 629 BLAKE2B 7ceea2492dfcbbc151202631bab09230cdd750f6e81f02497d7ceeda073b46b97fca3ca0b0688d900b7122326f78eceddba7c982feee19dc3be8fff8c7563579 SHA512 be66e44c9aedce9b6296b3c51ac075e614c449857ca41d62f6df892a26fbfbcce3834ca5d7e445fbb3dc911ce28993f19f3d5036489f3daf8ec7df6e5a27b062
+EBUILD jekyll-sitemap-1.4.0.ebuild 694 BLAKE2B 4f9a3d988a9bec0fe22db09e9090e679d770eb95cbdcd11bdd5cb1fc3af70959704ebbcbe45d5aa2ee50cef3b185c0cf3e20a90547a29274d909116a3192abd6 SHA512 db9e84b7ed82af8382df71ad68bd5f6dc64d2d52abfcc55e8e415d6059d8cb1c547d2c8c3cc98b77c4cc5167549e22fb47b1a2f71f35e26bc7cab508524df4d1
 MISC metadata.xml 253 BLAKE2B 04790d797238d114af848d448e7edfc2a4e14c62b472a24e1097cf831989b0042e4c6770e8a63d7285f4245dfce2787887f2db04d175923037a064c28b192490 SHA512 03899ba135dd5ebedf0c0157aeb74d2facdedbc4ea842a1f9133c0f20b8c49596dacc8f376810fe133ed8571adc0acee4dfd854bcf5f33b3f5c2a1d116250712
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-1.4.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-1.4.0.ebuild
new file mode 100644
index 000000000000..6db4ff79ac9b
--- /dev/null
+++ b/www-apps/jekyll-sitemap/jekyll-sitemap-1.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="jekyll-sitemap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Automatically generate a sitemap.xml for your Jekyll site"
+HOMEPAGE="https://github.com/jekyll/jekyll-sitemap"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "=www-apps/jekyll-4*"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -type f -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index fe4ed1e1fb7c..0242c875e9ee 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,3 +1,3 @@
 DIST jekyll-watch-2.2.1.tar.gz 16631 BLAKE2B 2311802227206b76d1f7b18ccc6360514164c6148f549490bd4df69e56e4d7a8c944c828e950bb156929081ea8ac15bdc37099eba5af3e0f3e1c20b403828f60 SHA512 55867bedf0f453aad7df267d21cc2a49857916b51ed70e727718c9ed18dedd474bc45c446abcbc803ab4b8b26f8afb1f0e05e6655441186788fbace869c74b6d
-EBUILD jekyll-watch-2.2.1.ebuild 664 BLAKE2B 45a2edaf72906280d1b751c85ba89226d3de0b85a2e60a8498af452997acc8c86522a1e582a4fe618c2d4bc67f21a207cd0bf1182329ce63ceb8d66eec8deba2 SHA512 9a9a0e396d2531df76d0e2507d36f951e07467fa14efa8ce8862b7040606504fa5ec531b1c57ea7fc66d400d0d189a43ebaa285855c99602daccefa4b9745dfd
+EBUILD jekyll-watch-2.2.1.ebuild 671 BLAKE2B 5baf1d60ee35494c4df981a49d91282b08d3bf1bbe565a13dd52e2a65cb3795b4683b00bfa7c49f194c88f358939d48fc8088174653b4e5bae344d8cd3638ce8 SHA512 17e277cd6ea46f4494457407ab02965e201aeb360c4910f2e0836cb9dc2f62025b012ee7a25396b44d1d4854fbd7538e9184d87012c8fc1972e6d62434e51d82
 MISC metadata.xml 436 BLAKE2B 72dd2e30ff3976205bc604cf6a5be914ad2a1e79b72a96b6bee54dba91d5a8f19b857d70510483ad10a093ef0786da8a2c71a4d4c8ed800d3756e4a6136d4d03 SHA512 965327c1e3256487e17066618b4f27ae8e60d4d705988da4409fc62b52fe4e3a7d31d9bc13ef794b7544e2a4fb3b76e8d8cee075075c56817128b749fc22f419
diff --git a/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild b/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild
index 30d6fea1b99a..094211910e63 100644
--- a/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild
+++ b/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 821cb57acb56..a64309b956df 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.8.5.tar.gz 852490 BLAKE2B 3831c68c8c17b5ca14521988572849b89c8cd37f3fa4d7048adb7e25319f59a31e6174a6d25fb5ba4d33c919389f3a30cb28274cddd29ea644ec5d5aa11875e7 SHA512 2cd6bb8786fa2efc249457f72e9e1a3dc76c61a23d2ed8388fef56f1bd576897260b199edb393eb358cfe3a0b26487e40cc2fd3502c52cc9c828839b9eef624d
+DIST jekyll-4.1.0.tar.gz 1397143 BLAKE2B f7021fdc418acefa1b7e92318225ff8afff8dd84a0134906bb48ae461a94e4a71a8d0de0800ea489a3bd3eb7bfa36be4b8781e4c89729d5adc9e8ddc3b711dc3 SHA512 fdd9b28ff065a1dbe78f197c618bdd00bfeb37f66983c55ce971edcc96c3af39d926ec64b3866084dc8c21a56764ecdfb61d954123b15fe41a9de68fc951dc48
 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
diff --git a/www-apps/jekyll/jekyll-4.1.0.ebuild b/www-apps/jekyll/jekyll-4.1.0.ebuild
new file mode 100644
index 000000000000..c31e66aae8c2
--- /dev/null
+++ b/www-apps/jekyll/jekyll-4.1.0.ebuild
@@ -0,0 +1,90 @@
+# 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"
+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/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 -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/mirmon/Manifest b/www-apps/mirmon/Manifest
index c39f99e9155b..644c7c75cd04 100644
--- a/www-apps/mirmon/Manifest
+++ b/www-apps/mirmon/Manifest
@@ -1,5 +1,5 @@
 AUX 2.11-Add-ipv6-monitor-support-to-mirmon.patch 1238 BLAKE2B 4e7d12fcd88b44584dca161e675b1eda1655bb39b464b4e1c90ae0844d627b6d0d56c009582036054d7c44743f55f17f068857d48b09511a477a94fb9123dc81 SHA512 c2bed5deef5e16e7c28aa3f7f7da0c3026a45d67fced62aeb380f1ce98e1535d7598c98e68b7a95cf25b2369b5ed3bdfd617b1ca6140ce914a42f23850bc3b1c
 AUX 2.11-Fix-options.patch 1336 BLAKE2B 8f35a902025fde5af0acc59139333c4ed23e310b9e687e8dc4f9d8221b066b0ca149c178e0e0f5117a5662470add4246d2c9685beb5eb1ec9f897f256ad55b9c SHA512 3b59e285c05bca87db6583940219def9f73a46a9b9d58d786106dce1c1029f97f9cc97cbdb8dfefa814860d57bbb7ab1cc2defb28ee535687162792a18561e78
 DIST mirmon-2.11.tar.gz 67630 BLAKE2B 6b7ba87cf7705083f8199ef9e2cff1e63a73592cf1bb0852fa5bece7ce462f06c4be5c60570748e6d5b46e845cdb8c1af44b4b1f976dc2a34a9b7d5e08fd7811 SHA512 4fff47042b9768d10541c1b478a44277ab7610e635e09bcac404a94590b86b375e21098130d0b91c4f9a1bd883cef8967c74dae7b50cee7b51339999b0240580
-EBUILD mirmon-2.11-r2.ebuild 1046 BLAKE2B b77382d16482cf8f2caccdec00d604d10893df28836f82cecc902aa902ea0258ad70e303c0660efb95bd47a6127dce4057b3867591c68eaf8034b1e09336b0aa SHA512 8a8cef322d9ea90b64558fdd047467356333afaf897561ea8c27fc7cf36d430beb93327d4d6efcd93b952d97208519ed4968b361dc0bc652ca61fea6624ba16d
+EBUILD mirmon-2.11-r2.ebuild 1029 BLAKE2B 36fa045bbe14422dbb0b6274f65efc841dc4c7b5185f98416b3404873ce6341bd20afc673e64491e67800fca62cc01c56e4fc57c32c0970ecff49a428d150628 SHA512 c5668cf9d96fc9f2dc6830fa2232b1eb7c2815b8c7fcbdf7619699da181872b4f78080fdad9d23ac5524348a0c3c74f73b7a40c215ebb531af173b2c79b0fbd7
 MISC metadata.xml 450 BLAKE2B 1b83a7498d0025ff4dc255cbc8bac2c9ce6401c3a0f4ba3631e8b3eaf1ba81cca5f23223936ce5664ee28dc7bb9525d728f45bcc09f602172e50d79f92137a82 SHA512 71cbf05ea1221802576a331bcc7f6885d86261c8a95cd0a7cd4bf55b3b55a52074204114ca2e0676314de8345e27227cf3161d08d6cf617e2a067b0cef5d87b9
diff --git a/www-apps/mirmon/mirmon-2.11-r2.ebuild b/www-apps/mirmon/mirmon-2.11-r2.ebuild
index 0d6ce1561b0e..aedec780b155 100644
--- a/www-apps/mirmon/mirmon-2.11-r2.ebuild
+++ b/www-apps/mirmon/mirmon-2.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ WEBAPP_MANUAL_SLOT="yes"
 DESCRIPTION="Simple webapp to monitor the status of mirrors"
 # The author has passed away: https://www.apache.org/memorials/henk_penning.html
 HOMEPAGE="http://www2.projects.science.uu.nl/csg/mirmon/mirmon.html"
-SRC_URI="https://deb.debian.org/debian/pool/main/m/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://debian/pool/main/m/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 6e087b297c4c..9423b24a6b62 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -6,8 +6,10 @@ DIST moodle-3.5.12.tgz 46771916 BLAKE2B cb22c3a1548d2e01b309375ef3e422faa1a1603c
 DIST moodle-3.6.10.tgz 47830177 BLAKE2B f28ce1b32cc4cec2eb256a9a3ad37f224e637e5e4720af4914dff80eec07cdfe738546545e9fc3db7a88517b0c10fc16a942515b3aa011d4d7588fbc2c26fffe SHA512 1ac374b1805f3a2be253279384f81c11d717eb6d9598c42490254912fe3720cba22c31525f3435785d270eda5a4340c79db43070973ebac3059549a322cfdbce
 DIST moodle-3.7.6.tgz 45867618 BLAKE2B 901a0d953e1a3329c817c032610ad797a34458fa9716ab9dcb51775faebdd30593596694ed72cbb0b0a45bb19eeee69a373f4792edce3aa530b3aeeb3cb551a3 SHA512 eaf8eeed256e9a942a5003f24bdd56ec3378d02fd33a4807b06fe2df083c5fe343014bda19d49791d20d038dbc3bc2a86e20a2e2f9fc25b45b3c00d8728c6ff1
 DIST moodle-3.8.3.tgz 53221103 BLAKE2B 7bf36c7affbe71eab027954e6690eb45137a49bad136511efe90f843de00d31b94071cac37a8ddc3f22565df960454047b42f5839ef58177b18d2737317b9c84 SHA512 d68f99717e7283f95a050d39879bffec8fe210f83d970fd5b14655be6546bf0848b75fd44bca3376b1bb7aba274c05a58b0b01d430cfbffebc02355c4a2b3759
+DIST moodle-3.9.tgz 56958303 BLAKE2B 81b4a2adab014d9e67d2a400592db56777dcecf7b16f7495f941472a8a49af74acd732d4198f2821910a1771995c85d998e1fe58ba4d6db7fc3dd4e1892cda41 SHA512 693a77fdd66ecfa9e1418e01c543d575aa8468b267de0a1dcfb6df369adc5b73223c959e57947cb56fafa94d269fbd36fd652ddf0b84ed8d5397702501a86e01
 EBUILD moodle-3.5.12.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
 EBUILD moodle-3.6.10.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
 EBUILD moodle-3.7.6.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
 EBUILD moodle-3.8.3.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
+EBUILD moodle-3.9.ebuild 2809 BLAKE2B 9dffc324aa9b154d95215344eec2c4ed22b197adb34b5d38eee3d4b54970f89f61beb3c64bf8751e8c6adb0c52660bed373c9edbd149ef4aa41ae24e0c3fc976 SHA512 6206687130349734f1731a74ec00419f20c6c34828b76c2b33cc2385a4b09a26efa172b023608252b815de014bd1d7c732d92f52268073e5c357275dc954a437
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.9.ebuild b/www-apps/moodle/moodle-3.9.ebuild
new file mode 100644
index 000000000000..1012b291cbc9
--- /dev/null
+++ b/www-apps/moodle/moodle-3.9.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit webapp
+
+MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="https://moodle.org"
+SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3+"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-7.2[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	if [[ ${DB_COUNT} -eq 0 ]]; then
+		eerror
+		eerror "No database selected in your USE flags,"
+		eerror "You must select at least one."
+		eerror
+		die
+	fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/octoprint/Manifest b/www-apps/octoprint/Manifest
deleted file mode 100644
index 7e76d6460b49..000000000000
--- a/www-apps/octoprint/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX octoprint.confd 160 BLAKE2B 3c930cd1ee7008e5d61f2a7fb8be9213f2d97ebb7af224912711b124021e3448b1f0137595641bdcd3a9a4661868f09690bc06d3df0f93309c08d4d0399a4b38 SHA512 2989058912d8a4cf86484a37f2219c7b3035ae8c9980191160558d2994b896ee3b3f35615d4c34370f5e5ca27455fbf7e3cb3ef59ebff1e3e6578edfbd5ef666
-AUX octoprint.initd 691 BLAKE2B 062c5e3553a4d8ce942d90e57f79a9dcf09112da0d52e065daac48e8df60a823afe34a63f3daff2b32dba787dd1284dea6bdede999dca6e48b79959dc691197b SHA512 a1a7343cd23a2a5c83c77661239afebf6199a31f4b08e41d70c72e2ed645a3c4f2f52f656ccd4671ddd9eda6865d2b2173c6c426be03253e98af293981138eba
-DIST octoprint-1.4.0_rc5.tar.gz 5117820 BLAKE2B 6140ec81ad257e6197275e8289bfba09a140f216f1718b595e2b9ed19a21570c28979a081db537b4fe63ec128498940307a3f311c6d30dd52be45ef867a15114 SHA512 db22ac1cbc9e6ce9214f1066ef2748b613c83466ee539a4b3d2eb6d5b0b1a83a5cf4b434bce4d1a2053ad38f6f1cfcec115ee1f1f9e7140c741651913ffcabda
-EBUILD octoprint-1.4.0_rc5.ebuild 2354 BLAKE2B 7415abea8b7eb921beb768f7e8801f09742b511df7bdfb36182c223f50320904995f8ba4d41bb006d295138f4452396429f303bdb61b8e332b3014c6cb6350ee SHA512 427211fdde3767fcce1943bd139c43cc99cd3f2c9d7e22ca53419676e5f97453f09bdfd028f3144ad7a13457b960cd0ed70e710b054a79f6a952c613b3e39bf1
-MISC metadata.xml 368 BLAKE2B 704d114808c6508978c8f6a5235f4646e17196794bfbead6ca440cbb0ec6ebccaa91a3c20e785039c5d16adabd061cbb65dd0537e50c650df66a8fc33abeebee SHA512 aade5c4a14a07bc43e4777647b2a7e7ba20cc7e0376f1092ca914f126d916ae93a9516511424738586b801197ee46fe245f34a0038a286c9d5a1af91de86e1b5
diff --git a/www-apps/octoprint/files/octoprint.confd b/www-apps/octoprint/files/octoprint.confd
deleted file mode 100644
index 007b97f930f0..000000000000
--- a/www-apps/octoprint/files/octoprint.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-OCTOPRINT_USER="octoprint"
-OCTOPRINT_GROUP="octoprint"
diff --git a/www-apps/octoprint/files/octoprint.initd b/www-apps/octoprint/files/octoprint.initd
deleted file mode 100644
index 6a4e648e29fc..000000000000
--- a/www-apps/octoprint/files/octoprint.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE="/run/octoprint/octoprint.pid"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting OctoPrint"
-
-	checkpath -q -d -o ${OCTOPRINT_USER}:${OCTOPRINT_GROUP} -m 0770 "$(dirname "${PIDFILE}")"
-
-	start-stop-daemon \
-		--quiet \
-		--start \
-		--user ${OCTOPRINT_USER} \
-		--group ${OCTOPRINT_GROUP} \
-		--background --make-pidfile \
-		--pidfile "${PIDFILE}" \
-		--wait 1000 \
-		--nicelevel -2 \
-		--ionice 1 \
-		--exec /usr/bin/octoprint serve 
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping OctoPrint"
-
-	start-stop-daemon \
-		--stop \
-		--pidfile "${PIDFILE}" 
-
-	eend $?
-}
diff --git a/www-apps/octoprint/metadata.xml b/www-apps/octoprint/metadata.xml
deleted file mode 100644
index 92ab71cade92..000000000000
--- a/www-apps/octoprint/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Packages for 3d printing</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/www-apps/octoprint/octoprint-1.4.0_rc5.ebuild b/www-apps/octoprint/octoprint-1.4.0_rc5.ebuild
deleted file mode 100644
index 9e00b40aef97..000000000000
--- a/www-apps/octoprint/octoprint-1.4.0_rc5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6,7})
-
-inherit distutils-r1
-
-MY_PN=OctoPrint
-MY_PV=${PV/_/}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="the snappy web interface for your 3D printer"
-HOMEPAGE="https://octoprint.org/"
-LICENSE="AGPL-3"
-SRC_URI="https://github.com/foosel/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-BDEPEND=""
-RDEPEND="
-	acct-user/octoprint
-	acct-group/octoprint
-	dev-python/pip
-	>=dev-python/flask-0.12
-	<dev-python/flask-0.13
-	>=dev-python/jinja-2.8.1
-	<dev-python/jinja-2.9
-	~www-servers/tornado-4.5.3
-	dev-python/regex
-	>=dev-python/flask-login-0.4.1
-	<dev-python/flask-login-0.5
-	>=dev-python/flask-babel-0.12
-	<dev-python/flask-babel-0.13
-	>=dev-python/flask-assets-0.12
-	<dev-python/flask-assets-0.13
-	>=dev-python/blinker-1.4
-	<dev-python/blinker-1.5
-	>=dev-python/werkzeug-0.16
-	<dev-python/werkzeug-0.17
-	>=dev-python/cachelib-0.1
-	<dev-python/cachelib-0.2
-	>=dev-python/pyyaml-5.1
-	<dev-python/pyyaml-6
-	>=dev-python/markdown-3.1
-	<dev-python/markdown-3.2
-	>=dev-python/pyserial-3.4
-	<dev-python/pyserial-3.5
-	>=dev-python/netaddr-0.7.19
-	<dev-python/netaddr-0.8
-	>=dev-python/watchdog-0.9.0
-	<dev-python/watchdog-0.10
-	~dev-python/sarge-0.1.5
-	>=dev-python/netifaces-0.10.9
-	<dev-python/netifaces-0.11
-	>=dev-python/pylru-1.2
-	<dev-python/pylru-1.3
-	>=dev-python/rsa-4.0
-	<dev-python/rsa-5
-	>=dev-python/pkginfo-1.5.0.1
-	<dev-python/pkginfo-1.6
-	>=dev-python/requests-2.22.0
-	<dev-python/requests-3
-	>=dev-python/semantic_version-2.8
-	<dev-python/semantic_version-2.9
-	>=dev-python/psutil-5.6.5
-	<dev-python/psutil-5.7
-	>=dev-python/click-7
-	<dev-python/click-8
-	>=dev-python/awesome-slugify-1.6.5
-	<dev-python/awesome-slugify-1.7
-	>=dev-python/feedparser-5.2.1
-	<dev-python/feedparser-5.3
-	>=dev-python/future-0.18.2
-	<dev-python/future-0.19
-	>=dev-python/websocket-client-0.56
-	<dev-python/websocket-client-0.57
-	>=dev-python/wrapt-1.11.2
-	<dev-python/wrapt-1.12
-	>=dev-python/emoji-0.5.4
-	<dev-python/emoji-0.6
-	>=dev-python/frozendict-1.2
-	<dev-python/frozendict-1.3
-	~dev-python/sentry-sdk-0.13.2
-	>=dev-python/filetype-1.0.5
-	<dev-python/filetype-2
-"
-
-src_install()
-{
-	distutils-r1_src_install
-	newinitd "$FILESDIR/$PN.initd" "$PN"
-	newconfd "$FILESDIR/$PN.confd" "$PN"
-}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index d6d13daa0e42..46b09611838d 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,8 +1,8 @@
-AUX 10_redmine_vhost.conf 343 BLAKE2B ef74d3feefb81ea29a85860e94ced42cc565058a9e57a1bdb7bc3581842c9543315852d47b9bed80ffbb94280f5f0264c05a552819f89bcc409118ccffd68865 SHA512 839a01abedd2977f79bde2a55041d4e3e3a72de1e04e2bdc4aa5169b3ec22adce12b2b39d4b991d6e034fcd13fbcd030cba5ecc69ae71a76f7f37d2cdde09edc
+AUX 10_redmine_vhost.conf 314 BLAKE2B 6e687093ed220c8a275f43d002d9661a36a0602001e4783b036bea0daac86810ce034573da5f3ac65e7f556af77db93849d93931de909bfbac1313e7fe705120 SHA512 5c6628b353167056a33f8b1be4332f7d3fb6b31e4457dbe1968ff1123c8d7bc607e175307636cd83d683715e9973fc8c87720aa35224e75fab81b074c7bab604
 AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d266c4cdf46e077018bbbac34a5c818fccb19508c76dd56f53bc31d3e469e61302d36825ba36a5d851cfa73b0a0ef SHA512 1a4b649bc036372a47782a089c2b3db244ea4dd5437f2d931b6c7c4578f5aa104c8b8493da4a3f2874aac0380527604807ec2062525dcd392425b9b22c84f9bf
 AUX redmine-3.initd 1269 BLAKE2B 1c0f561fa1c13c899b17b7c707ac6beaa9090a9ec98657f7ddce2e653241d7388392f22eaf35a85f5de96c3a0c32a4b67f0003725c371ef1ffb1f76c56d989b4 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece
 AUX redmine.confd 267 BLAKE2B d2f4f34ac6ac2aadfe5371831fb5dba6dc6e58fd26197528ebe27d9f4faa3dc8b9c495e77841b8a2e67db7093c76cbcda24b9548da0d10268d105b5dde0bb023 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94
 AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994d55ca3aa41e0c1e34962d26da4a46c99fdbdcdd600c12f2d386559af53a2e48d55b5d670372be65b60 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1
 DIST redmine-4.1.1.tar.gz 2712056 BLAKE2B 767964ca455fdea081d3d409e91903367190ccce08474dd6c3bba8a3a89b7efd3846dbe1dd09039620591807dc44926744218f5db28a59ddb2da326a3f3f5b1d SHA512 fe691318fe8464de197a49ac172ecfcd65047ca62273226f63549620475557cd27cf8e193355a665abef64fc0c9e59556b4732cdcaa8061746918b06a7afcf81
-EBUILD redmine-4.1.1.ebuild 6624 BLAKE2B f2a591fec1dcee4f988b63d5e22359c9a9da5a8c307a98687e92c5abcbb6eb57cfbb9370e68e87a825fc5011e9ecbf8985242420a37726941564038e7753c650 SHA512 ac6dbfeabf0c9b83a336693cb9e9dfab9b99ad06ff0be2f0d33ff2412f95751abfd418b311ff66cc3c53088152cc8d6e8e2d07a3ba7b137907597d5092513e10
+EBUILD redmine-4.1.1-r1.ebuild 6736 BLAKE2B da7a3b459020d4258822d13d0c9a9d1073350b5a72db3c138f35f579e4716218446fc55045da0cf1f45a44d851306b4fd8d57f3cac4586c6ef1101a2818ae708 SHA512 62d863404c2a8b1636bf929c3ccf3d0b53158c50ee8ed7d0df7e769372569d0563ec6ea2a201923415ef7bb422a68fa40ff2483a2459adc3ea51cc45e466f4b1
 MISC metadata.xml 527 BLAKE2B 251acbf9246fd6c986b37b6320e78619036d30bc8e155e97a93a2c3ca99847eb39d7919ba94f633aa021462cd200dd156b6f7d3c1575151c1d6b38a4ee999bfa SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4
diff --git a/www-apps/redmine/files/10_redmine_vhost.conf b/www-apps/redmine/files/10_redmine_vhost.conf
index 33a117a91e52..3b67d93c2de0 100644
--- a/www-apps/redmine/files/10_redmine_vhost.conf
+++ b/www-apps/redmine/files/10_redmine_vhost.conf
@@ -5,8 +5,7 @@ Listen 3000
 #       RailsEnv production

         <Directory "/var/lib/redmine/public">

                 Options FollowSymLinks

-                Order allow,deny

-                Allow from all

+                Require all granted

         </Directory>

 </VirtualHost>

 </IfModule>

diff --git a/www-apps/redmine/redmine-4.1.1.ebuild b/www-apps/redmine/redmine-4.1.1-r1.ebuild
index c6939a0daed1..f58dfec10598 100644
--- a/www-apps/redmine/redmine-4.1.1.ebuild
+++ b/www-apps/redmine/redmine-4.1.1-r1.ebuild
@@ -62,6 +62,8 @@ all_ruby_prepare() {
 
 	# Fixing versions in Gemfile
 	sed -i -e "s/~>/>=/g" Gemfile || die
+	# bug #724464
+	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>5.2.4'/" Gemfile || die
 
 	sed -i -e "/csv/d" Gemfile || die
 	sed -i -e "/group :development do/,/end$/d" Gemfile || die
@@ -78,6 +80,10 @@ all_ruby_prepare() {
 	if ! use markdown ; then
 		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
 	fi
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem 'fcgi'" > Gemfile.local
+	fi
 }
 
 all_ruby_install() {
@@ -86,11 +92,6 @@ all_ruby_install() {
 
 	keepdir /var/log/${PN}
 
-	# Additional dependency for Gemfile (#657156)
-	if use fastcgi; then
-		echo "gem \"fcgi\"" > Gemfile.local
-	fi
-
 	insinto "${REDMINE_DIR}"
 	doins -r .
 	insinto "${REDMINE_DIR}/config"
@@ -99,6 +100,7 @@ all_ruby_install() {
 	keepdir "${REDMINE_DIR}/public/plugin_assets"
 
 	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config.ru" \
 		"${REDMINE_DIR}/config" \
 		"${REDMINE_DIR}/files" \
 		"${REDMINE_DIR}/public/plugin_assets" \