gentoo resync : 21.07.2018

21 files changed, 229 insertions, 236 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index aee9ee683798..cec4747c6d61 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 7ed740ebd3ca..9e83a6408d91 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,11 +1,8 @@
 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
 AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25
-AUX gitea.initd 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2ed8b624ed2776c7522455a469c00172ecbbe2151ccab476baa0c779baf8a39f63348bdc7ebbd29c2 SHA512 4a6bba463c9abafcb6fc9f3854efd1a69fb3b213c2b34ff6a233f90db535c2ab0f375a0809e4c4be6651ed60d7696a54148a5ee9192567d70ca6a5203a8d3266
 AUX gitea.initd-r1 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2ed8b624ed2776c7522455a469c00172ecbbe2151ccab476baa0c779baf8a39f63348bdc7ebbd29c2 SHA512 4a6bba463c9abafcb6fc9f3854efd1a69fb3b213c2b34ff6a233f90db535c2ab0f375a0809e4c4be6651ed60d7696a54148a5ee9192567d70ca6a5203a8d3266
 AUX gitea.logrotated 87 BLAKE2B 373830ddd6eed0ce2f0f7b1dab14e4a253e5a56a73f477cfadbc6deec373846d4df2d697735391581771699d5a6513acb0e14a446873de01eba10d19e3a6bd88 SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4
 AUX gitea.service 472 BLAKE2B 4c728e2987d0c0a86e65d4b9c1a59f6193ff8a3f9b066991a06f495ad1c5586b3497c71fca1cce5b65f167af09343e7bf3215ee5e8fdefa539e384198d2d88d6 SHA512 6666fe3b4cdbb78a58db4a6bf47a15e6be9ab30b666c6eb77a9e8a002d8c0abd510fc75ef463a11ee6892ab12c98943774616072cb64fd9f2fa42ff8f676aa95
-DIST gitea-1.3.1.tar.gz 14783710 BLAKE2B 20e333719aa1a670488046406dc942fd843fcb2ea92473006e255a6a8f2f00709bf87443a425302d0c73916260a5d2e7876e00233a3e1ceb657439ac3d7a4873 SHA512 45161e089d5437b5aacc9589a50a61da3a8f4c88edb33fe3605eb49f36f67cb0a8a80f261016745a6c5131755f7963b1b61df62e47aab2bcd43a6932dceadd0f
 DIST gitea-1.4.1.tar.gz 14978598 BLAKE2B 8fde79291b745750e79c944e7fcf938d2476ddaa386c1277f54bf315831eeb749507e270ca0a8a8351dd8fa60656bb98eb7c478a5c99f2ac20d350b6054339d5 SHA512 3b812bd61215230035ec9241e953f239981d04580d931f379aa550e11d2f7facd56bf70ac9e2d866224d341570a238bcc5c2fa71fd1432cfb95b8c8b703784e6
-EBUILD gitea-1.3.1.ebuild 2450 BLAKE2B 8137193f6d6c6495d0829a82841a82c0d079cab03e440176932db89f720938888e2294c8cedc3562e7bfd41ae67aa8f24e1dffe07cec2b203d58b5daf466f64b SHA512 edc7382e856957dcd2e4c5c9a86c0b3fa01f576f1c014b31900496f852aa942281b293ad27595f440434fb6b46470197c97d63c78defd7daf51d77f937c5505a
 EBUILD gitea-1.4.1.ebuild 1892 BLAKE2B 09a05d287962d04ac368be5a9a20f65d1310231a55e90e10fb3dc9d2da79aaf94a16bf24a1f4d6be7cc27be4130a7e2edcf91fc05cad6c20077a98c09123e3b7 SHA512 aa22f9c026cb5741679c1fa8783ac9aceb1ff413d96e4a422e7f21ae5fd4ab12872b330fd58b790a9cfcf121a519a73a44016270a6919b1cd076a6ca70693998
 MISC metadata.xml 324 BLAKE2B 66e4bf11fea6a0b4a0ca353849e1a4aaf32c0a1680c36f1e74fe155705806a822c277487f551e82ad0a3740b4faf9f1f8b2b2ce24781774da6c9f21a3f094f57 SHA512 7b0e56ffe4652157a5126ae7cb7cc6b557ec8367dac02c28f69243181147855dc0e96fe09dd7ff507052a7f5382445deb98090175e06d030fe635990812820ee
