gentoo resync : 19.07.2019

20 files changed, 202 insertions, 182 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 680f8013b0cd..39eb9e45f0df 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drraw/Manifest b/www-apps/drraw/Manifest
index bafeab297854..1f37fcf2ceac 100644
--- a/www-apps/drraw/Manifest
+++ b/www-apps/drraw/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en.txt 137 BLAKE2B 4625ea14453a699c1cb0c572f01f690781509cd86be9c434f176e5755402ae8fd7271834a25ac958fa0acc29b8e0b23af8b8a1d587971a2bf3ddd794aff1953a SHA512 17286b3758a6f2606b80ae493725647128b6f7ebce3318c3ffcf7ce13e4bc14c730013ec4633421630cdfbbd1eaa7310587066fac8063a777221d4b31581bffe
 DIST drraw-2.0.1.tgz 40970 BLAKE2B 706b6b678e041bbc7607404cd6d8caae2c900d66ea6baf277cdf373d69e411e721c0b39de781e058cd495af9b8f71e5bf1b306ba2e8fd40c0a52454bf418e800 SHA512 35f03864aae70812a5afd948c0f159f4fb873501117c3f8dfc8a227c2b3067d03e9d3bd524f74277750d0ba4f922770a73d8657548e7ee0eda1281b543202020
 DIST drraw-2.1.3.tgz 45970 BLAKE2B c7fbc5bfb1acaf80b2ea80e9bf4c0e7334cfb1f0454185f356fde7347131f133b827758f848be17fe5bfa7e11f6516bd508647ec62adafb2572e9b459faf0275 SHA512 2ac1ff34a4744a76aba0e3dfafcd0b6b4139bfaa20942965feef1434e72ddcb2f22f9e68d8f39b8fafe7ca252cbbb22e5ac9eb54ee1380f6aa251d48edded960
-EBUILD drraw-2.0.1.ebuild 1035 BLAKE2B a5336db9cf13387c7987284a371e13dfa9db9118169956c7989e954c39278987beb64f978cfabebe007a52081709dd732c5e8cd1e5805efe71390dc34f467fad SHA512 1b9d410c978c057c64943c7eb96eb6d935d830da972bdd18910f894495f2466062f5801eb72c0fd4d3aa6ca08aacf57cf5f65fe1d902df9d29364a44b320d61a
+EBUILD drraw-2.0.1.ebuild 1032 BLAKE2B b4b6e59dc43d3e298ce14f902ee36b54f50ddd3e0bb19e0112b5940dc2b900b9534459af9d5fcaa5ecb1073c0c3b9eaede13ec5f46c55afdda03e8d415651d5c SHA512 d2f54cd95cc110ed955bb80b5aa0c3bde7d4b2d76fce62d0fc3a04e3df2292c74e5286b3b147a42d137ac6065b8729c145c6f50242308e5290ebda68433661b2
 EBUILD drraw-2.1.3.ebuild 1042 BLAKE2B 0ffc5d4e96e0c3ca510e60e65dc6fb454d3c344736a86217b514b8dbf6a8a4ec378a4b7b06e3299386f6c3804a91ca282ac4e763fcd5d7d047aca60cc1fe97a0 SHA512 5936d15d49eb23b122890ec40133a7cec0d7b5463cbd495466d25e30d7827dba1a484bcc99f02dbf9ae3464cec41f10e609a3efc8d35953a17a4f1397218f011
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/drraw/drraw-2.0.1.ebuild b/www-apps/drraw/drraw-2.0.1.ebuild
index 62998f47098a..e71913547cb4 100644
--- a/www-apps/drraw/drraw-2.0.1.ebuild
+++ b/www-apps/drraw/drraw-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -10,7 +10,7 @@ HOMEPAGE="http://web.taranis.org/drraw"
 SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ppc"
+KEYWORDS="ppc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index 057bc1c2c8c2..33cd8d34b4a4 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-coffeescript-1.1.1.tar.gz 5350 BLAKE2B cbcb98f831b937458938e541e3b4d79bbdc1bf12444c5fbccf9f295744ca34fda019956ca5b7d011c8b88582d043157f7abf584af447e061f973b39da82227aa SHA512 6b748fb521a33be6dcf944bba35db2f2924d8ee403ba035f4e0e1411d91f1a7eb527af42237994c4f9839a3e6babfbd8b5441ecd5ef5c42db7afbdf4bfc643d2
 DIST jekyll-coffeescript-1.2.2.tar.gz 5963 BLAKE2B d71d343786f855d480694aa9bac99497b21498ed730198d5fef3f309b96bf5924ecefbf0dee9a6e2ecc9272941c58206508dc47ce0b5bd88afab500bdf07b7e3 SHA512 4b531fd69553036bae22c6f9bae2552da13eb6957e122592ebfa9253b260718a6ec66c34dda8fea83d6d2a0e01eea16c65a4915d6c730dbc6ed53632d2eae198
