Merge updates from master

23 files changed, 103 insertions, 149 deletions

diff --git a/dev-lang/php/php-5.6.40.ebuild b/dev-lang/php/php-5.6.40.ebuild
index 76d14685ed7a..5f302dfa87c9 100644
--- a/dev-lang/php/php-5.6.40.ebuild
+++ b/dev-lang/php/php-5.6.40.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-lang/php/php-7.1.26.ebuild b/dev-lang/php/php-7.1.26.ebuild
index 8160e85d1ffb..827d4783ce2c 100644
--- a/dev-lang/php/php-7.1.26.ebuild
+++ b/dev-lang/php/php-7.1.26.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.2.14.ebuild b/dev-lang/php/php-7.2.14.ebuild
index 561be6ea6cb5..108bc20fc58f 100644
--- a/dev-lang/php/php-7.2.14.ebuild
+++ b/dev-lang/php/php-7.2.14.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-libs/libdazzle/libdazzle-3.30.2.ebuild b/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
index 176f07af9599..3fd594c25113 100644
--- a/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
index 226a286a26ca..68132ba6cef5 100644
--- a/dev-libs/libunistring/libunistring-0.9.10.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
index 182999363721..00a61245cbd9 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.linux-apps.com/content/show.php?action=content&content=114
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 CDEPEND="
diff --git a/media-gfx/nomacs/nomacs-3.10.2.ebuild b/media-gfx/nomacs/nomacs-3.10.2.ebuild
index 049b159eda8b..8e7356daf996 100644
--- a/media-gfx/nomacs/nomacs-3.10.2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
index cc7a98acb8dd..adda03c843ee 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV}
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
index f4ae408d5c77..77e5d972c17e 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
@@ -7,7 +7,7 @@ MY_PN="phonon-backend-vlc"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon/phonon-4.10.2.ebuild b/media-libs/phonon/phonon-4.10.2.ebuild
index 264801e2557e..9fb77676d3b7 100644
--- a/media-libs/phonon/phonon-4.10.2.ebuild
+++ b/media-libs/phonon/phonon-4.10.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-video/guvcview/guvcview-2.0.6.ebuild b/media-video/guvcview/guvcview-2.0.6.ebuild
index 8f62edffa655..92634f1db14d 100644
--- a/media-video/guvcview/guvcview-2.0.6.ebuild
+++ b/media-video/guvcview/guvcview-2.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gsl libav pulseaudio qt5"
 
 RDEPEND="