diff --git a/www-apps/gitea/files/gitea.initd b/www-apps/gitea/files/gitea.initd
deleted file mode 100644
index 837164aa0140..000000000000
--- a/www-apps/gitea/files/gitea.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Gitea, a self-hosted Git service"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-git}
-group=${group:-git}
-
-command="/usr/bin/gitea web"
-command_args="${command_args:--config /var/lib/gitea/conf/app.ini}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	-e GITEA_WORK_DIR=/var/lib/gitea
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
-
-depend() {
-	need net
-	after net
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
-}
diff --git a/www-apps/gitea/gitea-1.3.1.ebuild b/www-apps/gitea/gitea-1.3.1.ebuild
deleted file mode 100644
index 5f27f86c5d6c..000000000000
--- a/www-apps/gitea/gitea-1.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="code.gitea.io/gitea"
-GIT_COMMIT="81fd8c8"
-ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="A painless self-hosted Git service, written in Go"
-HOMEPAGE="https://github.com/go-gitea/gitea"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-RDEPEND="dev-vcs/git"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
-src_prepare() {
-	default
-	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
-	sed -i -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
-		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die
-	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
-		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
-		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
-		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
-		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
-		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"\
-		-e "s#^ISSUE_INDEXER_PATH =#ISSUE_INDEXER_PATH = ${GITEA_PREFIX}/indexers/issues.bleve#"\
-		src/${EGO_PN}/conf/app.ini || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate
-	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin gitea
-	insinto /var/lib/gitea/conf
-	newins conf/app.ini app.ini.example
-	popd || die
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/gitea.logrotated gitea
-	newinitd "${FILESDIR}"/gitea.initd gitea
-	newconfd "${FILESDIR}"/gitea.confd gitea
-	keepdir /var/log/gitea /var/lib/gitea/data
-	fowners -R git:git /var/log/gitea /var/lib/gitea/
-}
-
-pkg_postinst() {
-	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
-		elog "No app.ini found, copying the example over"
-		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
-	else
-		elog "app.ini found, please check example file for possible changes"
-	fi
-}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 531d6ccbaeef..c7b784a3123e 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,4 +1,6 @@
 DIST icingaweb2-2.5.3.tar.gz 8124667 BLAKE2B 43f9e47d670aaeffb15a8dbca6794d72436b195d4a19491d31f548a57ef9d2d0c411f16276be5355700e8dc863b8ef84821c68759d65ef2e97688a88d92605ca SHA512 d11d4f90f0cb54ab6fc5412151d412fc7827c895e81f6c91806090c364b3df4f2999bbc5f65cd4007406a3e7a7c9e0d48fb8f8362f3d7780681ac8702cfcb572
+DIST icingaweb2-2.6.0.tar.gz 8165659 BLAKE2B 9e66a583cdec58b8eb2be7c86363d0154786eb7289ffbbc2b8c2978907537f56ef345313b9b916b3029793812431842ce88c525b29ed226f43bdeefc4af59c97 SHA512 a4788a40e87fa5a388acd6d87890cd5066c1622ba13ddb161beacf16d0765fd224c551c37ed83ef0a6059dd277a63c5c62427a411ccaae9b9deb7c7c88db8cb9
 EBUILD icingaweb2-2.5.3.ebuild 2549 BLAKE2B 3578e930824e6dee430d33190fb62f7074c6e8ed8d839f88abe840502d767441f8d156e869ff0a1c14ae3bd4af7fad423f43150ae18e439886df46e1e75510b4 SHA512 46ffbd0eccd4e880bc74398dc63c9f5d5c4a7423602cc81be889beac106e5090166aa838a3d0ea62a883cac4bdfef89bbfd888eb64a0f62b6dc84c317d204948