-EBUILD jekyll-coffeescript-1.1.1.ebuild 848 BLAKE2B defd171fe2a7aaa5459e04c997cd7af9eb99567d536796d9f5782dfdf31ae4dd34d968ed267273d56ef608570e5ad2c00b469e16a2b37cf2eb2981c60ce07afa SHA512 da3438228d8b05e9f977bc9fdefc6848383706c1d3127d81753c0f75e789c4cde091687a174491e05de826db3b44fc60aa682200e1429f3087211bd5c010903e
 EBUILD jekyll-coffeescript-1.2.2.ebuild 843 BLAKE2B 26ff2f0fb6bd6e3f86784eb89103b2eaa5d447221e835bb3a6b3454ca113ba80cf6be009eb1c3e08c668b0043e17873ab000c08b0220f51d331569dd5b32aa93 SHA512 e809a9239462376d826e1b7d20c28446d6545c10523410f6318252e4bde476de9006c306bdc65fedeb1c40dd9e6ba72e9db0ded463cb5c520671fa478c84c6ac
 MISC metadata.xml 338 BLAKE2B 224b7454b4b3fb88128aafe4b0980619f366f5c5151d14f801bda08f2457c9a9bcac20767070cc4240ffcaed43b62382a14bc886d17a4259a9c7b9ecb0b6cb0b SHA512 01c630c47335166243996a64160cce9820e4b46086ccfba65c9ea6455c69ff94c3a0ab8760993b49e80f0f36d8375af02bc1774fba9fa020cdf7dc87c23bfded
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.1.1.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.1.1.ebuild
deleted file mode 100644
index 2b29cafc7ab9..000000000000
--- a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-RUBY_FAKEGEM_TASK_DOC=""
-
-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
-}
-
-ruby_add_rdepend ">=dev-ruby/coffee-script-2.2
-	>=dev-ruby/coffee-script-source-1.11.1"
-ruby_add_bdepend "test? ( www-apps/jekyll )"
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index 2694964bfed2..94d87bddf284 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-sass-converter-1.5.0.tar.gz 8516 BLAKE2B 78b4c49f2d49f28f1c7f02fe808ab98644cb9143038c179bbdb872bf8b8d45cbba84bd73da924a61e661d7d22ba26f2715531146ec8169089729046f196be403 SHA512 ece83d8c13e93a90c66ed899accc77746d56067f6841ca0d29050168c52d9eea6de3d78760b0f468be2dbc9b0b9df5ac02d5066a26809a33cdadd591fbbc9b52
 DIST jekyll-sass-converter-1.5.2.tar.gz 9004 BLAKE2B a5c0e9a3aa51e47efcc7af90682c3fdb5ab23ba8142768afb175c1edaf2edd4feb8a867aebc72d3c89cc39fe40ed1ec7d1334a473d6023c95478411178e33758 SHA512 370ac6bd150a51afc766e4eb065b55d8965e7c39070fd133ea5422db1c559d4bf84d59bd601a3565792fd90a99c32ea1ccb5ecbed0cc8e1a3a343e7923250cb2
