gentoo resync : 24.02.2018

24 files changed, 32 insertions, 518 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 635c251aa45b..27be897f8c48 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 1dbbea9f1202..9669e08f70f5 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,8 +1,6 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
-DIST drupal-7.56.tar.gz 3277833 BLAKE2B 30b707b9a9846d8d22401cc193c1ed32068bbcab3103fc7bd43164ad2f13feaad48e19c6e660bd1e51aaf7dbc5d91547a57ce05e55a4a73f0a13e972d0fee661 SHA512 ab7ad8d9cb26e89b9d81280b1677584072db627d508ccade9442c95a90f24c94d11561013c8a7297ddae6ae43696d0b711b8c37ab98f89539f6f0e0154db6344
-DIST drupal-8.3.7.tar.gz 12739663 BLAKE2B 9bbd3086ff516671cb33fd9a47f69bc1ebeaf6af5ef2b8058906ad09a75de5aa0c6ec256d9a7116fd899735b706035f9f0975a19f3bcd7e8cf52f904c2fc066e SHA512 d454a51b2bc7ffbad3e461df1d2ea1f38797716b046a520ad65fab5f5c398091b28bc623d3efc2d18176e6506a95e113e1d5e5a0a76e50ca7f22a995920ea671
-DIST drupal-8.4.2.tar.gz 13393043 BLAKE2B 6e0db7b46cdd67ba93aadd279a1d0950e85aafdc697650ac81a9c3f10d1ffa19219d5e773f8efabf08152a712f368f15eae96353ea1b4d2427fe35355e1ca5ba SHA512 ce4ba105c253669ed18656d50a172d2f0622b1be121895486b2df00dfda0f71c497277cbc3e3a7a9fb426b9fb0828bfcf7ede3ff134304ca136ed689d4f15582
-EBUILD drupal-7.56.ebuild 1773 BLAKE2B b9788b850ba7275a036c5dfbd4cf8743591a03683b868a69dfc84e2ccc1fb122a0641a3daa1a7ac047809ea374ffb5645fd4d2310ad58c826b849304de888aca SHA512 fb9455f1a3364666966890be63bd443020c3a234234809387912130590c72c63029ac6b54b3db6367cfd1ca4f9c99401c37c3c23a75b5c62dfd07158a535a847
-EBUILD drupal-8.3.7.ebuild 2428 BLAKE2B 59dec9c3c48963a8c0d9bd7a6b46b59b6fc067eb664c94fb65fa7161981dd4aba273d9235db951ade0920021ac46bcc29d6981d7ab5f7f8796e47cd6df084523 SHA512 62d870e7b416ade4bee62d260c9518ada5077ceb8918ef40b5143d0644af1845f0e660208336e57d5cad7c63cc88ca1e6b185b0d3df9cc6c5ea4dae1efb3ab24
-EBUILD drupal-8.4.2.ebuild 2428 BLAKE2B 59dec9c3c48963a8c0d9bd7a6b46b59b6fc067eb664c94fb65fa7161981dd4aba273d9235db951ade0920021ac46bcc29d6981d7ab5f7f8796e47cd6df084523 SHA512 62d870e7b416ade4bee62d260c9518ada5077ceb8918ef40b5143d0644af1845f0e660208336e57d5cad7c63cc88ca1e6b185b0d3df9cc6c5ea4dae1efb3ab24
+DIST drupal-7.57.tar.gz 3279405 BLAKE2B 4697f5f30d5d2bbe821a766c2f0a05813fba091c1e976f0e0ca726e86a6d14633eecd586c29fd3a66001b143c641c74c277e90f13fd96cf14f02c38f0f9b43e0 SHA512 79e7e38c605cf60e458b2846ef4ce95f82368954f86fac6e79c19357e7a4ff714367c5580836ae2e45b22029d9ba2f2566901887d37bfa1ec2ed94a5a370fa0e
+DIST drupal-8.4.5.tar.gz 13414036 BLAKE2B b82753e320c3970d786ca10292b0aacbb3c5b6ba15dedf210144205b9e24bd25d3913453e70fc6736c34184dcc486f2323b39b9f6e60a3e8ec1b15bc55ae9c0b SHA512 105a6bce140b1f5965d42f46df4a8fa0f8802ae6b4efde5c095004f51beebe5f1c4d3064e3363f59f9a15f739ea598b2e9a03304630731113777b3639b3440d2
+EBUILD drupal-7.57.ebuild 1773 BLAKE2B bb8f2af7fc9709ba9b7db4801a96c8469bfbf0fe50bed09fa7d16528825165541665411a2f8bfe843d21b050ab2e8cf6789e874629b5a03d70e3dbcfebe0f7f9 SHA512 a34a9ab5d7fb21823fed786d36bda99bc43e9b2b22794f4c996d33adce4f822ae10caf1c3553a0180532b11093627f0cdbd048c922a089e274ab22d04e7f6aaf
+EBUILD drupal-8.4.5.ebuild 2428 BLAKE2B 25c1642182eb6eb60a10bb14c0f9b8948c3490e48ad8941829af38ef8ae0fc50d0964bb06574f89db9c3770861d3f759126f00331d18c8267e233ce2f5f7ba2e SHA512 d09fbb8edca7f954e88d4789f15a2d77f3d958cd256477d52553cacbe7e94f557b4367c3ea532915a51e57582de91aa822e9450cca16d6b2196435fdf4db7c90
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-7.56.ebuild b/www-apps/drupal/drupal-7.57.ebuild
index e740a5e30253..904fbef88e17 100644
--- a/www-apps/drupal/drupal-7.56.ebuild
+++ b/www-apps/drupal/drupal-7.57.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=5
diff --git a/www-apps/drupal/drupal-8.4.2.ebuild b/www-apps/drupal/drupal-8.4.2.ebuild
deleted file mode 100644
index d0f9fcc2d95e..000000000000
--- a/www-apps/drupal/drupal-8.4.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.3.7.ebuild b/www-apps/drupal/drupal-8.4.5.ebuild
index d0f9fcc2d95e..703cace2293b 100644
--- a/www-apps/drupal/drupal-8.3.7.ebuild
+++ b/www-apps/drupal/drupal-8.4.5.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=5
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 814addb483c4..19882dd28c57 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -3,8 +3,8 @@ AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743
 AUX grafana.service 651 BLAKE2B dcf0ddfcd2cbbc457f0dc7142a64c403c7657c30a7f85ab103828758c16fce8c6fc2e80a4f2f943393f3c226f873a2bce4b6df999fa4b178b3e95bf213688d86 SHA512 7bda41f0c6ee9ec0947ef6b8d4591453f797ac0256f9b67800249a6edf699e55855a9bd6f46501a86ffec5b5d2e1d8ac735657a0c63600683f61044e0bbc35d4
 DIST grafana-bin-4.5.2.tar.gz 50374607 BLAKE2B 0cb4fb5c6b2b465e7cc9ce1f99bf102cd8fc5bc1fad1d995393923e0d6e0e16dd3bd9858b6ad93fc178092e6ef32c1000d4928187d67ab2cdd4f8e9d5a0c71eb SHA512 9b650e204f90dfec7ea3ff723a937a3332064c3b5a00bebf3aca4cffe1fdccf83efbe5040c954dc82bc3389a4f5d72f7fa47941f43d022cbdf40e067f9c5adf7
 DIST grafana-bin-4.6.3.tar.gz 47187988 BLAKE2B 8d09f6569c8cc7b880fe852e0696b5d8b811d91a8aed360dffb40dc033e8ca756f7b37c6f2fd16d9925c33f2b7fcc4d279e31611fdb5aa7e4b24eee88cea0d38 SHA512 dad2c26b998910519cc462aa3dc91bd6d7ab6b7fdea9e1aa3c54ed5eb86830e9b8484434a5fd307f7ff490549509df97486249b301ccd84a7bd5b2de11ffe929
