gentoo resync : 25.08.2018

22 files changed, 257 insertions, 802 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 6b98d75358f4..d3d27b44475b 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index c8c8805a028d..ea15d91129f7 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -7,4 +7,4 @@ DIST gitea-1.4.1.tar.gz 14978598 BLAKE2B 8fde79291b745750e79c944e7fcf938d2476dda
 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
-MISC metadata.xml 324 BLAKE2B 66e4bf11fea6a0b4a0ca353849e1a4aaf32c0a1680c36f1e74fe155705806a822c277487f551e82ad0a3740b4faf9f1f8b2b2ce24781774da6c9f21a3f094f57 SHA512 7b0e56ffe4652157a5126ae7cb7cc6b557ec8367dac02c28f69243181147855dc0e96fe09dd7ff507052a7f5382445deb98090175e06d030fe635990812820ee
+MISC metadata.xml 246 BLAKE2B 291057fd61e77f8d99f9518e3f709d79ab79ac5ac5ce1387d27a26cec6272698fe6bda7cfacaeb203411413ed003c71cdaead8316cd9e5a2c1ce1056637eaee4 SHA512 9af718c7e0ca960324b9fc168e85824099a5434a322d7da78dabc90b8cd3be2201a3eb321facd0df575fa1d0865c1f80280d290589f0ff1d27bdef575297abb7
diff --git a/www-apps/gitea/metadata.xml b/www-apps/gitea/metadata.xml
index 0cb7df9d1ee6..7dc0896c7b07 100644
--- a/www-apps/gitea/metadata.xml
+++ b/www-apps/gitea/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">go-gitea/gitea</remote-id>
 	</upstream>