-EBUILD jekyll-sass-converter-1.5.0.ebuild 688 BLAKE2B 7d3b78d33e59f71ca66639703993d5ef196e4dcc17c7f54f1f9108f0cbe4059bcd31f65bb133b00f2ef73abbfaad0f0db20fdcaad4afa7e34af46b5a0395b874 SHA512 129b02986be29745f21b3f84035985c9a0da7a1bacdfe3650bffca6ec9506cd352023fc2edf82a8246903ea8d9b60e3787c42583e385356017e656eb1b961419
 EBUILD jekyll-sass-converter-1.5.2.ebuild 709 BLAKE2B 773a9d2288c32fae6494eebd531e83ab41f4aed9c16783545a516eed2dec66104e92bc564fac950587f70c57f2d1ee376e17b8e45fa91662e8399dfb721a03ed SHA512 8a499a2490eba86e0429ab233c1475c1e06a1073a398b57f55e25e1697756a83fb2022f0c49bb137b5d50eb9a8ed2f7d186f5530b546c953218db792e3a5ed64
 MISC metadata.xml 340 BLAKE2B 2e117f6e85b11458811aa3cab607946ca1baaf9b6022c02d1ffffa62da6be9443624e31642a6bc793a0fda23c6b84c91df7f4413de7ea84217fd984c7a5c4a58 SHA512 db6a48ae69a3e29603aa912dbc716f790f4d47e33a2fa416d71716b34f75122ae9f28d17fb97bdc1472e71f3dc311087443ed494c4e06eb500c4345c5cf37603
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.0.ebuild
deleted file mode 100644
index 0a2f36d2c85d..000000000000
--- a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.0.ebuild
+++ /dev/null
@@ -1,27 +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_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-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/sass:3.4"
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
-	sed -i -e "1irequire 'tmpdir'" spec/scss_converter_spec.rb || die
-}
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index 2b2a4a358ff4..fe4ed1e1fb7c 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-watch-2.1.2.tar.gz 15966 BLAKE2B 877935b518f887aa58987942cf03b337f41f142947416386410c3924880738e64b4aa05a06eba2089635d417e329a72b0602112ff19070ea203cf07bb9988ce7 SHA512 a411f354e1971727d1fabe6fe1fc6e9f889a0cbc9cf253e8dbee87c66f7a8f3ca1e75cdad242c9235e93ce45983939ded2a439d2a8339bfc70bc55b5b2eaff4a
 DIST jekyll-watch-2.2.1.tar.gz 16631 BLAKE2B 2311802227206b76d1f7b18ccc6360514164c6148f549490bd4df69e56e4d7a8c944c828e950bb156929081ea8ac15bdc37099eba5af3e0f3e1c20b403828f60 SHA512 55867bedf0f453aad7df267d21cc2a49857916b51ed70e727718c9ed18dedd474bc45c446abcbc803ab4b8b26f8afb1f0e05e6655441186788fbace869c74b6d
-EBUILD jekyll-watch-2.1.2.ebuild 671 BLAKE2B 6e842e73c743ec350bcfc3ba3e2ebb6213d73ed6a8ecc99129916caf2a83b0281672c0edea34d7f1130c9213a757869e1aa1f77696a6cb090730f73944ae6031 SHA512 3b541b861dc860ec0ed6807479a2591313a0114399a9eeb4f7ae0746227e76ea619b13110a8d0e54568e6c6d12f64444d4d1878162ac6f5d96834d9a06e0b54c
 EBUILD jekyll-watch-2.2.1.ebuild 664 BLAKE2B 45a2edaf72906280d1b751c85ba89226d3de0b85a2e60a8498af452997acc8c86522a1e582a4fe618c2d4bc67f21a207cd0bf1182329ce63ceb8d66eec8deba2 SHA512 9a9a0e396d2531df76d0e2507d36f951e07467fa14efa8ce8862b7040606504fa5ec531b1c57ea7fc66d400d0d189a43ebaa285855c99602daccefa4b9745dfd
 MISC metadata.xml 436 BLAKE2B 72dd2e30ff3976205bc604cf6a5be914ad2a1e79b72a96b6bee54dba91d5a8f19b857d70510483ad10a093ef0786da8a2c71a4d4c8ed800d3756e4a6136d4d03 SHA512 965327c1e3256487e17066618b4f27ae8e60d4d705988da4409fc62b52fe4e3a7d31d9bc13ef794b7544e2a4fb3b76e8d8cee075075c56817128b749fc22f419
diff --git a/www-apps/jekyll-watch/jekyll-watch-2.1.2.ebuild b/www-apps/jekyll-watch/jekyll-watch-2.1.2.ebuild
deleted file mode 100644
index 3468c5c4a5e8..000000000000
--- a/www-apps/jekyll-watch/jekyll-watch-2.1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
-HOMEPAGE="https://github.com/jekyll/jekyll-watch"
-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/listen-3.0"
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
-	rm Rakefile || die
-}
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 3c8b39e7815f..821cb57acb56 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,6 +1,4 @@
 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
 EBUILD jekyll-3.8.5.ebuild 2144 BLAKE2B cb825e8834f8c0feefedd7f2cef69dbf46a3656a5a9281698b65f668cac2897c098d625fdf227460ab2f6d5e7663ff42e0f4ab985daa7fba6615148ed5f2358c SHA512 2ce9ac22ab20aed5b3861d0bbc1035bfbf8b87317935d97981ee87e469cd11764ab1a99715ffb9b99dc2743f616840da44a57f0c4766ef90c71fd018ed49aee0
 MISC metadata.xml 429 BLAKE2B 9a3bc0c4945b7be24fae6e0b8bfe18b33ea06d32232200b42050c18f9bd9786c3737cedec0e850312df0599d78cd9db66a4d302395017cb9d27a1cba184c4df3 SHA512 0755fd020670ebb1fbb922a1765cb2d6a4fdb4c39886ef010aee9ff4035d7e6157721060da917567d6ccac0910d1e3872896490b35eedf7c293a16bab44e3645