-DIST grafana-bin-5.0.0_beta1.tar.gz 52551303 BLAKE2B 442060a1a69e10c7694c742de386a6d05754a66baaa79b9e9e036b333e90a81da375b0eb1eaf753f30989f16899db35c07ac10bc37239217214600339ace6cc4 SHA512 013c13c43b1b60ccbb23d7fa57c9aa07e7a74895df745dc5c879a3423b1f8cf5129411c220dd06697bb13f6a13674b8b1b265b8d21ac0ad67da484a93e41f0f0
+DIST grafana-bin-5.0.0_beta4.tar.gz 51499427 BLAKE2B fe00d9f1ef5e248bcb33f338aba7294751f4f635ac96841a8902e5dfc988918505a204a0d733c68c2993bc72a61b769fff946421e8172152043baf279caa9b74 SHA512 b07c7e42d47e1782afa00f04805a1d4b7b119270602a885d93095ccb3455c99bb0c067c07442f973302069480a60c3c4cde51386ecc8cf0e5c40304ed1a9c21b
 EBUILD grafana-bin-4.5.2.ebuild 1750 BLAKE2B cb822beb7365474a21f49de6aedd9ffe31c80f99a5c3817b4c87f12cbc8390310cda5ec0f756e543d7d71970c809b5d21aff3a6a3dd377909e453e2f81c03730 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4
 EBUILD grafana-bin-4.6.3.ebuild 1750 BLAKE2B cb822beb7365474a21f49de6aedd9ffe31c80f99a5c3817b4c87f12cbc8390310cda5ec0f756e543d7d71970c809b5d21aff3a6a3dd377909e453e2f81c03730 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4
