gentoo resync : 22.10.2018

19 files changed, 168 insertions, 477 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index c0b3964ce38b..940c7ff8df73 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index ea9a7b30c90a..b8c5216fba86 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
-DIST drupal-7.59.tar.gz 3282260 BLAKE2B bf7d74926fe4e94149ef7ff622cf7889f45f3e35b9bfd19fed12aa688c8131f2f8daa2a261796896d5386966603e837b6dec3b6c02221f9b0c527c4a6f5ff9da SHA512 68f02b39d1a4658adc0f0046c22cc1059b68f952f9cd753f5a3e379cf93705be308b4727519e90d77a42437442daebaa78d76745954be4d40e1a5105c319069c
-DIST drupal-8.6.1.tar.gz 16236559 BLAKE2B 6c7b2d396b285290e0ef537777054cfe1d50b6188d3400bb0f0c6c35f3ae677b6d7f9ba53e28f95c4a89aeadd2dc7fc1b7c659048332a21d0ffc543bf8c4df41 SHA512 f42eab1f7110219d11f398c5099cd0abf50883819fbe6a879d08f1117e3cc413937772a269d28ffe09ba59b24f79516d03601ccfd2abfb37ed18064f34368b5a
-EBUILD drupal-7.59.ebuild 1773 BLAKE2B 7ac284fc9078c37f97510f8e2c474cbd155b910204b73365a531bc9b27df891d99cdc5d0e695a510e931ddf9e13ffdf177367b6c10e6b75af009e69910d0686e SHA512 59be44f0d0b52ce977061a4f3e35ec542519ee077e9c7dba931160ffda1cc8551ca05b6652b4e3efe75327e6698b1552d1dad45d8e5bb763d4ee07e1e0334762
-EBUILD drupal-8.6.1.ebuild 2428 BLAKE2B fa031355fd6bc3268fe3fdf735859d8a2b4a171a9dc27ba0b1c7495fd2dcf45c0a26c950c5dacd1c113e29a229cd25928c7ceb9aa09c7434ce6df6112e31e52d SHA512 349ff3f6752752012254cd816db0320ffc40420c01fad22af466ca366d769db99c6f7ec0648042a4cb30b21a16789c63f95d67138952aa977ed03a9820be9a47
+DIST drupal-7.60.tar.gz 3283058 BLAKE2B 2c29c089e0e13ce52c5d7a0bbf72c79596fbdc1a370a60b33d617ab29f2aaec86e36545ced7620832f333de66bb775178f7eeeca80976d6e2616553b766c07b3 SHA512 fee59cf303a6c44e3fa3cbeda4912f7d61ffe8294282f9ad0416a6536cc6ea65cf114a6a801dd1f68572185c2b1e300f58f907f9bd61f96beaba3706c527d512
+DIST drupal-8.6.2.tar.gz 16240694 BLAKE2B 122ff2464af6376256d96db8b470cf5f83beeba80a5c63e549e7eb0cfc875629d0b2d4ed46b130294e2145ea5a428b15cfa0edfcd31596660188df769b68bcd2 SHA512 8cdcd31f3a112a577e622cca0fb7957580b5691102421344c6f6bfc3096f33aae3a68d7d8eb9062ad14761bac14b68c2967973b1b1ef367dcbd79b972493b7c5
+EBUILD drupal-7.60.ebuild 1770 BLAKE2B c95fb45714d745fe90f8522f44f4c6c4e8447fc0ca70bef0ba14e4d9112f6d17cb8241a15f6eec9cd3ff7dc4821f2f3744f797c9a756224efbc4dda6e1104251 SHA512 cc332985461f2fd70e73231af6841c8f9c64d5f9ec961b46ca2814d24bc6a2d4a29e35c53ea1fe231de4f8c6183461402fcdce46a37db64e28af6f36658e095c
+EBUILD drupal-8.6.2.ebuild 2425 BLAKE2B 6c7c13e66671b68a6f3d1305bdbd07e06fc1d07e4f9d44fd093196f266f690cff3d1e02444c3b9fbf9ca4733f32d396be55888e4fb87c464706fdf36692f9481 SHA512 5e436f0647278c0f2775ce4aa3096fa32e7f9b9d682e16b1cbda27d622fc5b9f11842b002d39efd47f6430e5799199c6bd28b4f980bfaa75ad2be20776fc74ff
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-7.59.ebuild b/www-apps/drupal/drupal-7.60.ebuild
index f2d68ea226da..6f40a8c2e6ea 100644
--- a/www-apps/drupal/drupal-7.59.ebuild
+++ b/www-apps/drupal/drupal-7.60.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-apps/drupal/drupal-8.6.1.ebuild b/www-apps/drupal/drupal-8.6.2.ebuild
index ec2dacba2d14..236af8564a81 100644
--- a/www-apps/drupal/drupal-8.6.1.ebuild
+++ b/www-apps/drupal/drupal-8.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index ea15d91129f7..4284cd7455aa 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -3,8 +3,6 @@ AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064
 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.4.1.tar.gz 14978598 BLAKE2B 8fde79291b745750e79c944e7fcf938d2476ddaa386c1277f54bf315831eeb749507e270ca0a8a8351dd8fa60656bb98eb7c478a5c99f2ac20d350b6054339d5 SHA512 3b812bd61215230035ec9241e953f239981d04580d931f379aa550e11d2f7facd56bf70ac9e2d866224d341570a238bcc5c2fa71fd1432cfb95b8c8b703784e6