diff --git a/sys-boot/efibootmgr/efibootmgr-16.ebuild b/sys-boot/efibootmgr/efibootmgr-16.ebuild
index 83a3903ac373..70350fc76a42 100644
--- a/sys-boot/efibootmgr/efibootmgr-16.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
 IUSE=""
 
 RDEPEND="sys-apps/pciutils
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
new file mode 100644
index 000000000000..5ecce56fc15b
--- /dev/null
+++ b/sys-cluster/kubeadm/Manifest
@@ -0,0 +1 @@
+DIST kubernetes-1.13.2.tar.gz 28771642 BLAKE2B 4a5c5a8e0c05faab3fb6a26854e7c8643b893c2a1f5d5b56aacea869d86426dffe358222034b826d66dfd19855bee71cad7356ff483c27218019e4adda499ce7 SHA512 2f24119fc21d7bdbb60174b46da94ce3f2f6a3c638e9d96323c93c20039aeb06f9c9a3a48c43bb36b71eff25cf72967e780e3339b35ad7ad7a7a7c35662c96bd
diff --git a/sys-cluster/kubeadm/kubeadm-1.13.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.13.2.ebuild
new file mode 100644
index 000000000000..6c4b699b7594
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.13.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.11
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+	pushd src/${EGO_PN} || die
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	popd || die
+}
diff --git a/sys-cluster/kubeadm/metadata.xml b/sys-cluster/kubeadm/metadata.xml
new file mode 100644
index 000000000000..c1a4c8210661
--- /dev/null
+++ b/sys-cluster/kubeadm/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dan@danmolik.com</email>
+		<name>Dan Molik</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		kubeadm performs the actions necessary to get a minimum viable cluster up
+		and running. By design, it cares only about bootstrapping, not about
+		provisioning machines. Likewise, installing various nice-to-have addons,
+		like the Kubernetes Dashboard, monitoring solutions, and cloud-specific
+		addons, is not in scope.
+
+		Instead, we expect higher-level and more tailored tooling to be built on
+		top of kubeadm, and ideally, using kubeadm as the basis of all deployments
+		will make it easier to create conformant clusters.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">kubernetes/kubernetes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-libs/efivar/efivar-37.ebuild b/sys-libs/efivar/efivar-37.ebuild
index ca9c71b8bfe7..237f2835e604 100644
--- a/sys-libs/efivar/efivar-37.ebuild
+++ b/sys-libs/efivar/efivar-37.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 0f54d9540828..bce00339cf27 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,5 +1,4 @@
-DIST moodle-3.1.15.tgz 38055035 BLAKE2B d55f523fce2f7193330665132b4d7faf6a7a698ca8f297d7e2dbc03e859ed43aef34292666e931e6c86aee2f414097accfd8ece7f5ecf53a8439697fdb28ba31 SHA512 17100ad6caa3a7ca5dc8f09b12215700061ead3a30701985e89d39e1e063d6142391c01c2dc0d1c7f4b86bd80b8d1ccc1d0477389691d6545b3be590b0508912
-DIST moodle-3.3.9.tgz 45123816 BLAKE2B 0e23668fb6ac536a1a87067fc9574424c33934402184ffc6f25f48f7e87c70fb0d9b25bb12b46320d54968ddb8b337471be7b5795369585ce4c488f93168f6d9 SHA512 6150a4c0f4a85ac508d2da9b35fd506eca614c3a44d582096fdecd113899a72481507ce85101505570e0e8237f7af744e3d7a8cf990cf8b250f5ac335ebae1de
-DIST moodle-3.4.6.tgz 45961570 BLAKE2B 49a20412b386cc3f463dd3be58dc56f50821298d36109889b3eb092d39f4dfe477dfbbf1ea3f1b6ce8076b4d4dca21efc00e7d772b0ced395139d76e56759482 SHA512 2afa7facb2068c63d0a1bd42da40a1cb688a1bcdedc5287e59633bb085f96c65598396f03b99b35c9aa3769463dea316584ce3793978101989fc53f53140ff04
-DIST moodle-3.5.3.tgz 46645219 BLAKE2B bd1aa2ae73f807c3b8a0e341893c7b004761e147fe42eac615153ae1ee7fa4bf9268e160a14ab1ac62dfe2c5e462d042cb30b725d6a28844e4749492b6a9b193 SHA512 130d1c30acb78452021f4fd5c0d29bfc4c938993e7d0cf3b2fdf13061fa993f9cebc7214f287e62ceb13bfd5999c12132a45fd4aec5efe8c25078dfe97bee861
-DIST moodle-3.6.1.tgz 47660920 BLAKE2B 3dba1adb2a2c9926a0efb1942df4239a020c2c2d661a6a2a6825acc70b6e7aab69afb4f0f297cd316fd5f693ab711cccea8bc5c68fa1b72288297b8d00791088 SHA512 79cf5127748e6511101b9f802165eefbe6dafbe89806e8616902765d14481af0b6ba06757be5fecd343bda7dde261c58018f940254549decc66452415a99ab9d
+DIST moodle-3.1.16.tgz 38057145 BLAKE2B 09995a5ff87069e47b891e0e19a038d10af820d37b756803ceb2dcebad9a04a827a5b2548a3dd205d07eb4d9e116a15a12fa3d6832e524dde76450b5170e979a SHA512 46ed0cd702e86529dda32b128604acc7c6bc13530bb3acab402d5c36f59a55dd35e0ffaa827aef85f7e75b0b9939514f868c0dc8ddc1b5f8aa49637acdf89c5c
+DIST moodle-3.4.7.tgz 46051440 BLAKE2B 2b6a2eb7c071da56236a0a8d08b944fa9f5028bf9f22de259302885804cbb7e3e5bc5f1e18524a183fea362c8809ee38590dfcd836bef9de976fd7ab89b2fbdd SHA512 6819a20cd477b37744786793b74dcf258098640e453345cc940fae02789cca31b43730dc421715be411ce77ef23fa876189a2c481efb5e643282355b4fdf043b
+DIST moodle-3.5.4.tgz 46648296 BLAKE2B 2ed589f46061beb81e558b96461729aafe0624237c99b2e306c57da04ca6bff709d8377012bcfbb73a9a03dabf12dfa5d2a21e47139702b067f3fde0b99794f8 SHA512 03d0821f0863ed360129f00dda834618ae6b5dbb5794ee1a993eaaecbbac4dae8e6085f83cd86674bd93104a17229cb662db57a5500c3eff09f1480fbef9772d
+DIST moodle-3.6.2.tgz 47673889 BLAKE2B f81844f933ec3bc2ebd92957d16a9e59c43678b9ee548767bfacc443a68f574792c641787722cad8fe3007fd0c8d279ac097c361843089441bbe21b4af5b7492 SHA512 30e48e6fff788294db83d7889e32caf12fa07459dbd61a5cb0495f3c5b6bc005e41faee447a0cd6441e5120dbd04ee02056425c67a118755d45bc29e32867d74
diff --git a/www-apps/moodle/moodle-3.1.15.ebuild b/www-apps/moodle/moodle-3.1.16.ebuild
index 13576b6f03f7..b96de5d5680f 100644
--- a/www-apps/moodle/moodle-3.1.15.ebuild
+++ b/www-apps/moodle/moodle-3.1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/www-apps/moodle/moodle-3.3.9.ebuild b/www-apps/moodle/moodle-3.3.9.ebuild
deleted file mode 100644
index e7b7c22a19e2..000000000000
--- a/www-apps/moodle/moodle-3.3.9.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-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-2"
-KEYWORDS="~alpha ~amd64 ~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"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# 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-5.6.5[${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
-
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#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/moodle/moodle-3.6.1.ebuild b/www-apps/moodle/moodle-3.4.7.ebuild
index dea9710e1e62..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.6.1.ebuild
+++ b/www-apps/moodle/moodle-3.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-apps/moodle/moodle-3.4.6.ebuild b/www-apps/moodle/moodle-3.5.4.ebuild
index dea9710e1e62..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.4.6.ebuild
+++ b/www-apps/moodle/moodle-3.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-apps/moodle/moodle-3.5.3.ebuild b/www-apps/moodle/moodle-3.6.2.ebuild
index dea9710e1e62..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.5.3.ebuild
+++ b/www-apps/moodle/moodle-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-client/epiphany/epiphany-3.30.2.ebuild b/www-client/epiphany/epiphany-3.30.2.ebuild
index 07d03ef129ac..d189facc12e7 100644
--- a/www-client/epiphany/epiphany-3.30.2.ebuild
+++ b/www-client/epiphany/epiphany-3.30.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.52.0:2