-EBUILD grafana-bin-5.0.0_beta1.ebuild 1764 BLAKE2B 4054bb9e0cf6f4c05504e35a10f569aa1d0faedb1b69b74bd968314e694f1a3c7ac7d5d6502afdb9c41c6f6775c58b9af0a145cc8bd94fab7162dd54602561ca SHA512 9e5b68ab1cdf549e6b909857975bdddff860e240a333c946911f38b260e6235d129e4c2707922234fbff36fa4b51a894c714c203dcd58c6a612091cf15fa209d
+EBUILD grafana-bin-5.0.0_beta4.ebuild 1764 BLAKE2B 4054bb9e0cf6f4c05504e35a10f569aa1d0faedb1b69b74bd968314e694f1a3c7ac7d5d6502afdb9c41c6f6775c58b9af0a145cc8bd94fab7162dd54602561ca SHA512 9e5b68ab1cdf549e6b909857975bdddff860e240a333c946911f38b260e6235d129e4c2707922234fbff36fa4b51a894c714c203dcd58c6a612091cf15fa209d
 MISC metadata.xml 299 BLAKE2B f907a1d524382aed556259ab450e2e6b9c927b7b07a975d468867855e3dc184d7d296a4f6f098a65598b377b2c46cab1c90dced667c7b0cdad16e156949807b1 SHA512 3c543eb4a0465af174a2a80650a542daead9f89685993575eef9ab826b98c84585184152f8ebc5e81fdafd9bbe24d63f467b251a4c9aeaaeef52408a1a3812df
diff --git a/www-apps/grafana-bin/grafana-bin-5.0.0_beta1.ebuild b/www-apps/grafana-bin/grafana-bin-5.0.0_beta4.ebuild
index cbcca07e13c1..cbcca07e13c1 100644
--- a/www-apps/grafana-bin/grafana-bin-5.0.0_beta1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.0.0_beta4.ebuild
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index c16bbd2396a2..b7c7f601e236 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +1,4 @@
-DIST icingaweb2-2.4.2.tar.gz 7180122 BLAKE2B d3018ab2bbb9cbe501c638208d7546640b83775ef86e340b61c9a83bc8f250060c34a7dae74cc983252ff05747d951107ff5c7857aaa44dc387ce513843c503f SHA512 2a6f80561b59fde1b7ca72b8a120f93685a4741e7af036a90cdd5a1371f8e6d6caa25161f136b379255032b16b21914325a26f078121743d1299e96e7685ef53
-DIST icingaweb2-2.5.0.tar.gz 8032968 BLAKE2B f0fab047da90ff514f715a8ddbf51d97beb1cd052513a523c63fbb97a424ecee8ff7b2c63a6e432cda3d70bdb1283641702d3ae1ff4146d084b312009ccdbe5e SHA512 9946c74033550accdc7077b3f77ce035931c72645871808ea488113d3545f8082460c1b8a4dffcb08f01d452fab54fd425e90e77cd006a7783b426132015498f
 DIST icingaweb2-2.5.1.tar.gz 8133540 BLAKE2B f5f9d2131f87160f7df5b34cae7e9b1036e14994f3b739607b26ba676e6cd56ad95ed5688c873df3232fc9782566b0bb5c2054aa04dd272b389a1eae8501af88 SHA512 8e76347f76a2b2889fb9a61c000ef7865f40b2ea261f59bfbf24bb8d0e4e7e2977ff283d31989f6892e371f4a9a4d4682a2cac3269070b2036cc37ea74af1b11
-EBUILD icingaweb2-2.4.2.ebuild 2549 BLAKE2B b20f1ce38a44e2066fe321d6d8a86a95976a52648c2d4ba0e24073e2040a755634c9747708c384fa29855e1ce3ab088eb39a9b644547fbed5d78632e239246db SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33
-EBUILD icingaweb2-2.5.0.ebuild 2549 BLAKE2B b20f1ce38a44e2066fe321d6d8a86a95976a52648c2d4ba0e24073e2040a755634c9747708c384fa29855e1ce3ab088eb39a9b644547fbed5d78632e239246db SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33
-EBUILD icingaweb2-2.5.1.ebuild 2551 BLAKE2B 26e99debb6314b95d285171683ef789e0b0d3d7a6368c0c29c6e182d4179f2fbeaf080f4807710c7b160a47088fe969bb9d374ea81ce31d497514f25b32d36e2 SHA512 fa11545bb44db98cb2ca1ff33ad1185990c8d5ee0a15a26db86a47cf77564099576ddcd79eb21467846d46554c8b29024d41bba06325adba7d9bc5854a6654c2
+EBUILD icingaweb2-2.5.1.ebuild 2549 BLAKE2B 3578e930824e6dee430d33190fb62f7074c6e8ed8d839f88abe840502d767441f8d156e869ff0a1c14ae3bd4af7fad423f43150ae18e439886df46e1e75510b4 SHA512 46ffbd0eccd4e880bc74398dc63c9f5d5c4a7423602cc81be889beac106e5090166aa838a3d0ea62a883cac4bdfef89bbfd888eb64a0f62b6dc84c317d204948
 EBUILD icingaweb2-9999.ebuild 2546 BLAKE2B a5a883a093e6a88e99d357b65a5d7367719d40fa98d7d8ab530147631448f033ec0858481575bb5a981f0126bf650d7862ea5c283ff9add93325ec640b28034c SHA512 fa08a2c6d47a9b1df8027dba57b7b8be8bad1980af3c45af52203435dc98ce28b47ec211691e241bda8913dcd77370004ef1b24622fabae8cc3d510f3f9decbc
 MISC metadata.xml 407 BLAKE2B 42e1ae67b6d8307c3af6ee7257eb811d893705aedd5852c4b33b103d77bbb4858d01bf8369511d7ce1cc187158482755894583d3b77be0ca7580043279f96461 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961