diff --git a/www-apps/jekyll/jekyll-3.6.2.ebuild b/www-apps/jekyll/jekyll-3.6.2.ebuild
deleted file mode 100644
index 10f952418939..000000000000
--- a/www-apps/jekyll/jekyll-3.6.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.0
-	>=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-1.1
-"
-
-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/karma-bin/Manifest b/www-apps/karma-bin/Manifest
index 8871937a2364..80199346d65d 100644
--- a/www-apps/karma-bin/Manifest
+++ b/www-apps/karma-bin/Manifest
@@ -4,8 +4,10 @@ DIST karma-bin-0.24-amd64.tar.gz 11511588 BLAKE2B 4de38f4925e039ae28e160d2f541cb
 DIST karma-bin-0.27-amd64.tar.gz 13932963 BLAKE2B e99093ec5a7d72fbca136d63789352e001974e4bf0a90ee45d6ff8a8814df9dfdf695af4fb1b17cf1c6a29fce2be65965f048daa9070484b2fcc53dc6e33122a SHA512 844301cb8bdd08452d02ab33c39dd5d8307e538f87d18fff58bfd888ddd207bb6557d40c053613d2e3991cf915b032119ed08ebe5a32a98d12cac06a25872887
 DIST karma-bin-0.33-amd64.tar.gz 14113120 BLAKE2B a37dc699d7ff26dcbb9188afc48639309c2f44490f2f59dd41d15e6c00035b4fb9bc9bd86abd8e999862a4a71bca76beb70bbb06f97e761fdb80b046dc742ed5 SHA512 a2bec5381648a680af842d5b61c23883655b508ed9803cec2e2e65bffba136076636651dbf8eedb7e220a746629902d4b29956fbebe902a1ff14924bb9a8ba27
 DIST karma-bin-0.39-amd64.tar.gz 15071130 BLAKE2B 71edfac70d02eee3b9406fc57e335c2f9c4f68a16f32da591e70c753f1498c182f36da7c018458b54f39b00968908e56367cdf30f26815ed53e78e6710d56e76 SHA512 6ed03b3c25745fc631ca04b3659239efdce78b221eb1c9c43fb9c8f8e7d6aadc153962388b54b0209e8896f9c9cf33f1fa5a23b6ed2bfbd4c4b48c7a24ab0637
+DIST karma-bin-0.40-amd64.tar.gz 14309083 BLAKE2B bdb0dff3ed308102eff8a4d7e4363901619045c39c2e154cda629aa0bd65ff6a0afee8885d3b014e6fcd448d25df1b881de4b4281efa525a73f54fbb9c425d5b SHA512 5148164b78da3e9a79eda8f203f52fd78c233993f657887d3d64fe0eaf00c90610058b3f0e8509a5d4f9f05f77b5c39461cbfa9d4ccbc9d984ba07944955756d
 EBUILD karma-bin-0.24.ebuild 950 BLAKE2B d966dc1b996ed5e2d95b2b12007c45cf0522862a48782e05c4fe1b62407ceee9e7cf015259291e6c6999df9d59409e9bb5b880feba66e0ad70489726641de462 SHA512 d83f53417628d3274b338e3bfe36ac7d1472fef3f7cd51525dea1a5f0f64fdb825cf26f235128353c4e2ad7b63e5b8d8560e5cc78d3124eb83c4f8ec4787d3c1
 EBUILD karma-bin-0.27.ebuild 949 BLAKE2B f5d10a7fbf43d99d5a11e27e6da6c1b9a98517bb329c9c326929897c04c44f3c2d1a318990e34863ce23faac6cd84293183848835b69a69cbedeee36ee6e8331 SHA512 d1cc2163379e50331f3b6110b6187445651309ce54206efa6a6fb84ccd65f65a3bfb9103756b39059bfeb3445fe571eab901ba63fb4b8eff10b4ce2a81ff9e18
 EBUILD karma-bin-0.33.ebuild 949 BLAKE2B f5d10a7fbf43d99d5a11e27e6da6c1b9a98517bb329c9c326929897c04c44f3c2d1a318990e34863ce23faac6cd84293183848835b69a69cbedeee36ee6e8331 SHA512 d1cc2163379e50331f3b6110b6187445651309ce54206efa6a6fb84ccd65f65a3bfb9103756b39059bfeb3445fe571eab901ba63fb4b8eff10b4ce2a81ff9e18
 EBUILD karma-bin-0.39.ebuild 949 BLAKE2B f5d10a7fbf43d99d5a11e27e6da6c1b9a98517bb329c9c326929897c04c44f3c2d1a318990e34863ce23faac6cd84293183848835b69a69cbedeee36ee6e8331 SHA512 d1cc2163379e50331f3b6110b6187445651309ce54206efa6a6fb84ccd65f65a3bfb9103756b39059bfeb3445fe571eab901ba63fb4b8eff10b4ce2a81ff9e18