-DIST gitea-1.4.3.tar.gz 14985783 BLAKE2B d2f141a036406c92e7900ce073066ff5024f308c24a2705eb5da229c48a1b6c772d3148222aafd5c0d6608830670badb2a102149f58a134cc32b5175e1ae306e SHA512 24498b418b9ddb14da5568a206e1fa0831c5789e0b64207f413c3b86e2a855052f7af80d3cb80549eaae6944e22af271c00f6308c66487c3be0dccf55a17976a
-EBUILD gitea-1.4.1.ebuild 1892 BLAKE2B 09a05d287962d04ac368be5a9a20f65d1310231a55e90e10fb3dc9d2da79aaf94a16bf24a1f4d6be7cc27be4130a7e2edcf91fc05cad6c20077a98c09123e3b7 SHA512 aa22f9c026cb5741679c1fa8783ac9aceb1ff413d96e4a422e7f21ae5fd4ab12872b330fd58b790a9cfcf121a519a73a44016270a6919b1cd076a6ca70693998
-EBUILD gitea-1.4.3.ebuild 1892 BLAKE2B 09a05d287962d04ac368be5a9a20f65d1310231a55e90e10fb3dc9d2da79aaf94a16bf24a1f4d6be7cc27be4130a7e2edcf91fc05cad6c20077a98c09123e3b7 SHA512 aa22f9c026cb5741679c1fa8783ac9aceb1ff413d96e4a422e7f21ae5fd4ab12872b330fd58b790a9cfcf121a519a73a44016270a6919b1cd076a6ca70693998
+DIST gitea-1.5.2.tar.gz 18866286 BLAKE2B a9a31fa6a310dcb6debd9399f234262214021d72adda52af959e6d9d692d5902ff6955a9802bf60212cecb2a0146c4905952d44643aa83e49c645d32541907c2 SHA512 ef91c881b3cb81d79d182b78c95624f24d63e21daa2d6e561fca79edba0ad588fae7c55503f900a8f05c566ed3bff92a9c4385fc7e5c701a80749d2a8c58b599
+EBUILD gitea-1.5.2.ebuild 1923 BLAKE2B 5267d3a75c41ba874b4db011de06ec14aa1356358104bb2d715b10d47ecd1e862ce1852ee04289842b00c99c4f22b307ee18db5d4b830d20231e358f8952f248 SHA512 d5601d742af950ae69e00f2800caea64196f34626eefeba9910cc049ce82265ce6a9572c52ae74b7a48fbf863fbdc6a05edeb10235f468c39d66039e6e8e89f3
 MISC metadata.xml 246 BLAKE2B 291057fd61e77f8d99f9518e3f709d79ab79ac5ac5ce1387d27a26cec6272698fe6bda7cfacaeb203411413ed003c71cdaead8316cd9e5a2c1ce1056637eaee4 SHA512 9af718c7e0ca960324b9fc168e85824099a5434a322d7da78dabc90b8cd3be2201a3eb321facd0df575fa1d0865c1f80280d290589f0ff1d27bdef575297abb7