diff --git a/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
deleted file mode 100644
index 796ba177fbff..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 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]
-			)
-		)
-		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]
-			)
-		)"
-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-2.5.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.5.0.ebuild
deleted file mode 100644
index 796ba177fbff..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.5.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 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]
-			)
-		)
-		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]
-			)
-		)"
-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-2.5.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild
index f3513d784a28..f0f9dd8f5d6a 100644
--- a/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 ldap mysql nginx pdf postgres"
 REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		dev-php/pecl-imagick
diff --git a/www-apps/jekyll-gist/Manifest b/www-apps/jekyll-gist/Manifest
deleted file mode 100644
index 8998c1db0e0b..000000000000
--- a/www-apps/jekyll-gist/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jekyll-gist-1.4.0.tar.gz 7474 BLAKE2B f55a79fb8e09397b4e6eef59b3bbba504bc2e8179238c3743022250841a07805b751fe18fb1e1286abeee2720bf357ad4ff9374db496a3dbb16bad11ad001d8e SHA512 924d2b3175378ae32277717932556ec32035aa9ad229b2c0925809b02feaf657a16d84f81c9793e0c25d06f8c05a852c427a8f2bcd264a0a1dc7d030cb8adebe
-EBUILD jekyll-gist-1.4.0.ebuild 675 BLAKE2B ca68b630fda12306fdf9ccd04484db0e2c39a68fd3ea51f8f91c931d5ca9c5c8274635256652821ab879508187fbdc8adb3610914f3afed61d5533e472d82a2f SHA512 bbdd0c08b6b08413913f8ef835fe98fdc77e431bd90b6f4d74312644d68283b28a10eed0a3b77f63ebc0727270aa7ee802df27c67ffab7d23d0adb18a24a7b05
-MISC metadata.xml 250 BLAKE2B 53246d9806da1ba1d874c939d4dee21881e9390b5115e69a77fa15af71ea23c0192751cfaa50b7cd3676e2e8acebb544fb1374fd45ef3066b8e8177eb7582677 SHA512 1edc8986885d38177545b065421e83c2f5c5ac8b527475e733cbdbbf5cda27fb2f79e71589b891039f53e63b3171d3264fa1dba133f2c93ad2f025890cd745c7
diff --git a/www-apps/jekyll-gist/jekyll-gist-1.4.0.ebuild b/www-apps/jekyll-gist/jekyll-gist-1.4.0.ebuild
deleted file mode 100644
index 14fa2d17819f..000000000000
--- a/www-apps/jekyll-gist/jekyll-gist-1.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Liquid tag for displaying GitHub Gists in Jekyll sites"
-HOMEPAGE="https://github.com/jekyll/jekyll-gist"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/octokit-4.2"
-ruby_add_bdepend "test? ( dev-ruby/webmock
-	>=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
-	rm Rakefile || die
-}
diff --git a/www-apps/jekyll-gist/metadata.xml b/www-apps/jekyll-gist/metadata.xml
deleted file mode 100644
index 6503a3ea052e..000000000000
--- a/www-apps/jekyll-gist/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">jekyll/jekyll-gist</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index f557a142b1f1..e94d9f967de7 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,7 +1,7 @@
-DIST owncloud-10.0.4.tar.bz2 38584730 BLAKE2B 917aab96c330622a3c393cdc8379e68022e530f2e66fc10ba292c845e25921f64d82f74b1c544a1b3671998852dae2495d152987641fb35e13f83ac1d40477cb SHA512 898d67d5b37f1f85c285dacd312ffb40b82bcba5dc57519b893df4a7bbb1e1f41c2d15b05c710427977c087592502f5fc598547ea440716018865f249ea1ead7
-DIST owncloud-10.0.6.tar.bz2 39393658 BLAKE2B 34498d5c63a3417f9f42e55353884600c59a9b9e11167ef5b0dad3b496cfdcf091c95853dfcc851f767493483158a1a4b9e6bd291cddb95549b7fc07cce92618 SHA512 aaeb646255507cbe85de9f8e5f353479ee152f285e2c90ae48669a3fe78b718123105333d4b5c73478135fe2c940171dc8ffd732a9357c9709f391bcf01779d2
+DIST owncloud-10.0.6-r1.tar.bz2 39393658 BLAKE2B 34498d5c63a3417f9f42e55353884600c59a9b9e11167ef5b0dad3b496cfdcf091c95853dfcc851f767493483158a1a4b9e6bd291cddb95549b7fc07cce92618 SHA512 aaeb646255507cbe85de9f8e5f353479ee152f285e2c90ae48669a3fe78b718123105333d4b5c73478135fe2c940171dc8ffd732a9357c9709f391bcf01779d2
+DIST owncloud-10.0.7.tar.bz2 39395237 BLAKE2B c855913e60c214fddaa83e07278388501efd7510547cafb3ba7b87ca24086c2e603bec587dad52265ed824b6b67e4f6bef00ceddb9aaff3f9d9b468c306ea6af SHA512 5e644a92469ef0ea6e9996282a1013923301ed4252c7f337571134ab0d8bceb0c69765144d4ecbabf91e2edfad2e2842935a66cbcbbc64e9ea82ad4f83c6fa21
 DIST owncloud-9.1.7.tar.bz2 29243610 BLAKE2B 8a8a54c299df25c0f3fcca1accae3de7f27fe229d8175522fd2b72f3f865539219b733318b077455f80907b74fbd63d570dd73f40a61a5005415923b562ea819 SHA512 b31888c2c3e991869018a1cd46e75348b2b02d93effee8950d6e54568cd22eb634d750c790421e8bc0c1c991d146fb50c1826f4aa786e4a348f1d8fa5aa4870d