+EBUILD karma-bin-0.40.ebuild 966 BLAKE2B 4f0fd169372d09d4d68459f1906f316303b5bea776ee18a0d8352a41ec189793452c44f39ab172d838059e4d9eac880c802d0d7a2dcecec7514d6d228b76429f SHA512 587799ed1755a1c8ddd343a05641c231de7dbc888c0606333cb1a9df866d20384187dc61a4cdc007846942eaecb9f006ddf9e1c40093a0f863d24763e827256c
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/www-apps/karma-bin/karma-bin-0.40.ebuild b/www-apps/karma-bin/karma-bin-0.40.ebuild
new file mode 100644
index 000000000000..208ce387b321
--- /dev/null
+++ b/www-apps/karma-bin/karma-bin-0.40.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN=${PN%-bin}
+
+inherit user
+
+DESCRIPTION="Alerts dashboard for Prometheus Alertmanager"
+HOMEPAGE="https://github.com/prymitive/karma"
+SRC_URI="https://github.com/prymitive/${MY_PN}/releases/download/v${PV}/${MY_PN}-linux-amd64.tar.gz -> ${P}-amd64.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_PREBUILT="usr/bin/*"
+RESTRICT="strip"
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 -1 ${MY_PN}
+}
+
+src_install() {
+	dobin karma-linux-amd64
+	dosym karma-linux-amd64 /usr/bin/karma
+	insinto /etc/${MY_PN}
+	newins "${FILESDIR}"/${MY_PN}-0.24.yaml ${MY_PN}.yaml
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+keepdir /var/log/${MY_PN}
+fowners ${MY_PN}:${MY_PN} /var/log/${MY_PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Please edit ${EROOT}/etc/karma/karma.yaml to match your system."
+	fi
+}
diff --git a/www-apps/metadot/Manifest b/www-apps/metadot/Manifest
index 1b0a358f7218..6237180f70b0 100644
--- a/www-apps/metadot/Manifest
+++ b/www-apps/metadot/Manifest
@@ -5,6 +5,6 @@ AUX reconfig-6.1.6 337 BLAKE2B 3a371354d86f9b9f446df1db0dff91104901dc0d87421fd2e
 AUX reconfig-6.4_p3 361 BLAKE2B 438ef8199fe21d897d76bb5e29ba28204af45b7d42923aa31e469b079dc90fb47863363d7ad18656d1b13da91d5bbf34b5002f65dbab6ff24fb5bf7252033706 SHA512 c3fd94bd96de791da23799054b474b392e761c056acd664947d2e66551ddf85e14436b4390b92d3c6ebe80d2f590b84e0b74031d4cf0de943d72d214c4dc8c59
 DIST Metadot6.4.5.4.tar.gz 4055040 BLAKE2B eb5b8361e9b20951ec68c73f68fcf8126fe550f67090b0451460db6874f367ed20e1e18f5988bcd617dfae079a93f5c696298fec3eb8b59ed240a6df88f80106 SHA512 a7982e604b1f0f8db393bb16c6ecb7ca0562b8b1a620bc9db268e4be4c73de827b8a0cf0c5156822c3c63d4f8ef19a37a37d2c39037bf9d6d00df0a310e04cc1
 DIST metadot6.1.6.tar.gz 3754969 BLAKE2B 7012afd6f639568bdd96d9f6ea16f84755bbfd518aef8921fd7b28a97e3d835a84d50963c2edad049011959be0347ecee1f8d36fa11d0a5abe484eacb35f29d5 SHA512 0b7f4bd99fcc909b3f3428591193fecadfe6542b5a541c351e69323efe06e38fdb4a507d83ceec61105ddeae6b95433f67d3d12778c4acf4b9189b169f03fd7e
-EBUILD metadot-6.1.6-r1.ebuild 1274 BLAKE2B ab24ab326fcb842e65234f2fb809891a183d704c46317d2f04cf4f710bf93a5e0fda2cf3c768ae06ced1aa42991641c9e3b369d4b6cd08c2ee6abfad8d413d78 SHA512 155bae3fdddb254824df52ebfce8a0f3655ffd5775465efa5f7be9de9eae2ee4658092a46e95862dabeeb5ed4e78d59d81a03b3cdbd1a00de37a289e98fd4806
+EBUILD metadot-6.1.6-r1.ebuild 1271 BLAKE2B d63253c8a8485e649e97db0a1d6083bcace995a1b69dcf5ecf0a6ef39ff7ec695c8a92676cf28a74df46bd1a7ddf78af29fa628daad66e4fa3674fbdacc2aa3d SHA512 d60b01d1c55b5d5b9ff343566232b7a22b19f5a34abbf357875969cbcdbde58a66647283fffa14a901c8bed9c7502deeed28932c07245d828e7ee43a249942d1
 EBUILD metadot-6.4.5.4-r2.ebuild 1759 BLAKE2B 3624ff8f7af7f14c8412820c1f7afdf6ad95fa20c637abdf6e468a1ed11e0a797339b9b4c1e9db06b44855dc72352467063161c227db204cad08aaaa1b507edc SHA512 f1324b64c8ad461014c7aaf53825def44d52c2572681048dbe0aa33d0bf82ca2e0f5c686c2151001d9810f035a1e78ffdc447d199e45923c13f60c064b17b2b5
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/metadot/metadot-6.1.6-r1.ebuild b/www-apps/metadot/metadot-6.1.6-r1.ebuild
index 8346e6b77398..e94ebaaafba1 100644
--- a/www-apps/metadot/metadot-6.1.6-r1.ebuild
+++ b/www-apps/metadot/metadot-6.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -13,7 +13,7 @@ DESCRIPTION="Metadot is a CMS with file, page and link management, and collabora
 HOMEPAGE="http://www.metadot.com"
 SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
 
-KEYWORDS="~x86 ppc"
+KEYWORDS="ppc ~x86"
 
 RDEPEND="
 	>=dev-lang/perl-5.005
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 74187c5954f7..57947c3e6e81 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1,10 +1,13 @@
 AUX gunicorn_config.py 116 BLAKE2B 44fa3354dce54136bd031012bad2c6cc5ed6208bd253985a29a0e7c6f76aee4f042b8f707d9c09e1c49be8e61b27e44ff2195b8bdc54f4c51659924717f0cdd9 SHA512 43a065aa044a028334a96a0d22ffe1c35ad1f76b605215c4d5a288943cfeeb03e7e71a6d22116764c55bd95aaea103c1026d6355c9ded9577b4a7aefbc6f71c3
 AUX netbox-2.5.11-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
 AUX netbox-2.5.12-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
+AUX netbox-2.6.1-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
 AUX netbox-rqworker.initd 463 BLAKE2B 9a77e8366018cc6d6a3130580df1ce5e84db06f44857a89243f6f7f527c94477669d2da1f1b588386ca341acd2825484761635346e1cd61ff576c85b506525b7 SHA512 881ef3745aeab79f641e5648301d5584b9ebc8e75c550c01ce6f8d78731b5dde4d4f4b47e2f01d55c788f755eea7e633c82b2dd6027b9cd32385f7d66ff3e1ef
 AUX netbox.initd 432 BLAKE2B 500eeb7a042c930e38e5417eab92fb141dae14ae5dcb62257cd0a6ae6ca4fd0034fdf3dada4cc49a259edd9e565571102351eca447f568ab9becbd7e6a86099e SHA512 14e4544717f17d37209a1613a962fad9110ae0ec39512649d50776eaa2270fd8ba8a4456b11fb66941081aa96553668d7b3ebd12f631f56d234784bdd25f9de0
 DIST netbox-2.5.11.tar.gz 2364831 BLAKE2B e5117b2d4c3f33b231715a8b192e7954dc0611fcb270937c5c8abda3abc9f9925bd7db2c7306847428b5a24014d0c0b07ee404294b389a708d0dc7963c250691 SHA512 dfd19af01bf096ee7d8790981853d7e94d8926a4f0eeb00a061f805d56486670c058752b9a9fb23882b0b8d33e4a2d62f50a35b56c28eb2782be47e6f4b13b7d
 DIST netbox-2.5.12.tar.gz 2364874 BLAKE2B efe1360fd7c1105e5c6010ee22a882fb4fc796ff0f907974984dba35a0ab6da7724fd6042b102cebe3e3e291c3a1c65c347a5967edbaf443ece6fe61648a93be SHA512 e105a351f1150139c5bce36527ea650f95504ccc1c7b6a82c41396d69bc8671758cc3b33789c95c81785c5ff54d34c7310cd3e03e65bd006606e85021dcd1795
+DIST netbox-2.6.1.tar.gz 2393902 BLAKE2B 027115458cbb873cb7aa7660a6cd1df46a7768dc05c9280f94c23368336752034b8ede591ed4337f6b65ade1db7fac740533c3c2d932043172cf296ddd2e3f8a SHA512 8cfe4384ed4ad682ff5268e83d72716230683e86e858c857fd694838227a8b3eddfe02c1fc39b00cb36b33519d8cbb942dd4008544943e8b8f7f2d5904c10e5a
 EBUILD netbox-2.5.11.ebuild 4012 BLAKE2B ef05b1c95423e16c17277f77800c6f4d601f351ba9eec3bfb3ca38a4282315159b20bf928af09bbf52e59a036541d5a5f5e580023ed73b8bf8492e99ffb5c40d SHA512 f51d444450acfb09ebad9f9819a954f92629b04d7829ed3e4c1d53295754a6d048aeb3fef205ff8977fde00db0a651d8257ede3b1fb47e456a24fa42a561657b
 EBUILD netbox-2.5.12.ebuild 4012 BLAKE2B ef05b1c95423e16c17277f77800c6f4d601f351ba9eec3bfb3ca38a4282315159b20bf928af09bbf52e59a036541d5a5f5e580023ed73b8bf8492e99ffb5c40d SHA512 f51d444450acfb09ebad9f9819a954f92629b04d7829ed3e4c1d53295754a6d048aeb3fef205ff8977fde00db0a651d8257ede3b1fb47e456a24fa42a561657b
+EBUILD netbox-2.6.1.ebuild 4191 BLAKE2B 8ae51a8a4a4c12d61fe59f2b98f6a3664b1b0f488ff36ec5ad46e362e66ee19c76d0e58d1d369016622e40f312aa38300f4fd944b71343dc4598a2eb28ef4673 SHA512 720a325394ad59d4d6c1c40f401da6f4b590f69f00dd38df89685b60e914bd274b4c66816dc5b473be9931555e4152a29cff39be827e5b66f4d704b29e0799d3
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/files/netbox-2.6.1-no-pip.patch b/www-apps/netbox/files/netbox-2.6.1-no-pip.patch
new file mode 100644
index 000000000000..5d1fa595f4e6
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.6.1-no-pip.patch
@@ -0,0 +1,27 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index 24e79f5b..248e1cb5 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -8,22 +8,6 @@
+ PYTHON="python3"
+ PIP="pip3"
+ 
+-# TODO: Remove this in v2.6 as it is no longer needed under Python 3
+-# Delete stale bytecode
+-COMMAND="find . -name \"*.pyc\" -delete"
+-echo "Cleaning up stale Python bytecode ($COMMAND)..."
+-eval $COMMAND
+-
+-# Uninstall any Python packages which are no longer needed
+-COMMAND="${PIP} uninstall -r old_requirements.txt -y"
+-echo "Removing old Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+-# Install any new Python packages
+-COMMAND="${PIP} install -r requirements.txt --upgrade"
+-echo "Updating required Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/netbox-2.6.1.ebuild b/www-apps/netbox/netbox-2.6.1.ebuild
new file mode 100644
index 000000000000..0b6b0b9de554
--- /dev/null
+++ b/www-apps/netbox/netbox-2.6.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1 user readme.gentoo-r1
+
+DESCRIPTION="IP address and data center infrastructure management tool"
+HOMEPAGE="https://github.com/digitalocean/netbox"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+
+RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]
+	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
+	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
+	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
+	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
+	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
+	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
+	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
+	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-pip.patch
+	)
+
+DISABLE_AUTOFORMATTING=YES
+DOC_CONTENTS="
+netbox is installed on your system. However, there are some manual steps
+you need to complete from the installation guide [1].
+
+On Gentoo, the configuration files you need to edit are located in
+/etc/netbox, not /opt/netbox as shown in the installation guide.
+
+If this is a new installation, please follow the installation guide
+other than this difference. Also, if you need ldap or webhooks, set the
+appropriate use flags when you emerge netbox to install the
+dependencies.
+
+Once that is done, you should be able to add the netbox service to the
+default runlevel and start it.
+
+If you have webhooks turned on,  you should also add the netbox-rqworker
+service to the default runlevel and start it.
+
+If this is an upgrade, follow these instructions:
+
+Stop the netbox service. If the  netbox-rqworker service is running,
+stop it as well.
+
+Next, run the upgrade script as described in the upgrading guide[2].
+
+Next, check for new configuration options and set them as appropriate
+for your system.
+
+Next, start the netbox service.
+
+Finally, if you are using webhooks, start the netbox-rqworker service.
+
+[1] https://netbox.readthedocs.io/en/stable/installation/
+[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_install() {
+	dodir /opt
+	cp -a ../${P} "${ED}"/opt
+	dosym ${P} /opt/netbox
+dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
+	dosym ../../../../etc/netbox/configuration.py \
+	/opt/netbox/netbox/netbox/configuration.py
+	dodir /etc/netbox
+	insinto /etc/netbox
+	newins netbox/netbox/configuration.example.py configuration.py
+	doins "${FILESDIR}"/gunicorn_config.py
+	fowners -R netbox:netbox /etc/netbox /opt/${P}
+	fowners -h netbox:netbox /opt/netbox
+	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use webhooks &&
+		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
+	keepdir /var/log/netbox
+	fowners -R netbox:netbox /var/log/netbox
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	local r
+	for r in $REPLACING_VERSIONS; do
+		if [[ $r = "2.5.10" ]]; then
+			ewarn "The home directory of the netbox user is now /var/lib/netbox"
+			ewarn "Please adjust your system."
+		fi
+	done
+}
diff --git a/www-apps/pcgi/Manifest b/www-apps/pcgi/Manifest
index 45cd61ca0a9e..af3287389247 100644
--- a/www-apps/pcgi/Manifest
+++ b/www-apps/pcgi/Manifest
@@ -1,4 +1,4 @@
 DIST PCGI-HOWTO-1998-08-13.html.bz2 6483 BLAKE2B 1283503a0474ad4098a9371842b9db6db5d20cd78952d1ddf79cdd2e2f7e37fe17553bc12f635026b45ef36512fb0d2bd3dbaa2590be0796d00a0854d30b6335 SHA512 8b86e0c166055492564ee919d8f983f8f9df7927aac63f9f63068f5dd837a675c3b230801763d2623401095515fe138b5c9ab222d972bbbcedce36ad1b576d16
 DIST Zope-2.6.1-src.tgz 2318685 BLAKE2B 7be409216124479b0baa1c079bc5f41ed7c5f87318a9f814af9d63b0b87fe51756531dde8b4ba7cb4155f29aaf5c39fe82c4f1bb3a7f8586ab3f149798dae842 SHA512 b714c533f818cbc16bd6c5f899049a4f214d5aad06a98f822f886a33fd5636b416cf8e944757f4a50d39daaac482e2af24dcaf4bc0ab795b9e9d25c961525451
-EBUILD pcgi-2.0_alpha5.ebuild 1463 BLAKE2B 40fbd4bfa15df165c7db690b276f32c3d213beb54b43b0b8095a6ebc8611d1c67e8ba588524e9f0b8766b249fead97d43bb2c4f615d70065987c60dd5ea999e7 SHA512 2667090edbc678dd9eebd491e4c89602d231ba6fe953b799a10c48bb802756c7e8acd04a3a05f3d9ea119227e55e7182f45b67d1bd64d3e0fbd7452fa26585c7
+EBUILD pcgi-2.0_alpha5.ebuild 1460 BLAKE2B 2da4bf8734f5ba07c0ecca190ade239a2cf33a9078975dc2cf44b0341728c9071ad59a67acf6e1a9c64ee2b1d80ec55b12fc0407fbe1504cc6b457d86041ed5f SHA512 f0f4a3c88457e7efc6a676d9d126e2659c4f0c59651f7e26ffaf7df9dd0c40beeae42cfa525d586d2f1f6ff46e034b96c209bf013d85fafe0ca63e445043debe
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/pcgi/pcgi-2.0_alpha5.ebuild b/www-apps/pcgi/pcgi-2.0_alpha5.ebuild
index b4b6a1e0a96a..788a90272d6a 100644
--- a/www-apps/pcgi/pcgi-2.0_alpha5.ebuild
+++ b/www-apps/pcgi/pcgi-2.0_alpha5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -22,7 +22,7 @@ SRC_URI="http://www.zope.org/Products/Zope/${ZOPE_PV}/${ZOPE_P}.tgz
 		 mirror://gentoo/PCGI-HOWTO-${DOCDATE}.html.bz2"
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 DEPEND="${DEPEND}"
 RDEPEND="${RDEPEND}