diff --git a/www-apps/gitea/gitea-1.4.3.ebuild b/www-apps/gitea/gitea-1.4.3.ebuild
deleted file mode 100644
index 41abc1c912b1..000000000000
--- a/www-apps/gitea/gitea-1.4.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user systemd golang-build golang-vcs-snapshot
-
-EGO_PN="code.gitea.io/gitea"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="A painless self-hosted Git service, written in Go"
-HOMEPAGE="https://github.com/go-gitea/gitea"
-SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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
-	sed -i -e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
-		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || 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 custom/conf/app.ini.sample app.ini.example
-	popd || die
-	newinitd "${FILESDIR}"/gitea.initd-r1 gitea
-	newconfd "${FILESDIR}"/gitea.confd gitea
-	keepdir /var/log/gitea /var/lib/gitea/data
-	fowners -R git:git /var/log/gitea /var/lib/gitea/
-	systemd_dounit "${FILESDIR}/gitea.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}/var/lib/gitea/conf/app.ini" ]]; then
-		elog "No app.ini found, copying initial config over"
-		cp "${FILESDIR}"/app.ini "${EROOT}"/var/lib/gitea/conf/ || die
-		chown git:git /var/lib/gitea/conf/app.ini
-	else
-		elog "app.ini found, please check example file for possible changes"
-		ewarn "Please note that environment variables have been changed:"
-		ewarn "GITEA_WORK_DIR is set to /var/lib/gitea (previous value: unset)"
-		ewarn "GITEA_CUSTOM is set to '\$GITEA_WORK_DIR/custom' (previous: /var/lib/gitea)"
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.4.1.ebuild b/www-apps/gitea/gitea-1.5.2.ebuild
index 41abc1c912b1..49bba0eddfbc 100644
--- a/www-apps/gitea/gitea-1.4.1.ebuild
+++ b/www-apps/gitea/gitea-1.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit user systemd golang-build golang-vcs-snapshot
+inherit golang-build golang-vcs-snapshot systemd user
 
 EGO_PN="code.gitea.io/gitea"
 KEYWORDS="~amd64 ~arm"