-EBUILD owncloud-10.0.4.ebuild 1263 BLAKE2B 45f7dc08cec8a325aef3de91a437818423e89d767e4abd0c47762d2c2c761ee06e73da2b8af67534df243ac45fc617ed9e77a6708ba7b0851cf615fdf4c7389a SHA512 7fdfe4e0d2bf89c0ea34b101aedecdc6b1409e369fb1bad576cad9199a17257b933a2adced22563ac6e0dc62660a21cd22775b3e2c2f09927e278c6791c96489
-EBUILD owncloud-10.0.6.ebuild 1263 BLAKE2B c1f0493e1f44c1acaaed6e5f62ad38d1a55695a01a8353cf5b82d206b031c1f9625e9c2c1f09d5834cff20d44606d7be01e5f92aed0fdac61fe82332a444f822 SHA512 1be4c2997410e9fa824e1b4c7a248d779df99a5c16d583a08288c15470e87e458254e45589886abc64d338a32eabf0add958a4357e65df96b1f45ffd0139809b
+EBUILD owncloud-10.0.6-r1.ebuild 1268 BLAKE2B b4f40061310548894fd841d488669ee1ee46dccc49a43cf0bd2a9e3389bdfb2fb60d60a5af194d440b6803b46db3b214503fe7e9612172b6343050626aeaa93f SHA512 fe26f3984d504eb3695fbcd6b91e4592e1d6b2e5eb69de1798885a3f2da308f232a02c58890efce827207ec022d4262f5945271fb2826c1ec8134efc40e221cd
+EBUILD owncloud-10.0.7.ebuild 1268 BLAKE2B b4f40061310548894fd841d488669ee1ee46dccc49a43cf0bd2a9e3389bdfb2fb60d60a5af194d440b6803b46db3b214503fe7e9612172b6343050626aeaa93f SHA512 fe26f3984d504eb3695fbcd6b91e4592e1d6b2e5eb69de1798885a3f2da308f232a02c58890efce827207ec022d4262f5945271fb2826c1ec8134efc40e221cd
 EBUILD owncloud-9.1.7.ebuild 1273 BLAKE2B 77b8e3c8c32516a15ffce26e1da47294efc36ebc4a8a3eb480f8934a73344a412211ec03cc51d2cc80f2325649e95379b6b67ac2e976a72489e4b67a970d041c SHA512 4220760318016c1202e7176bd19741ef502d24b6a0f156dfb3067bfa4e54d81dc088d3c9e255921731a9079fe1adc0ad317c1bad8d04e19fa5c8b169a84ce750
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.0.6.ebuild b/www-apps/owncloud/owncloud-10.0.6-r1.ebuild
index 50461ddbef07..5f42e8285829 100644
--- a/www-apps/owncloud/owncloud-10.0.6.ebuild
+++ b/www-apps/owncloud/owncloud-10.0.6-r1.ebuild
@@ -15,7 +15,7 @@ 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]
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
 	virtual/httpd-php"
 
 S=${WORKDIR}/${PN}