-EBUILD icingaweb2-9999.ebuild 2546 BLAKE2B a5a883a093e6a88e99d357b65a5d7367719d40fa98d7d8ab530147631448f033ec0858481575bb5a981f0126bf650d7862ea5c283ff9add93325ec640b28034c SHA512 fa08a2c6d47a9b1df8027dba57b7b8be8bad1980af3c45af52203435dc98ce28b47ec211691e241bda8913dcd77370004ef1b24622fabae8cc3d510f3f9decbc
+EBUILD icingaweb2-2.6.0.ebuild 2755 BLAKE2B 2729da1f968d3badd1665c3382d11803930a89ea0db15284e341971dbeee7efdc0e25350a2c32cefaa7b5ae66938c1ecf4ed8cab37b8199732a77662fba7d427 SHA512 d4570e7c8b3fa7b859778d9bb0fa96ae9bd75e29106f153a61bbb3c9b9c6b4ca39331906c3731d8dcb62f5dd7ded7a699f1b6db935d7de97f7ab9717d24af812
+EBUILD icingaweb2-9999.ebuild 2750 BLAKE2B 4f45b14184dc5091e5c139a66404b8f57df53f66502a2dc716de7c41849895b5720020f3d8fe0994766a14ba004707f71c28b07058074edab47aa8b864013fa1 SHA512 a3e5cb7daf5d8926c91805c355aaf83c7ed15f802b3ac4e313624f05afe04c5c80167d55fd65d9c2e9d35a4139995caad4de31aab87d40ba150260c63802a47a
 MISC metadata.xml 407 BLAKE2B 42e1ae67b6d8307c3af6ee7257eb811d893705aedd5852c4b33b103d77bbb4858d01bf8369511d7ce1cc187158482755894583d3b77be0ca7580043279f96461 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.0.ebuild
new file mode 100644
index 000000000000..d4db7e02c018
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.6.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib user
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 ldap mysql nginx pdf postgres"
+REQUIRED_USE="^^ ( apache2 nginx )"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2? (
+			>=www-servers/apache-2.4.0
+			|| (
+				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)
+		nginx? (
+			>=www-servers/nginx-1.7.0:*
+			|| (
+				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			)
+		)"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	enewgroup icingaweb2
+	enewgroup icingacmd
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 77eb59b174d2..97c2252b8ded 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -25,6 +25,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			)
 		)
 		nginx? (
@@ -33,6 +34,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+				dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 			)
 		)"
 RDEPEND="${DEPEND}"
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 962a911d6cc1..8081af329f32 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,12 +1,6 @@
 AUX nextcloud-12.0.4-destroy_modal_when_closed.patch 786 BLAKE2B 24222dde0d9ed5f3c5fa31b7cd1b837f765837543475db235056dccff9fa17cce83a37b0ed64a1999a6b61dedd5857866debb1950686acf062e42d80bccb3813 SHA512 93297f991312c5fd2504267bb16a8c38797970fdf8d109d4c4b4416a5e72c8677141ebc9a13a2dadc40845348e07f264937dd852384f88d65be4f3cc4f0cb462
-DIST nextcloud-12.0.6.tar.bz2 44300816 BLAKE2B 9ce2426653cb57e7b933f918e531d02f2da9bb0da2e0fc7d6abd7f6c895f29d582b89202f6476a3592b76c46d0c70fe31d914377449ce5bb8d4c4fd4c54b3e7b SHA512 28058d1c66f1d6c6188b303f8035763582229a82facd6732ac60e7a40dbd0a1b66ca1235d2854a254e0ae5af7923c0df75db9f9e95b3b24ed61a09789ae00c18
-DIST nextcloud-12.0.7.tar.bz2 44916150 BLAKE2B cf6223ea700283580465cba95d93754c3223c939f7925298e264d1ea2eb64295e82d20528c023ac040b47563858a402bb679b9608c7ba4cce5f236d8ea21ca3e SHA512 e141faa37acfea884bb6d5ea5ab6fc3ce31496d4897092c91cb2e5d8cb4ab8f8356ebe5c17d0ba867eb99b26594d5f93756d2a9e3a32de92dc04a3d06a8fb791
-DIST nextcloud-13.0.1.tar.bz2 44183890 BLAKE2B f97eed503f7dd6cf641d2a2d5dadb200031c510f3e86f1b9ec8ad47e8f1b5d314b02ea8714232f89eb7a8617450f10a6970d97fbca8ae2d0b8641b28baf33a2c SHA512 dac798a36d18b94a2d5287e2cb0eb06352635099e0c808b1cdb0ecb76f3d1e771a85cafb35597b23fcb77b9e36a57a25a361413f798b3dbd13d0a0255ec5cbe1
-DIST nextcloud-13.0.2.tar.bz2 44842305 BLAKE2B 23b3d751584a846ba7585af4de7fa9736dd6b316d6102790b799649ec53603509727a626d69344a24925afd965cf8c85dbb9f31a1dfc97620b137cbe39e095c1 SHA512 b787ed03937588dd84d41b85ea1ef2868173c7353d0b9c6d81f4df97780278a7a78254c9a3cc39a0e69cc1c4472120130c1064cf1f343d9cc06519cae1bf0dc7
+DIST nextcloud-12.0.9.tar.bz2 45011526 BLAKE2B 353063bc1968c67f110ea60e509ebe193898d67dc8c9ac882cb56e44c36ce65bac387f45aaa4c8022bc529b2fd936f346f20fa170131c6c2c4930b5d1e0ef36d SHA512 95bb246a826c1399362738455ea8b2e906a77a3dcef8ef8102bc6e97f5a0114a3b11005ba3051661851d50c5d03aa0b9274fea03cd46d91fb9ffcb9f4560fdf3
 DIST nextcloud-13.0.4.tar.bz2 45150220 BLAKE2B e37c7612ecd9328593c2ed60a976acabd86574e909d5b6ffb3c21f38b511b099eee4549fa98c109f3a0fe5635e6ee2a166471530d4114862ba34c61d93c8eab0 SHA512 13ab8c722c3aab8deb98ec9812cf8e8f77769fe51efafa5a673b71158f66655d27340661966fa28cb307e64e034a7bdc0b9f240491b79f23014ac87f004547ba