@@ -13,10 +13,15 @@ SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
-DEPEND="dev-go/go-bindata"
-RDEPEND="dev-vcs/git"
+DEPEND="
+	dev-go/go-bindata
+	sys-libs/pam
+"
+RDEPEND="
+	dev-vcs/git
+	sys-libs/pam
+"
 
 pkg_setup() {
 	enewgroup git
@@ -31,19 +36,19 @@ src_prepare() {
 
 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
+	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
 }
 
 src_install() {
-	pushd src/${EGO_PN} || die
+	diropts -m0750 -o git -g git
+	keepdir /var/log/gitea /var/lib/gitea /var/lib/gitea/data
+	pushd src/${EGO_PN} >/dev/null || die
 	dobin gitea
 	insinto /var/lib/gitea/conf
 	newins custom/conf/app.ini.sample app.ini.example
-	popd || die
+	popd >/dev/null || die
 	newinitd "${FILESDIR}"/gitea.initd-r1 gitea
 	newconfd "${FILESDIR}"/gitea.confd gitea
-	keepdir /var/log/gitea /var/lib/gitea/data
-	fowners -R git:git /var/log/gitea /var/lib/gitea/
 	systemd_dounit "${FILESDIR}/gitea.service"
 }
 
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 46c230fe42fe..5e2c40c59f65 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,8 +1,8 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-5.2.3.tar.gz 54301168 BLAKE2B 42d86f74179040f36860f49b687a210247bf55728502279c77bd58b934edfe0d42ad81e4e924de9a0db952c2158ff16bcab094d992c1913a244028ceafe60544 SHA512 c7c8ed116a72a41cc4c2c8abe2c47b77ebd071d2112c4a88f3a9e76a524f21ef97386b3fa1364776c3f715ce0def75428e113226b1ce288f81896e2bd1dfebb4
 DIST grafana-bin-5.2.4.tar.gz 54300847 BLAKE2B defb1b32fafe95c17ab4201665df053d8cb1cf7154a366d2b0bbf3936ffa4baf6f5a3ae3e5fe9fa96334fc0bfcc557106c38d4dcab5d5b5ca64b588726274034 SHA512 75c0ca8735ab0e8c2b340322cc5b0d5adec90a7159761cd9fa2c346a5a4e9fcceb904d160e55be2e4c9b5fa582356aa20430f9d4577e2df3195825d83de897d2
-EBUILD grafana-bin-5.2.3.ebuild 1746 BLAKE2B 913e4249c53721a7a5ac44f2047fa815b4a8900c67811b2b46677dd9afdea6ec5d352150acef9fd2d7459fb659a23afa455b836a1db68c55501cc1d7494eb5d8 SHA512 e3e61b3821699073253cc6cb6f6b910792e6e6e9bf8f256c6d1447dc689d47dc8e7c0ab098cebdf4af399cae1111b17fa82c439ca69952a65d52f6103229eaf3
+DIST grafana-bin-5.3.1.tar.gz 54595281 BLAKE2B a6feb32e885bb6ce89c168e51e2b2ef6fd33557b44e6ed5f23a3b724b67f7e3055234bb25a714cc515a89d0de6dd69ccfec92c5aeeed72865ce4f646b3a9bba5 SHA512 b439be6d031d24f046985cddce0ce2866efb808f9d107f305998ed042b6bc86f5fdb4482d31bb3da53e4f57d52ac61bd7448394410cd063e46f396f7506cd179
 EBUILD grafana-bin-5.2.4.ebuild 1780 BLAKE2B 603d8212864953f010df6846f9ab863a3a0256d912a0d53d4d5b0b1239c3d60252ae9a2781d210daddbaff0970095740f6cd900b6863aaa1cb38da9debf1b75c SHA512 0674a4fee1ae83ff36ca4506c534b7c02f2bc47e930f67ab76dd2ac9eae979022cb9d23a85c45c4ccc395ce3245125930878cf6513d61c65afed90dd233f034d
+EBUILD grafana-bin-5.3.1.ebuild 1743 BLAKE2B f9636d2f85fd3c96a88a915b0bb173bec3f2cb46db4c9434eb44840a6a93e0657f3b00542ccdffe82bf3f737338511249c76884c9dfd599f34182ead06889586 SHA512 d5612249b0f78b21ccfdea99b034ffc9697367c64cb6fbff5578ccca279d3c23e08c360965f71e038caf1b41dc2a8142ba4c0edc4db74cadb52dc28f24f3ab96
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.2.3.ebuild b/www-apps/grafana-bin/grafana-bin-5.3.1.ebuild
index c398e8e88585..e918394e986d 100644
--- a/www-apps/grafana-bin/grafana-bin-5.2.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 2f9c747e31e7..d97a87b80633 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,14 +1,20 @@
 AUX nextcloud-12.0.4-destroy_modal_when_closed.patch 786 BLAKE2B 24222dde0d9ed5f3c5fa31b7cd1b837f765837543475db235056dccff9fa17cce83a37b0ed64a1999a6b61dedd5857866debb1950686acf062e42d80bccb3813 SHA512 93297f991312c5fd2504267bb16a8c38797970fdf8d109d4c4b4416a5e72c8677141ebc9a13a2dadc40845348e07f264937dd852384f88d65be4f3cc4f0cb462
 DIST nextcloud-12.0.10.tar.bz2 45114548 BLAKE2B e993c617d27fea12ba95e4fa365c02ae6a6930ef944fcd1604862d4aca331291d1e738a846316f89947f466095b300fa53f652e1ac501440fe88512f8bf0b096 SHA512 10ec239f55e88f247bb52816c8c959b9e504c5a0ae428d0ff372866f72d900e6e9cf8dee43f24f906bebf2db4b4a9d2d8386447b838d834b24da404ee1e5849a
 DIST nextcloud-12.0.11.tar.bz2 45123785 BLAKE2B 3d1f9131ff89d348dd18c0f7de284b13563177b388729e6049909fa1be3ae3ccdd03a85094869a872e4eb18e210a7ef406b0813e2ec5a1804aaecd9df4cf770d SHA512 885daa98ce602c6b59adaf66eb2e10ac6f5c5b2a607b5ebb80b82ee08256fd77d12aa1dee4db463d42abdd169e4acad14ee793cdfbcfa5b466f25ca3fb6ffa79
+DIST nextcloud-12.0.12.tar.bz2 45164894 BLAKE2B b316a5e831148787569ac80b55c411a8ed59eae312c48badd0aeeadec9dd0c048194b8feeea720b1ad4f19eae906fd1e114299756351b4831af744a918bb7210 SHA512 fd47157dc8437718e2765ed3b0644fa1ecd76707ed8aab06648524fe42cbe8e1c66244d85cd6e48bc5babf4a4a4f684b2da7a29ad60fde7755988a474fdf55f4
 DIST nextcloud-13.0.5.tar.bz2 44792418 BLAKE2B 0582b36a078ccea7a2b482e8be213f0102fff2d60f0b92736d7c488498cf8ae4b75ea6a9e5c14cd0d71f2b3ad9d0ff9b6a2fba7b809bcc89e2287c7801e26a49 SHA512 5456f95d3835e0c9fcf015453e1f6e75ba6f5c0266d8951596fad7d3bf06230199a22e5869bc616581410db0ed831a5cdec123a9d2955898a837614a2bfff32c
 DIST nextcloud-13.0.6.tar.bz2 44769940 BLAKE2B e9c227d64a23dbd677326f528cc268842403c6d51514e8b0d5d446ca5e91fd49910777b6cc7d7bbf0e7f6e1c422fed390cd38506edde019dc5a1955d94757102 SHA512 cbecd5dc98c96f28cbefe6b25e51f4be4583004841eb38d32a3261ed01f906590e16053dd7d8e31589a2288eafd368a47e280d511ee8c994886b4ea892f535ff
+DIST nextcloud-13.0.7.tar.bz2 45085663 BLAKE2B 1d4f07310fd0b85981c8f45197b0c760e484db5eb47b347ce6d51b6e7729072a1ff13ed30739ee5b96a7456fab20d4f4ec5b3651e709aa466f305ca3ea374ca3 SHA512 511a4f35f03e9696806342781f4b8b7e2265a8209d9c8b01aa1b9f58a9ab55876e9feb90357816ff991d19a27862fe3009f0f081b5c2e971e919412eb4e71024
 DIST nextcloud-14.0.0.tar.bz2 49762528 BLAKE2B 4c5bbddda0d93504b3530ac0a69511b66faba5d64014a372cd411b9807ca931de484f0db74823534fe97ad5beee25d8c3a0eb001e25a208983b7f13545bd1af4 SHA512 8028f46a6b45834f411ff0942dfc41b72d41d356d01136c74c82fabe1247cd5e62e3b57a298b706a02eb27fabc03790a6ec6a8618b70f2016ae756cf8b523014
 DIST nextcloud-14.0.1.tar.bz2 49761953 BLAKE2B bd7886defeee82d28cbe28548a015cd64bac7d15a3f4d1a6c458f25b87d07370537c26a432c3abf32c574f6b202f15a2cd6a5f1fbbb40bd50b4bd94132154619 SHA512 2d74ac3806372f86020f586f33bde6e4b7694f6dca38a49eaba8955c2108b034e62042e4fa166b3b8e2ecf979c4130674408c4500c461637037a9d4a55fc5465
+DIST nextcloud-14.0.3.tar.bz2 49713609 BLAKE2B 0b87b899a273fc5a31b3e3e0451f2214e4377bec8671e9ca7022054d294820de4964053be950cf951b8c0d7a10f4958648164b3a76681ee2fc7aad7a902a1be7 SHA512 09f224d5e55496dcad4d743a0b62af407b4e1fece009fea19d87ac32672cec83bde135e25607236971af0ba32804cc5ebff9295472c276eb2898e21400c6e2c5
 EBUILD nextcloud-12.0.10.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
 EBUILD nextcloud-12.0.11.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
+EBUILD nextcloud-12.0.12.ebuild 1033 BLAKE2B e0d1fd02c8e6be0937378d98d72dd0e2ad42111a5fd7234b0767d29e1273c8442adb7bfb71125ea0992e9418ca0f898680e290ce023dbcab9d0aea5dc9676657 SHA512 d7d046780d5a02555f5c804eca9d3de0c96ae21d66f52022ecd0460516f9614f72626e6a3b1ad1535ebbfc234d57844669b55bec0144b14d2477551149888a7f
 EBUILD nextcloud-13.0.5.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
 EBUILD nextcloud-13.0.6.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
+EBUILD nextcloud-13.0.7.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
 EBUILD nextcloud-14.0.0.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
 EBUILD nextcloud-14.0.1.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
+EBUILD nextcloud-14.0.3.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-12.0.12.ebuild b/www-apps/nextcloud/nextcloud-12.0.12.ebuild
new file mode 100644
index 000000000000..5509a59a7522
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-12.0.12.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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-13.0.7.ebuild b/www-apps/nextcloud/nextcloud-13.0.7.ebuild
new file mode 100644
index 000000000000..b6bf2a09eba7
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-13.0.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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?,truetype,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-14.0.3.ebuild b/www-apps/nextcloud/nextcloud-14.0.3.ebuild
new file mode 100644
index 000000000000..b6bf2a09eba7
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-14.0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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?,truetype,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/trac/Manifest b/www-apps/trac/Manifest
index a441f32e1243..085a88df1e42 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -2,13 +2,8 @@ AUX postinst-en.txt 1331 BLAKE2B 45313107abc05238160eeda67db0aab4917d18ee0e4d788
 AUX postupgrade-en.txt 665 BLAKE2B a504090cabc4d8645c31d1aecc7419059b84b8ba9a7b42331f53fe1953d3e5bb44ed0327411acbc711eb31a06e4bc83b7577d6d7d054ee74bfbccfadb58685ea SHA512 bc4684dff491d6140d7d97a1de6cc2773d5f834054bc3d8c122c5d6777f543a08f93e4142c50dcbda862d75ba5c19ffd49ca37876e57df4ee19869099a346a4f
 AUX tracd.confd 359 BLAKE2B 5bf14f9828f3eb22c39a27dd20da219032cc3157d45b16a54a0a6530923c694f7a424c08c09458fdf9e422a3819a7e30619a1c82966ac5aafa2355528e666e3f SHA512 38a961fe59b690eb91e20143aaea6aa1becda8c2afa103599d14ff86c7aae88f06b57b342302de1f067dac5d99024b9cc72896a84349e09b3ff40c9a20f97bb1
 AUX tracd.initd 823 BLAKE2B 4325de1322cda7885539859c2b2ea3d27acaf636bde728c50fcc4c769acec308e6b56d3449109171ce9bdd2bdda9f9364f93c7069debd0a0ecb1009ce0bbf29b SHA512 88a2c92fc1f947d794e68b158db1786cd9c2891de5d3d0d5b738e1245f35998e17741176ecd2a9562d21058f480668cfa61628c7a7b4bccf62e1373728db5be6
-DIST Trac-1.0.13.tar.gz 3671741 BLAKE2B d8b2783ed57fd696e09c2bf4a52c9d9eb6b37576cc1c478f2e6d0f0935e9bc8ca145b89136a9adfcd0fb840faef3e93d4310b110287a84b922f72c1a9d991aa6 SHA512 b4b2066482bdd6ba16183f2021bc069d1054177462726de1d844a28eccdc0b32405a0c510143f6ff84caaebebc571114e81cc0acc679ce94f8046b49d6854c1e
 DIST Trac-1.0.9.tar.gz 3642845 BLAKE2B de0a6fdfc59c5c3f1e795a7e0a006e724491d1d084c9fefcc35185a40430e06ed781c94cf9190d394b943064fd87a34a6fffea7f57c3d4b55b591a6aab5a83ad SHA512 af429db720049ab344ce3c3b430dcf0ab7530013f59ccd2334633de9babc3f31b14829b9b5aa48aa05f614ca72d1d557953c58bbfb93faae2267afeac72e6304
 DIST Trac-1.2.1.tar.gz 6212917 BLAKE2B 6445ec515b295d0fdd3a75e93da853d136f19083b6e87cbe9c856e2502d217c433bfd7f885d8ff45556882e8c99a7d6e966761027f72e32e675278ee83a67eb6 SHA512 0ee008ce0d890873eb6db7eca60e362760c4a4857dd74bda67c30e566dcb5bd64ccd6d5e7317da904e8dcfb7d4a017004d3bb794dd405936c94803b2fcc4829f
-DIST Trac-1.2.tar.gz 3821867 BLAKE2B 0ba6da89dc6cf015f2dc912c54a5df6d93e676e42a31dd269ec8a0a4aba88065c931d30a3e4dfed23b6d66f85f22f8b989fda7a20db115cdf8a5e6c5038d4b99 SHA512 0655723a6727df389d66bb9c752436a81c820750659e5bf7a64485c4362fa1b1c1cb6dcdaa9936003838ce5874b20bbc5a8d8fc1034b96ff31b3bbc6f7fca105
-EBUILD trac-1.0.13.ebuild 2946 BLAKE2B 2767696f5d5c17dcdc0c3e35a00561aba863d7e3295b68874f2f9cf0bf7ed4f8c1427d478a7fafb7d2708de9fe43036c80948dcbd28db7930a9dc9bfd1b863aa SHA512 7be6a5a617d94fabba4822a113a6554437c8b7242c229086c9293fd6bb5cbda779c6da387629b7bbb9f81524e6721e7c45077e5e490e6821d2f70dd43581f240
-EBUILD trac-1.0.9.ebuild 2943 BLAKE2B d35f571c95a943b1a2ea99076f10dbf193c3af3b17a9d77863d709c04b2698fe04b35ada3e55e799dcacf18d0d9a8fc574cb6d640d8737d340ae3517a3157cc8 SHA512 5b0f08cd832101090c008916184a4d2ba12705383767f716581f9b7089158435515287e510aaf3ceb01d91d62ee45930aa56adb8190a3a0faf4975eb36a91acb
-EBUILD trac-1.2-r1.ebuild 2620 BLAKE2B a0cfca1d272203ce69a889d85430ddec36df6f4c9cf37b808f2e87be042ee339ff0cb700b10fa29d86e486e57318f0a9c298339fa237a13f05efea521163f629 SHA512 199801b1ed91d23f83c6e94f822ab1eb1fb1d9ec2eae5818d551c66ea19aad2cb6b94516a20a68a7cfc28f9a87ee5a6528a587b12ff7ce7809fdd0eae3aadf78
-EBUILD trac-1.2.1.ebuild 2620 BLAKE2B 7e8e9b103f7c08e05b5229bd874bc18460904693ce5f0799c0cc74f8c67a5b17dff4321300093fef8f263d5da78231cca5219ecd40989782ea02fe9274722b21 SHA512 8daa40075cf5f2ae457ecc48ffe128f179ef1fc811ef1b817ffb85b110aad9e4993959bec5f38c02c877b664249a711756def1f0dc46b6342ada69b950452b79
-EBUILD trac-1.2.ebuild 2946 BLAKE2B 2767696f5d5c17dcdc0c3e35a00561aba863d7e3295b68874f2f9cf0bf7ed4f8c1427d478a7fafb7d2708de9fe43036c80948dcbd28db7930a9dc9bfd1b863aa SHA512 7be6a5a617d94fabba4822a113a6554437c8b7242c229086c9293fd6bb5cbda779c6da387629b7bbb9f81524e6721e7c45077e5e490e6821d2f70dd43581f240
+EBUILD trac-1.0.9.ebuild 2868 BLAKE2B b0f9fd97c94dc4a2752a54401c10acd5f1bdf625fde169da91344df992ba1affc0aaa8d73951928673cc33e3c41c82153a8312d763fc038c102c64073809df32 SHA512 158b1b2a4ca52d503b1ab4eaac23f2d600ece7b6d43687ed99b7fc2c22fe2caa6c82446c5d855c7cb3a9f326968af46c27815f2e055d01294525654208e1d41b
+EBUILD trac-1.2.1.ebuild 2545 BLAKE2B b228bf1ee59360014fe0ea05ddf6ab984f23457fcc68b8eec0e4101a9ae742b8f54288351bc922ba8c8c4ef375417c9eb96d4a9f273b06fcc0116fa8440c7230 SHA512 1090c83e12026709d670514692c5504fe6b1f47debba05e84fcb2dfca59bfb6b87b14f5c5cdb247a8ef97b28a3b7c616dafb0bd33870148bc3d6dafa5fbdd438
 MISC metadata.xml 506 BLAKE2B 4b408bc9a05c2bddccf9c733ea9f58c6f2be64f3dc8b04f4a3f3330b3ac21157f3468144a62f6473c253e8e8019c759a3d2bfbd1ad36633c3097bc061b88a8b4 SHA512 06c8b9589b20dfa824822b3129d7f62bc2aaad12f37b16e735604469a94ed51c6c8b57cce53efb1e81d748bae56ae90d74837d60667a4826ac53044e2afdf048
diff --git a/www-apps/trac/trac-1.0.13.ebuild b/www-apps/trac/trac-1.0.13.ebuild
deleted file mode 100644
index 14de0469b9b1..000000000000
--- a/www-apps/trac/trac-1.0.13.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
-		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	cgi? ( virtual/httpd-cgi )
-	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-python_install() {
-	if use cgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.cgi
-	fi
-	if use fastcgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.fcgi
-	fi
-	distutils-r1_python_install
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
diff --git a/www-apps/trac/trac-1.0.9.ebuild b/www-apps/trac/trac-1.0.9.ebuild
index 9c5c03009742..4246afbb2b2f 100644
--- a/www-apps/trac/trac-1.0.9.ebuild
+++ b/www-apps/trac/trac-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
@@ -44,15 +44,13 @@ RDEPEND="
 	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
 	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
 	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+# Tests depend on twill, a broken package
+RESTRICT="test"
+
 WEBAPP_MANUAL_SLOT="yes"
 
 pkg_setup() {
diff --git a/www-apps/trac/trac-1.2-r1.ebuild b/www-apps/trac/trac-1.2-r1.ebuild
deleted file mode 100644
index 5ca86ea808b0..000000000000
--- a/www-apps/trac/trac-1.2-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
-		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
diff --git a/www-apps/trac/trac-1.2.1.ebuild b/www-apps/trac/trac-1.2.1.ebuild
index 74a2d85d5fd7..b8da6df8dbc2 100644
--- a/www-apps/trac/trac-1.2.1.ebuild
+++ b/www-apps/trac/trac-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
@@ -42,15 +42,13 @@ RDEPEND="
 	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
 	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
 	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+# Tests depend on twill, a broken package
+RESTRICT="test"
+
 WEBAPP_MANUAL_SLOT="yes"
 
 pkg_setup() {
diff --git a/www-apps/trac/trac-1.2.ebuild b/www-apps/trac/trac-1.2.ebuild
deleted file mode 100644
index 14de0469b9b1..000000000000
--- a/www-apps/trac/trac-1.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
-		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	cgi? ( virtual/httpd-cgi )
-	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-python_install() {
-	if use cgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.cgi
-	fi
-	if use fastcgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.fcgi
-	fi
-	distutils-r1_python_install
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}