diff --git a/www-apps/owncloud/owncloud-10.0.4.ebuild b/www-apps/owncloud/owncloud-10.0.7.ebuild
index 2c070014fe55..5f42e8285829 100644
--- a/www-apps/owncloud/owncloud-10.0.4.ebuild
+++ b/www-apps/owncloud/owncloud-10.0.7.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
@@ -15,7 +15,7 @@ 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]
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
 	virtual/httpd-php"
 
 S=${WORKDIR}/${PN}
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index 84f14f5bf6ce..ced17114e61f 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,8 +1,4 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
-DIST postfixadmin-2.3.8.tar.gz 1600215 BLAKE2B d0f732d2d4f2e81f0e910d12f008141886cf555c8517109d690e5c49ccfb74c5bf1f1778700ba1769fd3d6202f8a79514fb4ab09f15a9bb7e3f08add89b93dc2 SHA512 96cd4212109a9459344dc017a397b0d6abcb8653c7aae4f40f913e9a49581d7f74bd92500046f8758e195bd24e63a3b2373c461edc96c67fa1d01f91f4f489c6
-DIST postfixadmin-3.0.2.tar.gz 1306500 BLAKE2B da57834bc6b5222e4e964b64ff90ade50c9a711690232963767e8f8a8f90e670c74b71bb366397355401c634f1cdda443ef7527718a5a69979c9d870bc8df98d SHA512 19db70cc59e8e41356e4cd632b0cb9df8d8de0f0451e7e2c84d61a0aa6ede5cc93bbf8914786a2eec012e4c013ad130a001d143ce869aa54b54a50fb798ed92b
 DIST postfixadmin-3.1.tar.gz 1279224 BLAKE2B f37fd9e34e5eb88a82c10a0b80d5593a7451f407948454a064209ba9150192b7026645774b97b0482488814d6abeb25b6a800c2f7fe12a7a768e711919b94852 SHA512 a3e1ecb3ac4ff4d604533bce532694bcc304b9b3d3e1b1ec840be6d007027705113f067393486f58908dd3846332ecf59c9c3c1a5123d03aa088f47593a75812
-EBUILD postfixadmin-2.3.8.ebuild 2774 BLAKE2B ea4e8fc724adcb931aaec91202777bb1d626f32934eb8094ab9745dfeccc66d806bc2b8cd3df0ede735b1443bcf749cabec3918ba1188b53fd015cd9e95a5498 SHA512 6a87a80fe823fd5a66cab4ab0db985b0afefb3bf365e8faa22ad0d118add71acaa3f2f338883a5a7e4c2d81e4ecf5b45c2688a810cd681f14b91f65c2f130950
-EBUILD postfixadmin-3.0.2.ebuild 2785 BLAKE2B 154ce95ab28e0ac89cda0bc83e3f984e12a8d84de0ddabd1c3b3d38d7b0ed7560ab493dfe8e0d78ba00cb0735cae9977bd40beaf3512f539b0d6c6f3a96b2552 SHA512 8d5ac164a30daf1eee14cfbefe7a4edf378134609e85e4091ddc147752ad4ff624bb70e83426807d9b43912c5519a75dcd5faa7f705015c789c6f811323d1008
-EBUILD postfixadmin-3.1.ebuild 2731 BLAKE2B b5c6f2c9e989537c2cbb800d9ec3510b46686a8098300a2819f2e9e24dbb5711e9542afab2d5195c935c439255bbe766bbd693980dc0052bcf40902bd32d2fd1 SHA512 d31e8e69b150b4c82b1f70f5c9aa1feac0b81384bac71ee7cb893cdef12c6096f037e821a9f14968150544c50ec75b4d2206ef46b911dda2cb1698d68c786e39
+EBUILD postfixadmin-3.1.ebuild 2730 BLAKE2B 1e0a03531fe89c6d9ca402c398217786be09d6f3680550831e6fe75f5f0b734481042d977ea57acb8a98f5070f3b594915aa85e95c31edcbc6e39491a53dfd1b SHA512 678f0c415ea5b3d82d3a497671b5ceb94530b9dd3931e1d6138ca1b1ebfbe91831c6c06dec17d15c5e2a9a75f76f768959d5ea0dd99963b2fa19cab4aaf5121b
 MISC metadata.xml 536 BLAKE2B 0ec01f47f106656e1b98ca14d8b531597a34cfb2fd261c93c775d7dd3b0a08155e9e912a20a2330946697418898ed08d9be6f8409edb5e1ef6009cafddde2437 SHA512 4657f3ae892ad55572ac39f23cebcef58480d4ff608150c75d2cf3f0046b5e0a2861f9bf8dfffd45aef580675feae11a05297a7a99f63997d43ab703372ddf4a