-EBUILD nextcloud-12.0.6.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
-EBUILD nextcloud-12.0.7.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
-EBUILD nextcloud-13.0.1.ebuild 954 BLAKE2B b4a52fde03a19859bdba2400ef05a0d586be3a43abfc0079837d08fd0f246b6879ecd1afd7e1d127b212b1b5581f63441a74f2b028c2614225139cfd826c8330 SHA512 34bfd8c7c7071710468e9c59e9f8577359cdbd6a7abfb850f9d3756fd3b787335354a0b087131a314dc7eb8a9a457869fa275aa33a842a2da17313341df05189
-EBUILD nextcloud-13.0.2.ebuild 954 BLAKE2B b4a52fde03a19859bdba2400ef05a0d586be3a43abfc0079837d08fd0f246b6879ecd1afd7e1d127b212b1b5581f63441a74f2b028c2614225139cfd826c8330 SHA512 34bfd8c7c7071710468e9c59e9f8577359cdbd6a7abfb850f9d3756fd3b787335354a0b087131a314dc7eb8a9a457869fa275aa33a842a2da17313341df05189
+EBUILD nextcloud-12.0.9.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
 EBUILD nextcloud-13.0.4.ebuild 954 BLAKE2B b4a52fde03a19859bdba2400ef05a0d586be3a43abfc0079837d08fd0f246b6879ecd1afd7e1d127b212b1b5581f63441a74f2b028c2614225139cfd826c8330 SHA512 34bfd8c7c7071710468e9c59e9f8577359cdbd6a7abfb850f9d3756fd3b787335354a0b087131a314dc7eb8a9a457869fa275aa33a842a2da17313341df05189
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-12.0.7.ebuild b/www-apps/nextcloud/nextcloud-12.0.7.ebuild
deleted file mode 100644
index b5b260e20578..000000000000
--- a/www-apps/nextcloud/nextcloud-12.0.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-7.2[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	<virtual/httpd-php-7.2"
-
-PATCHES=( "${FILESDIR}"/${PN}-12.0.4-destroy_modal_when_closed.patch )
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-12.0.6.ebuild b/www-apps/nextcloud/nextcloud-12.0.9.ebuild
index b5b260e20578..b5b260e20578 100644
--- a/www-apps/nextcloud/nextcloud-12.0.6.ebuild
+++ b/www-apps/nextcloud/nextcloud-12.0.9.ebuild
diff --git a/www-apps/nextcloud/nextcloud-13.0.1.ebuild b/www-apps/nextcloud/nextcloud-13.0.1.ebuild
deleted file mode 100644
index f7e6255e6454..000000000000
--- a/www-apps/nextcloud/nextcloud-13.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-13.0.2.ebuild b/www-apps/nextcloud/nextcloud-13.0.2.ebuild
deleted file mode 100644
index f7e6255e6454..000000000000
--- a/www-apps/nextcloud/nextcloud-13.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index f2be2acdf8d0..ea5541166296 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -1,7 +1,9 @@
 AUX noVNC.confd 104 BLAKE2B da90c8f2ae649e65bbbcd8c894581d0dd187bfbb8bbb20393eb67ee1bef12c98890bce9ff3cf0731bed21bb844cc4f02ae363b75173d16d13e891d5512d45ac3 SHA512 9e784f668965b55b562b020fb32d4674267583647b950dd19aa297856b5a4509f2a7b9891e9575bc823a379aa237d4499dfeb1a2b2f537052e5ae471828e888f
 AUX noVNC.initd 697 BLAKE2B 18032906a808e14944dfae2eddc6bbdb22dbbf620ec307a892e077e818a2e4e4c056c05c7cf8bae6d8ce0818dc8c48a6ccc4c42972a5b47862b96933d8536c7a SHA512 8b131686c5add6e7ea859ba433a325ff7f0b9a5c9a11199f0d4025229e56e2c5e725ebfa2cde146f5df4b8bd4b71cdde1f08e87d0217d61bb18b683221b4595a
 DIST novnc-0.6.2.tar.gz 600675 BLAKE2B f9779a9f03ba653f77090639112cd0c967ff5925d2f9897da6508fd077fb79a2f543467e32210572935a642e06fbbcac4a44c34b4342474f54ef7ec7a9bdbf4f SHA512 245d205f8935c82722a55d6cfcd2cea1825176c0cd695fd0eec34aa19cdc3b766fed62e741ff41b0a8c4a3b3cbabc5a39dfa6ad8ffa6169f5b88420a4a845a7c
+DIST novnc-1.0.0.tar.gz 1551574 BLAKE2B 58bd63eb0480b3f20ed16907725e0abcf8c699671614dc195f46a363d6ab9cdb5b0b033ba0ba16bbe39b16437fb94f64a741acd69d1c3c3957a0e60353d78a89 SHA512 97a86be5f10f382e2ed641360f5f6c3b22998f68f980c78138aca900ef6a011c1f6aa9cbdd8cd07afd4884e8c65af30d65487e87bb34e524c10f16cf4cd116a3
 EBUILD novnc-0.6.2-r1.ebuild 1021 BLAKE2B 6c1136a747c928c2bf9d20e565369f44291d0893325a3ba316b922266d9f17615e50446702d08830c49951e48514713a49732d4ee51054c665b73f8141e1e209 SHA512 8fab040422d6423e8481ceb98a9460c1fd90cf9fdaba3004a9f61886e213a19153b43aa2ef2b58799d1713e8f39b7efb3fb8fc551d8dd878b3557f1d736d4db4
 EBUILD novnc-0.6.2.ebuild 1311 BLAKE2B 724c7c30b038d2d0950f8e0ad0ccdc84f3b86b1bf94f08b74ae77135c945eea3e9b93617d1a39113aa0baae9e4fa1d604cf7a925c4a921635760e4961131a134 SHA512 88ca686dc5be5acabae7adfeb918bbaa7b9f3a05c3092e05632f8009576baaa41af90ceb3f4e1022a2c85a12b19fb8d317f4853f59364035d7c5139f12cfb0c3
-EBUILD novnc-9999.ebuild 1020 BLAKE2B f6672bb565b8206e63e98d56743d116a4f921e3f487cd2248182c31d5fba7af3f543a2829ac511284156ff7928bea9b998842de16bf80bc9f01f0c06cafbf1f8 SHA512 918e660fcf4cb486b93b1de87fcc9315fb4de0d5e7cd0f7cd2cceebe4718d045bcf1b32cbe47bc94d610c135e887b9ff7666d33bbf19adb7a434ae650e6514e0
+EBUILD novnc-1.0.0.ebuild 1066 BLAKE2B 058cd4cb72c878f8422ae918dbcf6a9257d7295ebcf4bbe712d8bb36e9c9aa3dfb58bc8c4b6e0bfc612f3a29eb997684f8ca628a1ca633bf5e3c8c11e02400f4 SHA512 2f54fc45955529aae365f0dcb50601284947b938d17807fe41ba7675d322ae902e192be767dd397c3ae317277fc8c586d8a7b461414c9d9d4f6bae4fd5c96cad
+EBUILD novnc-9999.ebuild 1066 BLAKE2B 058cd4cb72c878f8422ae918dbcf6a9257d7295ebcf4bbe712d8bb36e9c9aa3dfb58bc8c4b6e0bfc612f3a29eb997684f8ca628a1ca633bf5e3c8c11e02400f4 SHA512 2f54fc45955529aae365f0dcb50601284947b938d17807fe41ba7675d322ae902e192be767dd397c3ae317277fc8c586d8a7b461414c9d9d4f6bae4fd5c96cad
 MISC metadata.xml 341 BLAKE2B 11a60501b1f7725f315055b98ecda3928e1755ad88983b8c7c4900ba053325ecb030b68e70e453c2860e67ec13337918da68422cb5c5cd432fda06b2a8027c70 SHA512 a41f01affc9fcb0cf61dba100f01ffe730a1278218c120f6a7d2c699a13d24868b6f7936c8ed5a28625e7c68a646e99556e745cead53c676037a5acbc92ffba8
diff --git a/www-apps/novnc/novnc-1.0.0.ebuild b/www-apps/novnc/novnc-1.0.0.ebuild
new file mode 100644
index 000000000000..8ef65ad0e359
--- /dev/null
+++ b/www-apps/novnc/novnc-1.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
+HOMEPAGE="https://kanaka.github.com/noVNC/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kanaka/noVNC.git"
+else
+	SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/noVNC-${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/websockify[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+
+python_compile() {
+	echo
+}
+
+src_install() {
+	exeinto /usr/share/novnc/utils
+	for f in utils/*; do
+		[[ ! f = utils/README.md ]] && doexe $f
+	done
+
+	dodoc README.md LICENSE.txt
+
+	insinto /usr/share/novnc
+	doins -r vnc.html vnc_lite.html app/ core/ vendor/
+	dosym /usr/share/novnc/vnc_lite.html /usr/share/novnc/vnc_auto.html  # for compat
+}
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
index fb8b22ba491e..8ef65ad0e359 100644
--- a/www-apps/novnc/novnc-9999.ebuild
+++ b/www-apps/novnc/novnc-9999.ebuild
@@ -42,6 +42,6 @@ src_install() {
 	dodoc README.md LICENSE.txt
 
 	insinto /usr/share/novnc
-	doins -r *.html include/ images/
-	dosym images/favicon.ico /usr/share/novnc/favicon.ico
+	doins -r vnc.html vnc_lite.html app/ core/ vendor/
+	dosym /usr/share/novnc/vnc_lite.html /usr/share/novnc/vnc_auto.html  # for compat
 }
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index fe95de294d5f..24c347fd8452 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1,3 +1,3 @@
-DIST piwigo-2.9.3.zip 7818425 BLAKE2B 383c57049c7f89a6cd7ff58a6887b7cab58238909a811710085930c48f128b51754a87272ba2079626ea18c730cb7eb849b4e93942d06df400a6de46eea9035d SHA512 e6cf77e22aa01c6daad468d22838dda24f57352da04afefddd43a7c2df80c1c95a63b8d1d5eaf6c2711d6706df1a7752076d5b3a4ba82171a640a879e6283498
-EBUILD piwigo-2.9.3.ebuild 1124 BLAKE2B a76eab874b4da2523c2fa640c1328cb62face4558ff3b56963be5ecc1e0474b83d7c29f30b8ef20c1d6a4c0442351a4f3385a01d730870f971c3e6b8dd8e9df5 SHA512 d563490c915c81bb820bf91bfc328f98becdd839279e9b780a29555ebb5a27858abb08f2c635ab42e216c666871c8c8e8e04cb116ae30055d67777bad46f3193
+DIST piwigo-2.9.4.zip 7846445 BLAKE2B 8c8eb7ab0e153ad9665ab3b18b70f5090b2d6545b312b19fcbca6f80b3e017b16bf94271ae071e02c2b8978802adb4e69a287a4e6dedaa728a41d6479765fc57 SHA512 b558700f041402f1fa399d1599ceaca4bb381ba818f189b5dca68a5b09d65416b5cbf2c4f48c8390381cffe98c840d4279c0b57c698ca5a81c0304ecc4a9a80c
+EBUILD piwigo-2.9.4.ebuild 1124 BLAKE2B a76eab874b4da2523c2fa640c1328cb62face4558ff3b56963be5ecc1e0474b83d7c29f30b8ef20c1d6a4c0442351a4f3385a01d730870f971c3e6b8dd8e9df5 SHA512 d563490c915c81bb820bf91bfc328f98becdd839279e9b780a29555ebb5a27858abb08f2c635ab42e216c666871c8c8e8e04cb116ae30055d67777bad46f3193
 MISC metadata.xml 1022 BLAKE2B 88bca793744995b53bf2c0a5061d47798d4f2b42a8025f7bc2f1cf7dc11234d5a8c5df9ed08b9d63b99465e06015bd5dcefaa87d1daf39f8b795ab89e264a563 SHA512 8d011157201c6e25b0252239cf6bc87f596a414a37fbf990c44dfc419b5bb28b4796b4a0c9e00d78154bdbb5dd7e6f0e99b99df56fa4736a7cc55a6ccecdbf09
diff --git a/www-apps/piwigo/piwigo-2.9.3.ebuild b/www-apps/piwigo/piwigo-2.9.4.ebuild
index f9d1dfb8d274..f9d1dfb8d274 100644
--- a/www-apps/piwigo/piwigo-2.9.3.ebuild
+++ b/www-apps/piwigo/piwigo-2.9.4.ebuild
diff --git a/www-apps/prewikka/Manifest b/www-apps/prewikka/Manifest
index 1f44a9a90a6a..8e94dc254270 100644
--- a/www-apps/prewikka/Manifest
+++ b/www-apps/prewikka/Manifest
@@ -1,5 +1,9 @@
+AUX prewikka-4.1.5-fix_rule_error.patch 1207 BLAKE2B 0c2b4400c1f463c0acd1ee19ad797abac57e0de5af86e1f7fded068f6aa62f9954fea08849a06d5fc42b41b6406a1b28007178ccb24e81fa73c66b445d8436aa SHA512 97d0c518fb4a941e0611d00d1ed4050c65f878998656731be449339f4796e29530381e55a712838b58e56271ff33cbadfc90b511022a4c10b32e19bc770b6b6e
+AUX prewikka-4.1.5-fix_siteconfig.patch 618 BLAKE2B 44c24ebff3d06d50ef17d9b429918223dcdcf9bb3fed0f0f86d083e3619c3c4922ff322c2024584a0217aaad0214aa0a24f5695b1bfe0173846d27975d0b38ed SHA512 70412631cccd13495fd611f0623ab284e99151cfd8502924cb3c7f556e4216d1b8829bce52a504b08f0a398e59882369caa4628149853cbf1067f57c6752b233
 DIST prewikka-3.1.0.tar.gz 1349193 BLAKE2B b87021ecec490b44f080dfd7a29b301ec55c1e6316fbaa385edfd9a9c586c8eb964bd8aa637041eda3fff3b7d3463845de207bc9e6cb6a209d3c15c8c661daaa SHA512 7321e7383d6205f18dffd00a23d07e9154dd79e35eb58d04a6af77bc9f70e476b67a953eb5d09685b4a7c386ecdb9111d40c77bf3b570ffc27a1c90b612a4803
 DIST prewikka-4.0.0.tar.gz 1365985 BLAKE2B 2248c80bebccf4a5f4b99f46d3af6f2aff433c19105e02dfa6c8570a6e41436a9f74971774f3963cbec9abcf70a2bf52b04cd99d930f3e193033aeb1246d1a18 SHA512 01e69b89543cac6b7a694a48cb184759641d37a5987530ce5b738a287a9cd72cc37f6bb85a621d6eb973e957730a6cb438fd302a33f2324359232e4325970bb6
+DIST prewikka-4.1.5.tar.gz 1432885 BLAKE2B aa899eae92b7eee10c4e80544fc02c80fce403dd808464ef3ca21a6d8ddb052730314bd4b83970c684401c53f8398df0f9ca5180c946999e08a2faf9eb7b94f4 SHA512 f68fb6c893727e1bfc2611ef8e3327e6c44d24ea36239fb998675d0e8102dd9849990dbd344c9f584a045f9ed6b4208c3a9928c952ed6248e691687827677dd3
 EBUILD prewikka-3.1.0.ebuild 899 BLAKE2B 853a9c2b942c25e3e32a6012656099a104bebf078b6c739b2b8bf736452d8805c6f0357b47762497c0f7528022b1a69a1aac7f5e10a298c3f78342cbba1e61f5 SHA512 7acd6f07af3f6a4124a5ecc2d569793c2fcb6a60e6768836f36bf8a2639a06288ca811941e9d275f3d9ab4c40eb618c010558d1e8c74e294fb23ce8ba479e003
 EBUILD prewikka-4.0.0.ebuild 964 BLAKE2B 4c87378418b75c9ccfd46f3a1089442fe427584cf337a3ba41b93f4e7d0c06e9cbfc48e608c0a9bed50a60f9d17c3504ed180156aaef2e75f66e0bccb966b305 SHA512 cad0bac73833ff273de437a0a8443bffd745437c4464381e16e86832de75cff5ece23642875189c0ae0422dba79ee9cf2b1bd6e3d9cfbd1159e27874b54e6a0b
+EBUILD prewikka-4.1.5.ebuild 1112 BLAKE2B e00144a87aa4c9cba29a312ada04a7104f4081b60caad52d466a3a39fcb4291fbd8da75c441fcf5c8b23482d15904c6cf0b76e224b9487a1516d55d128ea1529 SHA512 a7ff9fc01016b30dcffb6b01409a43a23b2b9b626cbffde6e16628b304590eebca1b5d8f329b108658b979edb725cee6f92e0c8313127532e59eb14d8c9f9341
 MISC metadata.xml 789 BLAKE2B cd4566869293a5c7d48ec9ebe94116da4c1955242e7d09eb2cb9c71a4251d05c44ad1b11a26c70b5e2abadee72fe642dd4aa1a8bd354253126bcd546735aeea8 SHA512 a5c66025685b64102ef46cb970be45a7f06dfc823ce9f5dfce3eb412060ac7fd56c6e3bc81522a51a6a35ae33dd5c07e4a91bb9ca4e86d34d97efdc7a342238e
diff --git a/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch b/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch
new file mode 100644
index 000000000000..64fd92f14ef8
--- /dev/null
+++ b/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch
@@ -0,0 +1,32 @@
+# Based on https://www.prelude-siem.org/projects/prewikka/repository/revisions/9814f708b6e157795b89f9edda32ab38d0a2ced7/diff/prewikka/view.py
+# Already commited
+
+--- a/prewikka/view.py
++++ b/prewikka/view.py
+@@ -523,7 +523,7 @@
+ 
+         try:
+             rule, view_kwargs = env.request.url_adapter.match(request.path, method=request.method, return_rule=True)
+-            view = self._views_rules[rule]
++            view = self._views_rules[rule.rule+rule.endpoint]
+ 
+         except werkzeug.exceptions.MethodNotAllowed:
+             raise InvalidMethodError(N_("Method '%(method)s' is not allowed for view '%(view)s'",
+@@ -580,7 +580,7 @@
+ 
+         rule = Rule(path, endpoint=v.view_endpoint, methods=methods, defaults=defaults)
+ 
+-        self._views_rules[rule] = v
++        self._views_rules[rule.rule+rule.endpoint] = v
+         self._rule_map.add(rule)
+ 
+     def addView(self, view):
+@@ -601,7 +601,7 @@
+ 
+             rule = Rule((view.view_path or "/" + view.view_id), endpoint=view.view_endpoint)
+ 
+-            self._views_rules[rule] = view
++            self._views_rules[rule.rule+rule.endpoint] = view
+             self._rule_map.add(rule)
+             self._views[view.view_id] = view
+ 
diff --git a/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch b/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch
new file mode 100644
index 000000000000..773b2e984698
--- /dev/null
+++ b/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch
@@ -0,0 +1,12 @@
+--- a/setup.py
++++ b/setup.py
+@@ -84,7 +84,8 @@
+ 
+     def init_siteconfig(self):
+         config = open("prewikka/siteconfig.py", "w")
+-        config.write("tmp_dir = '%s'\n" % (os.path.join(tempfile.gettempdir(), "prewikka")))
++        config.write("import os, tempfile\n")
++        config.write("tmp_dir = os.path.join(tempfile.gettempdir(), 'prewikka')\n")
+         config.write("conf_dir = '%s'\n" % (os.path.abspath(self.conf_prefix)))
+         config.write("data_dir = '%s'\n" % (os.path.abspath(self.data_prefix)))
+         config.write("libprelude_required_version = '%s'\n" % (LIBPRELUDE_REQUIRED_VERSION))
diff --git a/www-apps/prewikka/prewikka-4.1.5.ebuild b/www-apps/prewikka/prewikka-4.1.5.ebuild
new file mode 100644
index 000000000000..712e2dcd0579
--- /dev/null
+++ b/www-apps/prewikka/prewikka-4.1.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
+
+inherit distutils-r1
+
+DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="adns"
+
+DEPEND="dev-python/lesscpy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-devel/gettext"
+
+RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}]
+	~dev-libs/libpreludedb-4.1.0[python,${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/croniter[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	media-fonts/font-xfree86-type1
+	adns? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.5-fix_siteconfig.patch"
+	"${FILESDIR}/${PN}-4.1.5-fix_rule_error.patch"
+)