diff --git a/www-apps/guacamole/Manifest b/www-apps/guacamole/Manifest
deleted file mode 100644
index 45e7df43f352..000000000000
--- a/www-apps/guacamole/Manifest
+++ /dev/null
@@ -1,25 +0,0 @@
-DIST guacamole-auth-jdbc-0.9.7.tar.gz 2997194 BLAKE2B a1e3f8e6813f4883031b8e01fcededfb30d63b6791ac85971e12e6b7bfae49e362904bbe516cb82dd5b66f3cb2b4a51876346d6fc6c55128767d2e5ce70a87de SHA512 0bfa920fed4b5baabc6f5541d9a5badc0a88c51e95675f00889d9d6f7a2069b07f0bee4ed628b82a4c243dd0a8fb1646a5ba6f822ca5704b1f60b49f3a2fd698
-DIST guacamole-auth-jdbc-0.9.8.tar.gz 7018542 BLAKE2B 3d12b4a813e29132dc25836a9f7cafcae20081cc7ab27f9616d883ca4766dca41f7c810319941536719c85a6c86978fd529c77aa39f39bfeb227123dfd6772ba SHA512 c1c1a4f0f33a46108a45c826ad075825846838ad05205579024820f4737db6c96e35c5be3d20c78a0e088cecc08738369bdcf00c6efd43307848a71c710aa394
-DIST guacamole-auth-ldap-0.9.0.tar.gz 382885 BLAKE2B 0e343918f2543fa3de3a10e712b3b3583fc390196bb7d6afe5e5b8d5230488460e879c279904f675ae2d0f03925b5f740f4b226a751310dd7c5f13aae2998e72 SHA512 caf228029a4e69ac1ac1f252c761167c1676eadbb362877753710aa28d274f76ed8091102f5a142b871dc7a7e22f98d113c18fa06e46dfbf6ec57c3ea92b435b
-DIST guacamole-auth-ldap-0.9.2.tar.gz 382892 BLAKE2B e682763332d96969c4471d8c6fd7f9a9e90a3a4315dba457da8fb8fe5170456c15b6461a23caeafbfad78b4ae4e41c99056f9c3e6597c587d5e8304b014212f3 SHA512 7ff6ed8aeac872aebfe654992208342370f991eabd141ac102ea553cc94b8c69c382344b5c8419745bcdc8f83b77d9b72577c8ddef9e2d000549a5fb1ae70617
-DIST guacamole-auth-ldap-0.9.3.tar.gz 382919 BLAKE2B 1d1178d29b01081e234d13881a9f81870a00210dc2c394fad1a9367ac4bd48677bf53c2092889988f5cb25bad7fa80a637d1c17593c08d55758735d1cd813e35 SHA512 e3eebeafd841d304f4c2beb21c1d54327bf0af2201794685c008d1812f05e70c8389888eec1e417c7e08600ebaf6f7f7330cddcf5176c9a12c987ba516155ebe
-DIST guacamole-auth-ldap-0.9.7.tar.gz 384154 BLAKE2B 4bba6252479e5e000a1eacce34ae7f408acbf49caa58ad277dcc41e9b88b4b9fc8bd5e775408bb7f50e1bf9520c580a2050b4f1d40787f4b23943dfdae20ed1f SHA512 e750a89059a247ac17c7d137f8b7e03f43673a82559b91a39d0d1e69c94bb8212f7a17c335ec69f3c7d892c8ad0aaa746f50dfd247202468fc6c880e9126f1d2
-DIST guacamole-auth-ldap-0.9.8.tar.gz 1055810 BLAKE2B e1d4ed52c720641c776611575e961afd2ba45b82d76e2181267876af8c398640f41a2319f738db32927cb0d842676ed9801751b6000ca601932259263d4e29cd SHA512 b13947581dfad5b25a423369867c1a98327fd9a6a2124c12fe16c68700caefec217f18d01a1436419cb60dd43bb7f2126f5e47f3aebd069b2ce6a46759c0b402
-DIST guacamole-auth-mysql-0.9.0.tar.gz 2104231 BLAKE2B 700a4364ba7823041304df95954b237a2d2601f4124bf739f7a3ce111ee9d93a7bf88f3b51794de077b16e41d4a320c337aecb4ccf6dd5b4960eb3ff6a953b55 SHA512 00cc09e75f8c977a2465759b97022007fe34ba9272f9b9004eec404419a68b8c0b301fc385b4f09af07bde82510a6f5b808585c78a61b26cabd98529a5b1c4fa
-DIST guacamole-auth-mysql-0.9.2.tar.gz 2104317 BLAKE2B 6dfc07060404186c5404740a70fb6147b1e3f90311f5f9b1c1725ef7522a1442d5f5ccebc0754be89c0fdf4b90379de64cc1de42993c586dc383cf0a2c58e7eb SHA512 4422358b1ced34ca468f130807da6f8d7c65f39a0c3e1c7eecf004803ca62ccccda07b5a7a2b72f4b4e8337ad60783e5514af6318c2cc38f37397ba14cd2f552
-DIST guacamole-auth-mysql-0.9.3.tar.gz 2104479 BLAKE2B 3b648d799780cd033e82f7fd26368b07569cae404e5e4356c0fec962c6ca1488d36372636e8aa08052f77b000ccb16b67a74fa113c8330909b4d94e7611778fb SHA512 b33e1228b261e3857c385260a15f7b3b6088bdcaf2785f837b9525c5469a7af6560610c8064614b438160d98e349487037d78c11737dbef6a83be6b41bd37e4c
-DIST guacamole-auth-noauth-0.9.7.tar.gz 5810 BLAKE2B 2bf85134b01e9e6124ad2cb75652b143e5269294f5fedaef076c08e1946870365c099939fbfbfbbea22ee177c985ed8afe884346eb57ba9a840b4f7ef506b911 SHA512 1f5e6f0b9e035c75edc556ff47a73e8e6e047369306e00e1281a97ac4896c7563b41dfbd66c89926d972e01a5aee3fdd9c0214d91cb84a83f177a4e3df05d537
-DIST guacamole-auth-noauth-0.9.8.tar.gz 6011 BLAKE2B 216f6f9148376fd21f2894862ee5cdc63e5e4eb3637e11cd3dd5d093489347cdf8d2d98d982085db8d98125d4d47a5ff9ae21740a3e01171373be3a58cfab34e SHA512 481f7ee88cbc7989734afb23cb9807d2cab71846ecdd17475f0e24afab5d3cd82040d5f448abe3eb01bfd828b9d834a753e0f0ec573b8b8c863fe5e2718ad1a2
-DIST guacamole-client-0.9.0.tar.gz 314566 BLAKE2B a95d29b8bb452aaf74ac3bf50bf26126a557ebb6c193492eac2514396fb81b0632d1ed44b036df3b90cb4d2f95f71ecaf5664604c7873d3c063f6d12601f6286 SHA512 33dd583cde9188066f0254fe9a531886be79110ef9f0e62fc60771d2751a927f783eb484e5484760e4ed3bc2aaa1f2000f43f953b78122cbdc2b0f19d8141457
-DIST guacamole-client-0.9.2.tar.gz 386263 BLAKE2B cff50d36179a386b7c049f3f916b2ed0276849ee9608742c211cc165cc853734bb45e05c616d0e440449d14fd9d6370e2ef23cd49383cc9ba9bb061021bb95c3 SHA512 e9e73b23b64883c64a1bd0908ecc9e685dc23308c3d44bd2c9c691e43fe383424bfc14816d0248b0f2a693da473a3a780a2d2469024aae53587b67f78d0b0af6
-DIST guacamole-client-0.9.3.tar.gz 396313 BLAKE2B 1696160120a9ea728004fff3b6aee6d059e43cff8e0eb0f33594c5e8ff1d79e93a83833a2a21f747b9188caed6f94e165b669b648408b4fd7d7f88ad1685874b SHA512 4ec3ec74b1175ce6b3cde4b9669a3f54f21b45c489c592ea3cabd2af670bf0ec9449f8a368d416640ed7348e77c23ad05243b4fdff083a120f432053642f7727
-DIST guacamole-client-0.9.7.tar.gz 1580766 BLAKE2B fda61241f9bcafcff16b99583d2841482b51989b0412dc2edb0a7bf89f7aa22f76cddc79859c02f942d4e7a39c0284961ba1eec8a11429790bdba19ec6064cf9 SHA512 eb9d9be14e9a55192c2e341fbd9b07d3cf1b3f4f06dbe97cdb5ca5d624362a895a6369100859716d9cf65562fa251424c9b3a36c2a7d4812bfb2814ab96dc5c3
-DIST guacamole-client-0.9.8.tar.gz 1685223 BLAKE2B d7ff0558d79227a896dfada2a6d745e0d137aed2ac5a668dc1660079643233dd73e1513ba38a03c044ee14830428c4d63d706b5715669fc78894681f7b58a2e9 SHA512 e8152a10c8c51b0adff93ee476287e3c264ddae4de4b581a43009d8613e8cc2276ddd1ff5a53e84d74ff19901ec82433321d176e1335b4445dcbed04afe6f9f8
-DIST guacamole-client-0.9.9.tar.gz 1725944 BLAKE2B 97d8253531880f44c68e16766cab741a9e6424487469f40cd0a172cb622cb3a3473299640f7e9df8e2c10c7fa94fdb5e99eec0c6afe012b1d541e272125842d3 SHA512 109fe04fd9c072f6abfd31ba64c91b79dc6ef56562086bfb0db5d05feda436917eaf4d01b3b6e542bf2c6e1a56ab395a215fd0a1611cc0c2f87db925a14cf0e5
-EBUILD guacamole-0.9.0.ebuild 4870 BLAKE2B b7f504239425c7861f8165ceb5a0252562efee605d4f7e9635c220a74f707d7834e406c883cf2a2ad403c78476552e79d6ef1f60f74394e46618a7913531f5a8 SHA512 4606c2ef307102dde46dd8fbe6f9d0f223b434eb2bd5030a3e2630b84c513e3ced06d51c2a1d8ec1842307d07db07e44d4a26f57400a446ccbcd071e05a66de5
-EBUILD guacamole-0.9.2.ebuild 4865 BLAKE2B e886bdc67fc71a0a94390ce7e8e259d2888a43e2e2aa1bfb91669f273267a3358db71de17711f1717540bfa55e8669ecf825ea99af4f6b896c74f6e3fdfcc479 SHA512 47714e1f6d183f8edd3124e64fb92372bed4219bc9470c04a4c65841b2870c327c8676bda8b37ad988349985be951841d4965d9e61492da8e4fb93d788de260a
-EBUILD guacamole-0.9.3.ebuild 4865 BLAKE2B 5a43da92b02b969a917110e137ebd8daa4c27887ee2c6ad493ee7f97a70b6ca38e81af61e8eb4e27cef22ee376e73917cfe20cef8a9323c23df6537d94d2092d SHA512 5c23f5294da2c664198c5bf9475556f52b5ebb6aebba1fff52f1294f9e3d3f2497fe17a63a2fe9df54c59506c36fec1ec6ef8a70b68117e48224351503d34c1d
-EBUILD guacamole-0.9.7.ebuild 7932 BLAKE2B d7e16ab777f3de7a773c5990a12c6b51236116e23956ed632d4dca141cc9bb08d3414720ba8cf953802f3a86b29388a1cc6863b4acdcc1598773f4496b94ddc6 SHA512 58e27d210ef895dc9876951daa87a5c8d0030a6744d9b1e39d9152e9ff2b7948833c4d5692e4ac4cfee5be6d4af2a82ba4fa8e9219718ee59d516d7bff1675b7
-EBUILD guacamole-0.9.8.ebuild 7004 BLAKE2B f3bdd627efe2e72159f5d93521ed7a00e51a01bb70ab3fa26a1cd0248d678b4862d76438308279cdd9997e4913027b6965fac1587d9e0e6cf5b677ae2a3651fb SHA512 f40f02ea24c9f6cd9f79338afb8e1ccbd6c39bb767187dc766f1153bfe966ffa8031c74d238bec4666642ffafd818bb71c1b2d500798db5881df6216980e1112
-EBUILD guacamole-0.9.9.ebuild 7217 BLAKE2B 143cf8691d2eae4ec71843d6b4d0167d214f30ff3f4063b1c698e2ca768146bdae9d3fa3c68dae3bc0cfc02f86f1687c740d94ebba298123ae450131c3fd8e62 SHA512 ca763668ec1a8d3783fb199eecceaa2114861b3762c3ff8206c01a54fb79e829b9d03d3bb42c31a9cc038f906f379ae6f8131a7dd3c1f18585150f074322fbf5
-MISC metadata.xml 841 BLAKE2B ba3b99b8df2c3dde0893318cb7fa63900b9996bd10fb936e0845e6c5df1e1a0cf2e49d2a4ca1302caf9ff841fec1fc9e3bbaf4ed503e7938f9bd0b31358cee7e SHA512 6914fd09cc241861fcb39f370540399b91cb5e0c84ffe27c95178d779007e7a93a9e27308418f9047a3fd7dac19a1d79253a1aba8fe69de76f3c2a97d286ba3a
diff --git a/www-apps/guacamole/guacamole-0.9.0.ebuild b/www-apps/guacamole/guacamole-0.9.0.ebuild
deleted file mode 100644
index fa765ea1ee92..000000000000
--- a/www-apps/guacamole/guacamole-0.9.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-DESCRIPTION="Guacamole is a html5 vnc client as servlet"
-HOMEPAGE="http://guacamole.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
-	mysql? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-mysql-0.9.0.tar.gz )
-	ldap? ( https://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-0.9.0.tar.gz )"
-S="${WORKDIR}/${PN}-client-${PV}"
-
-LICENSE="AGPL-3"
-
-SLOT="0"
-
-KEYWORDS="~x86"
-
-IUSE="ldap mysql"
-
-DEPEND="dev-java/maven-bin"
-
-RDEPEND="${DEPEND}
-	www-servers/tomcat
-	>virtual/jre-1.6
-	net-misc/guacamole-server
-	mysql? ( virtual/mysql )
-	ldap? ( net-nds/openldap )"
-
-src_compile() {
-	mkdir "${HOME}"/.m2
-	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
-	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
-	mvn -s "${S}"/settings.xml package
-}
-
-src_install() {
-	if use mysql; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-mysql-0.9.0/lib/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		find "${WORKDIR}/${PN}-auth-mysql-0.9.0/schema/" -name '*.sql' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema/upgrade"
-		find "${WORKDIR}/${PN}-auth-mysql-0.9.0/schema/upgrade/" -name '*.sql' -exec doins '{}' +
-		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
-		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
-		elog "The default user and it's password is \"guacadmin\"."
-		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
-		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
-		elog "-"
-	fi
-	if use ldap; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-ldap-0.9.0/lib/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		doins "${WORKDIR}/${PN}-auth-ldap-0.9.0/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-0.9.0/schema/guacConfigGroup.schema"
-		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
-		elog "There is also an example .lidf file for creating the users."
-		elog "-"
-	fi
-	sed -e 's:/path/to:/etc/guacamole:g' -i "${S}/${PN}/doc/example/${PN}.properties" || die "properties sed failed"
-	insinto /etc/"${PN}"
-	doins "${S}/${PN}/doc/example/guacamole.properties"
-	doins "${S}/${PN}/doc/example/user-mapping.xml"
-	insinto "/var/lib/${PN}"
-	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
-	elog "Please unpack /var/lib/"${PN}"/"${PN}".war in to your servlet container! If it is an update,"
-	elog "delete the old content first!"
-	elog "Read: if you use the command below, delete everything within /var/lib/guacamole/guacamole first!"
-	elog "Please also link /etc/guacamole in to the lib directory of your servlet container."
-	elog "like this:"
-	elog "cd /var/lib/guacamole && mkdir guacamole && cd guacamole && jar -xvf ../guacamole.war && cd .. && mv guacamole /var/lib/tomcat-7/webapps/"
-	elog "ln -sf /etc/guacamole/guacamole.properties /usr/share/tomcat-7/lib/"
-	elog "You will also need to define users and connections in /etc/guacamole/user-mapping.xml if mysql is not used!"
-}
diff --git a/www-apps/guacamole/guacamole-0.9.2.ebuild b/www-apps/guacamole/guacamole-0.9.2.ebuild
deleted file mode 100644
index bbb158af9e3f..000000000000
--- a/www-apps/guacamole/guacamole-0.9.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-DESCRIPTION="Guacamole is a html5 vnc client as servlet"
-HOMEPAGE="http://guac-dev.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
-	mysql? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-mysql-0.9.2.tar.gz )
-	ldap? ( https://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-0.9.2.tar.gz )"
-S="${WORKDIR}/${PN}-client-${PV}"
-
-LICENSE="AGPL-3"
-
-SLOT="0"
-
-KEYWORDS="~x86"
-
-IUSE="ldap mysql"
-
-DEPEND="dev-java/maven-bin"
-
-RDEPEND="${DEPEND}
-	www-servers/tomcat
-	>virtual/jre-1.6
-	net-misc/guacamole-server
-	mysql? ( virtual/mysql )
-	ldap? ( net-nds/openldap )"
-
-src_compile() {
-	mkdir "${HOME}"/.m2
-	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
-	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
-	mvn -s "${S}"/settings.xml package
-}
-
-src_install() {
-	if use mysql; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-mysql-0.9.2/lib/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		find "${WORKDIR}/${PN}-auth-mysql-0.9.2/schema/" -name '*.sql' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema/upgrade"
-		find "${WORKDIR}/${PN}-auth-mysql-0.9.2/schema/upgrade/" -name '*.sql' -exec doins '{}' +
-		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
-		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
-		elog "The default user and it's password is \"guacadmin\"."
-		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
-		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
-		elog "-"
-	fi
-	if use ldap; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-ldap-0.9.2/lib/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		doins "${WORKDIR}/${PN}-auth-ldap-0.9.2/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-0.9.2/schema/guacConfigGroup.schema"
-		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
-		elog "There is also an example .lidf file for creating the users."
-		elog "-"
-	fi
-	sed -e 's:/path/to:/etc/guacamole:g' -i "${S}/${PN}/doc/example/${PN}.properties" || die "properties sed failed"
-	insinto /etc/"${PN}"
-	doins "${S}/${PN}/doc/example/guacamole.properties"
-	doins "${S}/${PN}/doc/example/user-mapping.xml"
-	insinto "/var/lib/${PN}"
-	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
-	elog "Please unpack /var/lib/"${PN}"/"${PN}".war in to your servlet container! If it is an update,"
-	elog "delete the old content first!"
-	elog "Read: if you use the command below, delete everything within /var/lib/guacamole/guacamole first!"
-	elog "Please also link /etc/guacamole in to the lib directory of your servlet container."
-	elog "like this:"
-	elog "cd /var/lib/guacamole && mkdir guacamole && cd guacamole && jar -xvf ../guacamole.war && cd .. && mv guacamole /var/lib/tomcat-7/webapps/"
-	elog "ln -sf /etc/guacamole/guacamole.properties /usr/share/tomcat-7/lib/"
-	elog "You will also need to define users and connections in /etc/guacamole/user-mapping.xml if mysql or ldap is not used!"
-}
diff --git a/www-apps/guacamole/guacamole-0.9.3.ebuild b/www-apps/guacamole/guacamole-0.9.3.ebuild
deleted file mode 100644
index 4388582a470a..000000000000
--- a/www-apps/guacamole/guacamole-0.9.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-DESCRIPTION="Guacamole is a html5 vnc client as servlet"
-HOMEPAGE="http://guac-dev.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
-	mysql? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-mysql-0.9.3.tar.gz )
-	ldap? ( https://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-0.9.3.tar.gz )"
-S="${WORKDIR}/${PN}-client-${PV}"
-
-LICENSE="AGPL-3"
-
-SLOT="0"
-
-KEYWORDS="~x86"
-
-IUSE="ldap mysql"
-
-DEPEND="dev-java/maven-bin"
-
-RDEPEND="${DEPEND}
-	www-servers/tomcat
-	>virtual/jre-1.6
-	net-misc/guacamole-server
-	mysql? ( virtual/mysql )
-	ldap? ( net-nds/openldap )"
-
-src_compile() {
-	mkdir "${HOME}"/.m2
-	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
-	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
-	mvn -s "${S}"/settings.xml package
-}
-
-src_install() {
-	if use mysql; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-mysql-0.9.3/lib/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		find "${WORKDIR}/${PN}-auth-mysql-0.9.3/schema/" -name '*.sql' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema/upgrade"
-		find "${WORKDIR}/${PN}-auth-mysql-0.9.3/schema/upgrade/" -name '*.sql' -exec doins '{}' +
-		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
-		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
-		elog "The default user and it's password is \"guacadmin\"."
-		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
-		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
-		elog "-"
-	fi
-	if use ldap; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-ldap-0.9.3/lib/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		doins "${WORKDIR}/${PN}-auth-ldap-0.9.3/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-0.9.3/schema/guacConfigGroup.schema"
-		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
-		elog "There is also an example .lidf file for creating the users."
-		elog "-"
-	fi
-	sed -e 's:/path/to:/etc/guacamole:g' -i "${S}/${PN}/doc/example/${PN}.properties" || die "properties sed failed"
-	insinto /etc/"${PN}"
-	doins "${S}/${PN}/doc/example/guacamole.properties"
-	doins "${S}/${PN}/doc/example/user-mapping.xml"
-	insinto "/var/lib/${PN}"
-	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
-	elog "Please unpack /var/lib/"${PN}"/"${PN}".war in to your servlet container! If it is an update,"
-	elog "delete the old content first!"
-	elog "Read: if you use the command below, delete everything within /var/lib/guacamole/guacamole first!"
-	elog "Please also link /etc/guacamole in to the lib directory of your servlet container."
-	elog "like this:"
-	elog "cd /var/lib/guacamole && mkdir guacamole && cd guacamole && jar -xvf ../guacamole.war && cd .. && mv guacamole /var/lib/tomcat-7/webapps/"
-	elog "ln -sf /etc/guacamole/guacamole.properties /usr/share/tomcat-7/lib/"
-	elog "You will also need to define users and connections in /etc/guacamole/user-mapping.xml if mysql or ldap is not used!"
-}
diff --git a/www-apps/guacamole/guacamole-0.9.7.ebuild b/www-apps/guacamole/guacamole-0.9.7.ebuild
deleted file mode 100644
index 95687d83bf21..000000000000
--- a/www-apps/guacamole/guacamole-0.9.7.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-DESCRIPTION="Guacamole is a html5 vnc client as servlet"
-HOMEPAGE="http://guac-dev.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
-	mysql? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz )
-	postgres? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz )
-	noauth? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-noauth-${PV}.tar.gz )
-	ldap? ( https://sourceforge.net/projects/guacamole/files/current/extensions/${PN}-auth-ldap-${PV}.tar.gz )"
-S="${WORKDIR}/${PN}-client-${PV}"
-
-LICENSE="MIT"
-
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-
-IUSE="ldap mysql postgres noauth"
-REQUIRED_USE="ldap? ( !mysql !postgres !noauth )
-	mysql? ( !ldap !postgres !noauth )
-	postgres? ( !ldap !mysql !noauth )
-	noauth? ( !ldap !mysql !noauth )"
-
-DEPEND="dev-java/maven-bin:*"
-
-RDEPEND="${DEPEND}
-	www-servers/tomcat[websockets]
-	>virtual/jre-1.6
-	net-misc/guacamole-server
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	ldap? ( net-nds/openldap )"
-
-src_compile() {
-	mkdir "${HOME}"/.m2
-	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
-	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
-	mvn -s "${S}"/settings.xml package
-}
-
-src_install() {
-	echo guacd-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-	echo guacd-port:     4822 >>"${S}/${PN}/doc/example/${PN}.properties"
-	echo basic-user-mapping: /etc/guacamole/user-mapping.xml >>"${S}/${PN}/doc/example/${PN}.properties"
-	if use noauth; then
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.noauth.NoAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo noauth-config: /etc/guacamole/noauth-config.xml  >>"${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-noauth-${PV}/" -name '*.jar' -exec doins '{}' +
-		insinto "/etc/guacamole"
-		find "${WORKDIR}/${PN}-auth-noauth-${PV}/doc/example/" -name '*.xml' -exec doins '{}' +
-		elog "Warning: Setting No Athentication is obviously very insecure! Only use it if you know what you are doing!"
-	elif use mysql; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/" -name '*.sql' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema/upgrade"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/upgrade/" -name '*.sql' -exec doins '{}' +
-		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
-		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
-		elog "The default user and it's password is \"guacadmin\"."
-		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
-		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
-		elog "-"
-	elif use postgres; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.postgresql.PostgreSQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-port: 5432 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/" -name '*.sql' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema/upgrade"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/upgrade/" -name '*.sql' -exec doins '{}' +
-		elog "Please add a postgresql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
-		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
-		elog "The default user and it's password is \"guacadmin\"."
-		elog "You will also need to download the postgresql-connector from here https://jdbc.postgresql.org/download.html#current"
-		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
-		elog "-"
-	elif use ldap; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-ldap-${PV}/lib/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		doins "${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.schema"
-		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
-		elog "There is also an example .lidf file for creating the users."
-		elog "-"
-	else
-		insinto "/etc/${PN}"
-		doins "${WORKDIR}/${PN}-client-${PV}/${PN}/doc/example/user-mapping.xml"
-	fi
-	insinto "/etc/${PN}"
-	doins "${S}/${PN}/doc/example/guacamole.properties"
-	doins "${S}/${PN}/doc/example/user-mapping.xml"
-	insinto "/var/lib/${PN}"
-	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
-	elog "If it is an update, please make sure to delete the old webapp in /var/lib/tomcat-7/webapps/ first!"
-	elog "To deploy guacamole with tomcat, you will need to link the war file and create the configuration!"
-	elog "ln -sf /var/lib/${PN}/${PN}.war /var/lib/tomcat-7/webapps/ && mkdir /var/lib/tomcat-7/webapps/.${PN}"
-	elog "You will also need to create a configuration in /var/lib/tomcat-7/webapps/.${PN}/${PN}.properties"
-	elog "See http://guac-dev.org/doc/0.9.7/gug/configuring-guacamole.html#initial-setup for a basic setup"
-	elog "or http://guac-dev.org/doc/0.9.7/gug/jdbc-auth.html for a database for authentication and host definitions."
-}
diff --git a/www-apps/guacamole/guacamole-0.9.8.ebuild b/www-apps/guacamole/guacamole-0.9.8.ebuild
deleted file mode 100644
index 9dd62ab6a653..000000000000
--- a/www-apps/guacamole/guacamole-0.9.8.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-DESCRIPTION="Guacamole is a html5 vnc client as servlet"
-HOMEPAGE="http://guac-dev.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
-	mysql? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz )
-	postgres? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz )
-	noauth? ( https://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-noauth-${PV}.tar.gz )
-	ldap? ( https://sourceforge.net/projects/guacamole/files/current/extensions/${PN}-auth-ldap-${PV}.tar.gz )"
-S="${WORKDIR}/${PN}-client-${PV}"
-
-LICENSE="MIT"
-
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-
-IUSE="ldap mysql postgres noauth"
-
-DEPEND="dev-java/maven-bin:*"
-
-RDEPEND="${DEPEND}
-	www-servers/tomcat[websockets]
-	>virtual/jre-1.6
-	net-misc/guacamole-server
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	ldap? ( net-nds/openldap )"
-
-src_compile() {
-	mkdir "${HOME}"/.m2
-	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
-	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
-	mvn -s "${S}"/settings.xml package
-}
-
-src_install() {
-	echo guacd-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-	echo guacd-port:     4822 >>"${S}/${PN}/doc/example/${PN}.properties"
-	echo basic-user-mapping: /etc/guacamole/user-mapping.xml >>"${S}/${PN}/doc/example/${PN}.properties"
-	if use noauth; then
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		echo noauth-config: /etc/guacamole/noauth-config.xml  >>"${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/etc/${PN}/extensions"
-		find "${WORKDIR}/${PN}-auth-noauth-${PV}/" -name '*.jar' -exec doins '{}' +
-		insinto "/etc/guacamole"
-		find "${WORKDIR}/${PN}-auth-noauth-${PV}/doc/example/" -name '*.xml' -exec doins '{}' +
-		elog "Warning: Setting No Authentication is obviously very insecure! Only use it if you know what you are doing!"
-	fi
-	if use mysql; then
-		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/etc/${PN}/extensions"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/" -name '*.sql' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema/upgrade"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/upgrade/" -name '*.sql' -exec doins '{}' +
-		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
-		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
-		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
-		elog "The default user and it's password is \"guacadmin\"."
-		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
-		elog "and put the contained .jar file into /etc/guacamole/lib!"
-		elog "-"
-	fi
-	if use postgres; then
-		echo postgresql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-port: 5432 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/etc/${PN}/extensions"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/" -name '*.sql' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema/upgrade"
-		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/upgrade/" -name '*.sql' -exec doins '{}' +
-		elog "Please add a postgresql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
-		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
-		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
-		elog "The default user and it's password is \"guacadmin\"."
-		elog "You will also need to download the postgresql-connector from here https://jdbc.postgresql.org/download.html#current"
-		elog "and put the contained .jar file into /etc/guacamole/lib!"
-		elog "-"
-	fi
-	if use ldap; then
-		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/etc/${PN}/extensions"
-		find "${WORKDIR}/${PN}-auth-ldap-${PV}" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		doins "${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.schema"
-		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
-		elog "There is also an example .lidf file for creating the users."
-		elog "-"
-	fi
-	insinto "/etc/${PN}"
-	doins "${WORKDIR}/${PN}-client-${PV}/${PN}/doc/example/user-mapping.xml"
-	insinto "/etc/${PN}"
-	doins "${S}/${PN}/doc/example/guacamole.properties"
-	echo "GUACAMOLE_HOME=/etc/guacamole" >98guacamole
-	doenvd 98guacamole
-	insinto "/var/lib/${PN}"
-	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
-	elog "If it is an update, please make sure to delete the old webapp in /var/lib/tomcat-7/webapps/ first!"
-	elog "To deploy guacamole with tomcat, you will need to link the war file and create the configuration!"
-	elog "ln -sf /var/lib/${PN}/${PN}.war /var/lib/tomcat-7/webapps/"
-	elog "You will also need to adjust the configuration in /etc/${PN}/${PN}.properties"
-	elog "See http://guac-dev.org/doc/${PV}/gug/configuring-guacamole.html#initial-setup for a basic setup"
-	elog "or http://guac-dev.org/doc/${PV}/gug/jdbc-auth.html for a database for authentication and host definitions."
-}
diff --git a/www-apps/guacamole/guacamole-0.9.9.ebuild b/www-apps/guacamole/guacamole-0.9.9.ebuild
deleted file mode 100644
index 7d5b50959203..000000000000
--- a/www-apps/guacamole/guacamole-0.9.9.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-DESCRIPTION="Guacamole is a html5 vnc client as servlet"
-HOMEPAGE="http://guac-dev.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-client-${PV}"
-
-LICENSE="MIT"
-
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-
-IUSE="ldap mysql noauth postgres"
-
-REQUIRED_USE="|| ( ldap mysql noauth postgres )"
-
-DEPEND="dev-java/maven-bin:*"
-
-RDEPEND="${DEPEND}
-	|| ( www-servers/tomcat:7[websockets] www-servers/tomcat )
-	>virtual/jre-1.6
-	net-misc/guacamole-server
-	mysql? ( virtual/mysql dev-java/jdbc-mysql )
-	postgres? ( dev-db/postgresql dev-java/jdbc-postgresql )
-	ldap? ( net-nds/openldap )"
-
-src_compile() {
-	mkdir "${HOME}"/.m2
-	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
-	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
-	mvn -s "${S}"/settings.xml package
-}
-
-src_install() {
-	echo guacd-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-	echo guacd-port:     4822 >>"${S}/${PN}/doc/example/${PN}.properties"
-	echo basic-user-mapping: /etc/guacamole/user-mapping.xml >>"${S}/${PN}/doc/example/${PN}.properties"
-	if use mysql || use postgres; then
-		insinto "/etc/${PN}/extensions"
-		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-base/" -name '*.jar' -exec doins '{}' +
-	fi
-	if use noauth; then
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		echo noauth-config: /etc/guacamole/noauth-config.xml  >>"${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/etc/${PN}/extensions"
-		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-noauth/" -name '*.jar' -exec doins '{}' +
-		insinto "/etc/guacamole"
-		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-noauth/doc/example/" -name '*.xml' -exec doins '{}' +
-		elog "Warning: Setting No Authentication is obviously very insecure! Only use it if you know what you are doing!"
-	fi
-	if use mysql; then
-		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/etc/${PN}/extensions"
-		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-mysql/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema/mysql"
-		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-mysql/schema/" -name '*.sql' -exec doins '{}' +
-		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
-		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
-		elog "You will also need to adjust the DB properties in /etc/guacamole.properties!"
-		elog "The default user and it's password is \"guacadmin\"."
-		elog "You also have to enable jdbc-mysql in tomcat!"
-		elog "For tomcat under openrc this can be done in /etc/conf.d/tomcat-7 with TOMCAT_EXTRA_JARS=jdbc-mysql"
-		elog "Another way is to add /usr/share/jdbc-mysql/lib/jdbc-mysql.jar to the classpath."
-		elog "-"
-	fi
-	if use postgres; then
-		echo postgresql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-port: 5432 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo postgresql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/etc/${PN}/extensions"
-		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-postgresql/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema/postgres"
-		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-postgresql/schema/" -name '*.sql' -exec doins '{}' +
-		elog "Please add a postgresql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
-		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
-		elog "You will also need to adjust the DB properties in /etc/guacamole.properties!"
-		elog "The default user and it's password is \"guacadmin\"."
-		elog "You also have to enable jdbc-postgresql in tomcat!"
-		elog "For tomcat under openrc this can be done in /etc/conf.d/tomcat-7 with TOMCAT_EXTRA_JARS=jdbc-postgresql"
-		elog "Another way is to add /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar to the classpath."
-		elog "-"
-	fi
-	if use ldap; then
-		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/etc/${PN}/extensions"
-		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-ldap" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		doins "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-ldap/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-ldap/schema/guacConfigGroup.schema"
-		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
-		elog "There is also an example .lidf file for creating the users."
-		elog "-"
-	fi
-	insinto "/etc/${PN}"
-	doins "${WORKDIR}/${PN}-client-${PV}/${PN}/doc/example/user-mapping.xml"
-	insinto "/etc/${PN}"
-	doins "${S}/${PN}/doc/example/guacamole.properties"
-	echo "GUACAMOLE_HOME=/etc/guacamole" >98guacamole
-	doenvd 98guacamole
-	insinto "/var/lib/${PN}"
-	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
-	elog "If it is an update, please make sure to delete the old webapp in /var/lib/tomcat-8/webapps/ first!"
-	elog "To deploy guacamole with tomcat, you will need to link the war file and create the configuration!"
-	elog "ln -sf /var/lib/${PN}/${PN}.war /var/lib/tomcat-8/webapps/"
-	elog "You will also need to adjust the configuration in /etc/${PN}/${PN}.properties"
-	elog "With systemd make sure that the var GUACAMOLE_HOME is set to /etc/guacamole. for example via /etc/conf/tomcat."
-	elog "See http://guac-dev.org/doc/${PV}/gug/configuring-guacamole.html#initial-setup for a basic setup"
-	elog "or http://guac-dev.org/doc/${PV}/gug/jdbc-auth.html for a database for authentication and host definitions."
-}
diff --git a/www-apps/guacamole/metadata.xml b/www-apps/guacamole/metadata.xml
deleted file mode 100644
index 19457e20ff52..000000000000
--- a/www-apps/guacamole/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nativemad@gentoo.org</email>
-		<name>Andreas Schuerch</name>
-	</maintainer>
-	<longdescription>
-		Guacamole is an HTML5 web application that provides access to desktop
-		environments using remote desktop protocols such as VNC or RDP.
-		A centralized server acts as a tunnel and proxy, allowing access to
-		multiple desktops through a web browser. No plugins are needed:
-		the client requires nothing more than a web browser supporting
-		HTML5 and AJAX.
-	</longdescription>
-	<use>
-		<flag name="noauth">enable support for leaving out any authentication on the webinterface</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">guacamole</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 81503552c2c4..9ff9410f9a12 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +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
 DIST icingaweb2-2.6.1.tar.gz 8165384 BLAKE2B ea9b499f7da9fbdbe8340443f02b5a9fc348549bbffc7777ad63ac1e04c12ff45e5337418f1714b1d76af3818e9733bb0eb51a6bfbc39a7d1eb4820af8747392 SHA512 f2ac728abde9795e578b7d512f5b87e3307faed35a5413aaa2d3a958b57389c5297a124b530667aa248ee368aafaf3875097fa8e27b4c3090bb64badc7c329b7
 EBUILD icingaweb2-2.5.3.ebuild 2549 BLAKE2B 3578e930824e6dee430d33190fb62f7074c6e8ed8d839f88abe840502d767441f8d156e869ff0a1c14ae3bd4af7fad423f43150ae18e439886df46e1e75510b4 SHA512 46ffbd0eccd4e880bc74398dc63c9f5d5c4a7423602cc81be889beac106e5090166aa838a3d0ea62a883cac4bdfef89bbfd888eb64a0f62b6dc84c317d204948
-EBUILD icingaweb2-2.6.0.ebuild 2755 BLAKE2B 2729da1f968d3badd1665c3382d11803930a89ea0db15284e341971dbeee7efdc0e25350a2c32cefaa7b5ae66938c1ecf4ed8cab37b8199732a77662fba7d427 SHA512 d4570e7c8b3fa7b859778d9bb0fa96ae9bd75e29106f153a61bbb3c9b9c6b4ca39331906c3731d8dcb62f5dd7ded7a699f1b6db935d7de97f7ab9717d24af812
-EBUILD icingaweb2-2.6.1.ebuild 2755 BLAKE2B 2729da1f968d3badd1665c3382d11803930a89ea0db15284e341971dbeee7efdc0e25350a2c32cefaa7b5ae66938c1ecf4ed8cab37b8199732a77662fba7d427 SHA512 d4570e7c8b3fa7b859778d9bb0fa96ae9bd75e29106f153a61bbb3c9b9c6b4ca39331906c3731d8dcb62f5dd7ded7a699f1b6db935d7de97f7ab9717d24af812
+EBUILD icingaweb2-2.6.1.ebuild 2753 BLAKE2B ca25d486a10b97ac6efb871049239c49301e1b242c5cf7021144f67c99f38ad525d5b06bd78b652d44ed7977cf86b43ef3e711af965fad4c583ba6246aac49a0 SHA512 4493fb4bca00b034ba9714c3b16edd202d8a3ccfeb6dd0ccdd4f14c86499fc0be27e59b10a44e14488d89e74926841cf6090156cbacb13fa8acf44035309c3a4
 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
deleted file mode 100644
index d4db7e02c018..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.6.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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-2.6.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild
index d4db7e02c018..0bf5ea9d946a 100644
--- a/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.6.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/nanoc/Manifest b/www-apps/nanoc/Manifest
index 06daceacde1e..285620fd3fc2 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,7 +1,9 @@
 DIST nanoc-4.8.10.gem 260608 BLAKE2B 102548bc4616287d7084f81f505f2c1f7fa294a6bfc87c9be80919a4fff6c547ecbc77cc5cb96d7b1fd9414f189cdf62bad9cd4cdf44fe536c60a2eb3c39ac63 SHA512 36080407696d19739af666d9ba4e04d051d679b29b3e8e5d24d893a2d05b05201b74777007781a0da80125a98fd8cc465fb0b78ca0c28c5fc80bdd5229d5fa24
 DIST nanoc-4.9.2.tar.gz 275891 BLAKE2B 6c2ca3b1f00f59762530ccf8dfb37599d89b67819e893fc49252afa0be334c64c0c2f771f7b05db14d24e264d355870a7308a117823750ba6edd68d82b113357 SHA512 593ed6def82e1c109983e37602a1def0bec0ea7a025d2badd3ddd3c564cb43ef619ea9173e563e32ae3891d4e3de85b5020e83292c5e16e1a6888399213c26cf
 DIST nanoc-4.9.3.tar.gz 276677 BLAKE2B d14ba8518a299fa9c4ac6ca638eb644dce9b1c0ab0895843a9bb8a916329916c9efaf4bd0bd397cb4dc10319081593dce167d966c2cc1d35247e5c0fd8368e72 SHA512 cc3946a8887f917cba4ef7d0fb5e5043eb8c6995a09de8e525562594fba2410d457643b27d158c89cb03b17b014624bc2844a85bbc6ae92dbf18723692c63a85
+DIST nanoc-4.9.4.tar.gz 281066 BLAKE2B bcf0771af8368e1910bc471d936490823a3f2768bf8503ffe20eb86a2c52f35d03962a969f35335fc9f2e292056441f8e37b73a907bf2bedbb5ab81f3b341fa4 SHA512 8e6b92ea031397442551e240a0b400b3fd9b55cd3782ee3297c562160b3a5d9539f2587d526453bde9154f2de421198a528ad73ab6230c49de4599f0b4d298d2
 EBUILD nanoc-4.8.10.ebuild 1579 BLAKE2B 98932d52b2f1db9f17e0d0af6117a380712a3bf6aad6506417368b797fb5a76a0a8a8908cf7c1c376c10eba31e1db216bae063e2e691c769b8934c7c925bf3e8 SHA512 c33f02538ec443598aeb7b103c7d452470898a74f1b9f28f53258b196287fc035f244fb5535cc84c64a898615b46a8b7ab2509e1b553e2da2039f068aa22f153
 EBUILD nanoc-4.9.2.ebuild 2441 BLAKE2B 66d7dbce1f5f4f0f0b7cbf6aad01772a581d2a616c1ec833c53393e5449805012ace501ab759e5166194abad8c59a21f0090e64d1ae58549fb1969402dc9b20d SHA512 2c78f6f710c56dca01cd07533dbac9d443d0bf12bdfd4bfb93c12d777005a0f021ee2c91811bc82dc6ca2139944303fa16fd45cf488359a3943f805207a57248
 EBUILD nanoc-4.9.3.ebuild 2441 BLAKE2B 66d7dbce1f5f4f0f0b7cbf6aad01772a581d2a616c1ec833c53393e5449805012ace501ab759e5166194abad8c59a21f0090e64d1ae58549fb1969402dc9b20d SHA512 2c78f6f710c56dca01cd07533dbac9d443d0bf12bdfd4bfb93c12d777005a0f021ee2c91811bc82dc6ca2139944303fa16fd45cf488359a3943f805207a57248
+EBUILD nanoc-4.9.4.ebuild 2456 BLAKE2B 5cb22d012719734408ffba44834bff4e592fb7003770e9e8acca8e1b2c584b235d043e37f152a998e29ea18fca3259c3e52b0dc6501d9ede8c94974d13be2030 SHA512 8862a7c15cb81ceb803e2e55729681de2a096d031d9bca657ee3d4d1e89d81f567f7e44f71f7d48179b4a264b2b423870e3f6ca94595877ae9590654f3cfde36
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.9.4.ebuild b/www-apps/nanoc/nanoc-4.9.4.ebuild
new file mode 100644
index 000000000000..9e6642788b8f
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.9.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/cri-2.13:0
+	dev-ruby/ddmemoize:1
+	dev-ruby/ddmetrics:1
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	>=dev-ruby/parallel-1.12:1
+	dev-ruby/ref:2
+	>=dev-ruby/slow_enumerator_tools-1.1.0:1
+	>=dev-ruby/tomlrb-1.2:1"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
+	dev-ruby/fuubar
+	dev-ruby/maruku
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/pry
+	dev-ruby/rdoc
+	dev-ruby/rouge:2
+	dev-ruby/systemu
+	dev-ruby/timecop
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb \
+	   spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/base/checksummer_spec.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
+	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 6e05d9aaec66..504c655366cd 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -9,6 +9,7 @@ EBUILD nikola-7.8.12.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1
 EBUILD nikola-7.8.13.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
 EBUILD nikola-7.8.14-r1.ebuild 2349 BLAKE2B 3294119cb0343de4adfec3cdc0d90e7368d3beff46511f737c841dfb0d956dc9472f303f6b92ae91e162ce10ca6ff9d06d474ce8b4cd911d5493f5bd60e28b9f SHA512 6446b544f4a5369ba92d56f85d81b7422a728e1ff13dfb03971d0ce45ccef07d901c80e45732b0f1761228ac3e0ce5db9ce46ecf8f785bcdda93e2d0be1d390e
 EBUILD nikola-7.8.14.ebuild 2353 BLAKE2B 37b97644d8d6a698482ef6a0886c5e5705aa98273d822a44550e655936593754aed4417866d19a615d06ab9b377dfb3d3dbe79f345f2e1397d403756e7b6bfdd SHA512 1d8475c52977358e626a9aa44242174908908df283796a0d0d87ca8a249d061deac1e3cd164603c5c31ea4aef5667a061226e52008338f7485359e96380b3e4d
+EBUILD nikola-7.8.15-r1.ebuild 2349 BLAKE2B c4a72df9b91f52f8a64a54f81b75736f6d8faee0936feb978f6ceb4e3c31f85a927374fcbde0374541a745d2c7fd4010c812a40ad5f792b991d1aa1c36287c57 SHA512 ce0f585fc877930cf9a2024618463d88c56ee20b22871546408229ed805fe7cd69c8213fb9e3268e336fc49d916a70a5ce4ee0ff4fd695ab7b22f32a748d9cfc
 EBUILD nikola-7.8.15.ebuild 2348 BLAKE2B 49ad18b960da0afecd8f70dfab05dd66dd7e6a319f7ef46f199d398e2aa681aff58f43e8e0f2c01b899cf018633f194a742cc7a5f709fb1379b8e3286ee8a0eb SHA512 71c6e2cdeefde3bcb94519a3803cdef399ea70c90c3c73dcd88499080738ebf89824c97e9ac63856f1600e53b1550a2e8988165b2ea16bb2e6c5249d7a925857
 EBUILD nikola-7.8.8.ebuild 2337 BLAKE2B df493ca81b4c03608e1aa10647c2edb436b9e2a7ec42bd7cbf85c523cc19fead482637456957a0dc5c59c36e94a30eeb70c9ed5485b0d9ba79f5aa2ad405a03a SHA512 da6b8ea3e723f0c5d4434d0a3e4bc3997ca85705cf360f0bf9aa7a76e1e2f2f61e72cd41cdd345cce9099c6fb89a59d6f97b0c951bdfd84f93803310f29cbe4b
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/nikola-7.8.15-r1.ebuild b/www-apps/nikola/nikola-7.8.15-r1.ebuild
new file mode 100644
index 000000000000..eb51df3ce20d
--- /dev/null
+++ b/www-apps/nikola/nikola-7.8.15-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN="Nikola"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
+#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rv "${D}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
+	gunzip "docs/man/${PN}.1.gz" || die
+	doman "docs/man/${PN}.1"
+}
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index ced17114e61f..df14816c2064 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
 DIST postfixadmin-3.1.tar.gz 1279224 BLAKE2B f37fd9e34e5eb88a82c10a0b80d5593a7451f407948454a064209ba9150192b7026645774b97b0482488814d6abeb25b6a800c2f7fe12a7a768e711919b94852 SHA512 a3e1ecb3ac4ff4d604533bce532694bcc304b9b3d3e1b1ec840be6d007027705113f067393486f58908dd3846332ecf59c9c3c1a5123d03aa088f47593a75812
-EBUILD postfixadmin-3.1.ebuild 2730 BLAKE2B 1e0a03531fe89c6d9ca402c398217786be09d6f3680550831e6fe75f5f0b734481042d977ea57acb8a98f5070f3b594915aa85e95c31edcbc6e39491a53dfd1b SHA512 678f0c415ea5b3d82d3a497671b5ceb94530b9dd3931e1d6138ca1b1ebfbe91831c6c06dec17d15c5e2a9a75f76f768959d5ea0dd99963b2fa19cab4aaf5121b
+EBUILD postfixadmin-3.1.ebuild 2770 BLAKE2B 0515ec76d9cabdf0861c568ea3a2b2490a4dd385834638942fdda279f7a5a28868663e9936c6b6a9d5df006ddb78dd9e0a552eff51f8cc333f348d0e6b87b7e8 SHA512 7190fe45e795bf803a7ad1ba5ab5f45af065a1b6e3680476e0bcc13df2426b1040a014958fedc57a68b972c367f9145161d40e63d015bb94d783f8fc8518db1c
 MISC metadata.xml 536 BLAKE2B 0ec01f47f106656e1b98ca14d8b531597a34cfb2fd261c93c775d7dd3b0a08155e9e912a20a2330946697418898ed08d9be6f8409edb5e1ef6009cafddde2437 SHA512 4657f3ae892ad55572ac39f23cebcef58480d4ff608150c75d2cf3f0046b5e0a2861f9bf8dfffd45aef580675feae11a05297a7a99f63997d43ab703372ddf4a
diff --git a/www-apps/postfixadmin/postfixadmin-3.1.ebuild b/www-apps/postfixadmin/postfixadmin-3.1.ebuild
index 3e69bc6b6573..5cb58aab877a 100644
--- a/www-apps/postfixadmin/postfixadmin-3.1.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils user webapp
+inherit user webapp
 
 DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
 HOMEPAGE="http://postfixadmin.sourceforge.net"
@@ -89,10 +89,12 @@ pkg_postinst() {
 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
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
+	${shopt_save}
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
+		ln -s "${vacation[-1]}" "${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/radicale/Manifest b/www-apps/radicale/Manifest
index 760fc467d29d..9068b2cd1e8e 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,7 +1,9 @@
 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.6.tar.gz 48280 BLAKE2B 38d3047d473fad24188b597a57d3e1f0e34df03f00f6806b86c447ed731be074bf0b5f6dfb951c8a9f627993bf0763792150bc06532414a658e4d306123fcdd6 SHA512 3fed85fc5fa2b041277112870b8b508a22cc85ec0680dd1cf9411e73715e18a9b0ddd651eafb0c9529bd308e7fd87ae44ecdd82935f4062050919780301d56d9
+DIST Radicale-2.1.10.tar.gz 77790 BLAKE2B 37061dd049dc918775f20b522ed86a47f32f34505c13763f8ae49ff007aca77f88caafc959be857c735c11b13506efdfc8413750808b88d5ea6dbe69e05f03ff SHA512 30fac6639e56bbd10664330d84ebba28b34005b4b4b4c5a6c22f53cb7e810ba4961cbd314e62fe33538674a2d4b45f14751f36ef5fa2ae2b7d44c1b1158f6e1c
 DIST Radicale-2.1.8.tar.gz 76348 BLAKE2B 87a4ec20990dc7e5dbba88a3fb3d1475210d40c12584d5bb7ba7c6d1ca2cd8efb97b7054d322f0a7fbe58fd8325be63df52f1d370cc13ccc90863b0900925656 SHA512 038bee4114b090bcf873e8a4ec83cbbc7bdd34b4843fd1a769a023c891b589b3a18637d5f8f8595691a7930804ad7695e333bb9df96d00515b7a3695294eb5f7
 EBUILD radicale-1.1.6.ebuild 1684 BLAKE2B a52aa9b6d283de410e7013e6a700782e77041078fce0cddd067ab603078db78d728cbac4d4cf9320473ae9a66c801a791d3ac4d21b352e954df33077e1c8e4e3 SHA512 d1600fdaea50a3b811516350b6380a05c28d82de18e02d2b3fe630eaeadf0c7e3fe06df26df80f392100ff3d31175eb57a8b6c31b481cc26a7f844fbe4cfaa0c
+EBUILD radicale-2.1.10.ebuild 2370 BLAKE2B ff89f8d31eb7c4a1ae57aba0fa912d93807bc73836d47a1732ad935bd61e952d343261499e33f6e9d954bca3f6fe7639e83b3da125a3b8f76cc890a3cd3ecff6 SHA512 41b48890b3038ea451a7574c34a8a8413ea4f9d5abf00403f3fc47d8b2bfd883ccd58cec76324de2d862f5b4e4c6f9c8a2508e7c86205d28717d871e67c4a8f5
 EBUILD radicale-2.1.8.ebuild 2315 BLAKE2B c6621c0fd342d270b2af2938612a05dd66a8c5a6644d6cb0f3d0806f109f85de8f9009fea9beb188962172f2406f2f38a797a7e0977ac82c17be6ab154ff08d2 SHA512 33a172ffd1d55dcad8870cfb3da26ae7cdd7fc01f0fb67fcd1177f2a2986f4b5255c618042e886a47fce9d75d08345b6cadfd794783139b7230188244e736237
 MISC metadata.xml 472 BLAKE2B dad26ff5abb5fb50a0016f23a03f33bf2e6dc536ed92fe30a587824f8b85789ae16a44d362df683c2b62c9db73175f0cbb06b26a6a6d4b3d544fdefb30613690 SHA512 309c2abddb4150357ffbfd35d8dd153592b4e7426b61728a25f7a2a8eb6a97ab8c3e4042eb5e333d4524977ec7f30e6793b33a6a2a70eff1f1c555d7f9f706e2
diff --git a/www-apps/radicale/radicale-2.1.10.ebuild b/www-apps/radicale/radicale-2.1.10.ebuild
new file mode 100644
index 000000000000..89f03ec7fc82
--- /dev/null
+++ b/www-apps/radicale/radicale-2.1.10.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1 eutils user
+
+MY_PN="Radicale"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A simple CalDAV calendar server"
+HOMEPAGE="https://radicale.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bcrypt"
+
+RDEPEND=">=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
+	bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+RDIR=/var/lib/radicale
+LDIR=/var/log/radicale
+
+pkg_pretend() {
+	if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then
+		eerror "It looks like you have a version 1 database in ${RDIR}."
+		eerror "You must convert this database to version 2 format before upgrading."
+		eerror "You may want to back up the old database before migrating."
+		eerror
+		eerror "If you have kept the Gentoo-default database configuration, this will work:"
+		eerror "1. Stop any running instance of Radicale."
+		eerror "2. Run \`radicale --export-storage ~/radicale-exported\`."
+		eerror "3. Run \`chown -R radicale: ~/radicale-exported\`"
+		eerror "4. Run \`mv \"${RDIR}\" \"${RDIR}.old\"\`."
+		eerror "5. Install Radicale version 2."
+		eerror "6. Run \`mv ~/radicale-exported \"${RDIR}/collections\"\`."
+		eerror
+		eerror "For more details, or if you are have a more complex configuration,"
+		eerror "please see the migration guide: https://radicale.org/1to2/"
+		eerror "If you do a custom migration, please ensure the database is cleaned out of"
+		eerror "${RDIR}, including the hidden .props file."
+		die
+	fi
+}
+
+pkg_setup() {
+	enewgroup radicale
+	enewuser radicale -1 -1 ${RDIR} radicale
+}
+
+python_install_all() {
+	rm README* || die
+
+	# init file
+	newinitd "${FILESDIR}"/radicale.init.d radicale
+
+	# directories
+	diropts -m0750 -oradicale -gradicale
+	keepdir ${RDIR}
+	diropts -m0755 -oradicale -gradicale
+	keepdir ${LDIR}
+
+	# config file
+	insinto /etc/${PN}
+	doins config logging
+
+	# fcgi and wsgi files
+	exeinto /usr/share/${PN}
+	doexe radicale.fcgi radicale.wsgi
+
+	distutils-r1_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."
+}