diff --git a/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild b/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
deleted file mode 100644
index 8be06195e4c4..000000000000
--- a/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit user webapp
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
-HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+mysql postgres +vacation xmlrpc"
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="vacation? ( dev-perl/DBI
-		virtual/perl-MIME-Base64
-		dev-perl/MIME-EncWords
-		dev-perl/Email-Valid
-		dev-perl/Mail-Sender
-		dev-perl/Log-Dispatch
-		dev-perl/Log-Log4perl
-		dev-perl/MIME-Charset
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg ) )
-	xmlrpc? ( dev-php/ZendFramework[-minimal] )
-	dev-lang/php[unicode,imap,postgres?,xmlrpc?]"
-
-RDEPEND="${DEPEND}
-	virtual/httpd-php
-	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if use vacation; then
-		enewgroup vacation
-		enewuser vacation -1 -1 -1 vacation
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	if use vacation; then
-		insinto /var/spool/vacation
-		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
-		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
-		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
-		dodoc VIRTUAL_VACATION/FILTER_README
-		newdoc VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
-		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README} || die
-	fi
-
-	insinto /usr/share/doc/${PF}/
-	doins -r ADDITIONS
-
-	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
-	dodoc ${docs}
-
-	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	if use vacation; then
-		# portage does not update owners of directories (feature :)
-		chown vacation:vacation "${ROOT}"/var/spool/vacation/
-		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
-		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
-		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
-	fi
-}
-
-pkg_postrm() {
-	# Make sure we don't leave broken vacation.pl symlink
-	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
-	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl ]] &&
-		path_exists "${ROOT}"/var/spool/vacation/vacation.pl-*; then
-		ln -s $(LC_ALL=C ls -1 /var/spool/vacation/vacation.pl-* | tail -n1) \
-			"${ROOT}"/var/spool/vacation/vacation.pl || die
-		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
-		ewarn "recent verion, but please, do your own checks"
-	fi
-}
diff --git a/www-apps/postfixadmin/postfixadmin-3.0.2.ebuild b/www-apps/postfixadmin/postfixadmin-3.0.2.ebuild
deleted file mode 100644
index 9cef0cdd9d38..000000000000
--- a/www-apps/postfixadmin/postfixadmin-3.0.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit user webapp
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
-HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+mysql postgres +vacation xmlrpc"
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="
-	dev-lang/php:*[unicode,imap,postgres?,xmlrpc?]
-	vacation? (
-		dev-perl/DBI
-		virtual/perl-MIME-Base64
-		dev-perl/MIME-EncWords
-		dev-perl/Email-Valid
-		dev-perl/Mail-Sender
-		dev-perl/Log-Dispatch
-		dev-perl/Log-Log4perl
-		dev-perl/MIME-Charset
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-	 )
-	xmlrpc? ( dev-php/ZendFramework[-minimal] )
-"
-
-RDEPEND="${DEPEND}
-	virtual/httpd-php
-	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if use vacation; then
-		enewgroup vacation
-		enewuser vacation -1 -1 -1 vacation
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	if use vacation; then
-		insinto /var/spool/vacation
-		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
-		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
-		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
-		dodoc VIRTUAL_VACATION/FILTER_README
-		newdoc VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
-		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README} || die
-	fi
-
-	insinto /usr/share/doc/${PF}/
-	doins -r ADDITIONS
-
-	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
-	dodoc ${docs}
-
-	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	if use vacation; then
-		# portage does not update owners of directories (feature :)
-		chown vacation:vacation "${ROOT}"/var/spool/vacation/
-		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
-		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
-		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
-	fi
-}
-
-pkg_postrm() {
-	# Make sure we don't leave broken vacation.pl symlink
-	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
-	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl ]] &&
-		path_exists "${ROOT}"/var/spool/vacation/vacation.pl-*; then
-		ln -s $(LC_ALL=C ls -1 /var/spool/vacation/vacation.pl-* | tail -n1) \
-			"${ROOT}"/var/spool/vacation/vacation.pl || die
-		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
-		ewarn "recent verion, but please, do your own checks"
-	fi
-}
diff --git a/www-apps/postfixadmin/postfixadmin-3.1.ebuild b/www-apps/postfixadmin/postfixadmin-3.1.ebuild
index 51746c903f8d..3e69bc6b6573 100644
--- a/www-apps/postfixadmin/postfixadmin-3.1.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-3.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://postfixadmin.sourceforge.net"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+mysql postgres +vacation"
 REQUIRED_USE="|| ( mysql postgres )"
 
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 6401e1d3b5ef..bd3d377df630 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,5 +1,5 @@
-AUX radicale-1.1.1-config.patch 841 BLAKE2B a21d34a08108de5f90470def9239ed667063691c17d0bb000a0b07dfdef58888a6623c29e661b84bc7cca9d3b373dfa7ce8fd0e7e658de36a9bce5ef88555d8d SHA512 193a15a2d0a80a5518275aecc42dcb2c27c68bc7d98666ea3607ca1901d1d84fe8fa5a7f4cb10e83db1b00ca94f3b592fd0ed4fb8d3f2b57c66dc707f5fba3c9
+AUX radicale-1.1.6-config.patch 841 BLAKE2B a21d34a08108de5f90470def9239ed667063691c17d0bb000a0b07dfdef58888a6623c29e661b84bc7cca9d3b373dfa7ce8fd0e7e658de36a9bce5ef88555d8d SHA512 193a15a2d0a80a5518275aecc42dcb2c27c68bc7d98666ea3607ca1901d1d84fe8fa5a7f4cb10e83db1b00ca94f3b592fd0ed4fb8d3f2b57c66dc707f5fba3c9
 AUX radicale.init.d 564 BLAKE2B 370d68329a2507c4b96766597851f1c5de13df492422212df3739eb4a5444ce537cdd23ea5d630ae51795979d69f521054c41a968585ffa671d8624aac176e53 SHA512 670de8a2d0d5e29b68c1e177db20d13874722f2ac9d96e746e59cb47181e206b4d249a5f9c4411acf4abe49ec44d93cf452b9100470e5374f3fe8e3c0dc000aa
-DIST Radicale-1.1.1.tar.gz 47174 BLAKE2B 60b2ccff2a2c604becc8c4c40d106c467f43be93593471732528cf1939165451702aa6e0ed8435584eb1202072fbe82a9afecd292b6365143d095f784e7eecb5 SHA512 dc251d8fa4d347c2bbcf472b7a2da94d674f858a007fec1d74774cd1f3ae43eb2d5902ed45762638ec49546b8ee1f66446d07b50fc0ff6595deb67ea07f87af2
-EBUILD radicale-1.1.1.ebuild 1650 BLAKE2B c6697561ad389acc18fd82185501621efdb6dc40cedfe80a926f46050806ac4fbe0ceb9d5e7637edf104778dea9891dcb580b848e51bf562ac8983cf0c42681a SHA512 8cbf22e414475d004c24f985930dc466a9960571790c1ee133573e994b2afb03ee00d5b6b29fd217e0bd0c8732d706f051d549add80941969c87d282b8bfbdb3
+DIST Radicale-1.1.6.tar.gz 48280 BLAKE2B 38d3047d473fad24188b597a57d3e1f0e34df03f00f6806b86c447ed731be074bf0b5f6dfb951c8a9f627993bf0763792150bc06532414a658e4d306123fcdd6 SHA512 3fed85fc5fa2b041277112870b8b508a22cc85ec0680dd1cf9411e73715e18a9b0ddd651eafb0c9529bd308e7fd87ae44ecdd82935f4062050919780301d56d9
+EBUILD radicale-1.1.6.ebuild 1683 BLAKE2B 386c82908412da38c77769ce2c5de0741b57459d0cc9ee549e63cab527994950466a65cee20cf110098aec85bd6a2c386cdda02721b450be7dac983e53d6d786 SHA512 887a4d28b3e0d895240e12d8a8a38c21d727fdcd0f0e44cb748c927e3794aa53e34df1acf952f1f2b78e79c520cec2a1446c2f943efc5838e0f2fd23bc270783
 MISC metadata.xml 350 BLAKE2B e2f087a4520fba1ea802662a7baa7299049c4af2170d5096fb320fe910ac5ddbff12817257fed9d18281a942e87b203675df173504a127c4f6c57aee3238b3e9 SHA512 3f8e0eecc8780b629878668cb1cbbb58ccc974f3467e2d919453233caae3b4d903ca191d7cc9b9d2f43d3f91583d734f7da04ac6f4f730b923d7e69bc271da4d
diff --git a/www-apps/radicale/files/radicale-1.1.1-config.patch b/www-apps/radicale/files/radicale-1.1.6-config.patch
index 4eb286f8d400..4eb286f8d400 100644
--- a/www-apps/radicale/files/radicale-1.1.1-config.patch
+++ b/www-apps/radicale/files/radicale-1.1.6-config.patch
diff --git a/www-apps/radicale/radicale-1.1.1.ebuild b/www-apps/radicale/radicale-1.1.6.ebuild
index 4d26a7cd7950..702c9e9c1105 100644
--- a/www-apps/radicale/radicale-1.1.1.ebuild
+++ b/www-apps/radicale/radicale-1.1.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
 inherit eutils distutils-r1 user
 
@@ -11,14 +11,17 @@ MY_PN="Radicale"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="http://www.radicale.org/"
+HOMEPAGE="http://radicale.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+DEPEND=""
+RDEPEND=">=dev-python/vobject-0.9.5[${PYTHON_USEDEP}]"
+
 S=${WORKDIR}/${MY_P}
 
 RDIR=/var/lib/radicale
@@ -41,9 +44,11 @@ python_install_all() {
 	diropts -m0750
 	dodir ${RDIR}
 	fowners radicale:radicale ${RDIR}
+	keepdir ${RDIR}
 	diropts -m0755
 	dodir ${LDIR}
 	fowners radicale:radicale ${LDIR}
+	keepdir ${LDIR}
 
 	# config file
 	insinto /etc/${PN}
@@ -58,9 +63,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	einfo "A sample WSGI script has been put into ${ROOT}usr/share/${PN}."
-	einfo "You will also find there an example FastCGI script."
-
+	einfo "A sample WSGI and FastCGI script are in ${EROOT}usr/share/${PN}."
 	einfo "Radicale supports different authentication backends that depend on external libraries."
 	einfo "Please install"
 	optfeature "LDAP auth" dev-python/python-ldap