[gentoo-commits] repo/gentoo:master commit in: www-apps/guacamole/, profiles/

[Michał Górny]

commit:     60256bbc436a5f6a9cdb7afe6f263028dc608c4c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 19 08:55:19 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 19 08:56:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60256bbc

www-apps/guacamole: Remove last-rited pkg

Closes: https://bugs.gentoo.org/608540

 profiles/package.mask                     |   5 --
 www-apps/guacamole/Manifest               |  18 ----
 www-apps/guacamole/guacamole-0.9.0.ebuild |  92 ---------------------
 www-apps/guacamole/guacamole-0.9.2.ebuild |  92 ---------------------
 www-apps/guacamole/guacamole-0.9.3.ebuild |  92 ---------------------
 www-apps/guacamole/guacamole-0.9.7.ebuild | 132 ------------------------------
 www-apps/guacamole/guacamole-0.9.8.ebuild | 125 ----------------------------
 www-apps/guacamole/guacamole-0.9.9.ebuild | 126 ----------------------------
 www-apps/guacamole/metadata.xml           |  22 -----
 9 files changed, 704 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 0508903578e..dc8a271b23e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -167,11 +167,6 @@ dev-python/wxpython:2.8
 =virtual/perl-threads-2.220.0
 =virtual/perl-version-0.992.300
 
-# Andreas Schuerch <nativemad@g.o> (10 Jul 2018)
-# Packages have open bugs and mayor component is not working since years
-# Removal in 30 days. Bug 608540
-www-apps/guacamole
-
 # Brian Dolbec <dolsen@g.o> (4 July 2018)
 # No longer needed, newer gpg-2 versions have simple cli options
 # for generating new keys and doing key maintenance. Removal in a month

diff --git a/www-apps/guacamole/Manifest b/www-apps/guacamole/Manifest
deleted file mode 100644
index be145bb0939..00000000000
--- a/www-apps/guacamole/Manifest
+++ /dev/null
@@ -1,18 +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

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 fa765ea1ee9..00000000000
--- 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 bbb158af9e3..00000000000
--- 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 4388582a470..00000000000
--- 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 95687d83bf2..00000000000
--- 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 9dd62ab6a65..00000000000
--- 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 7d5b5095920..00000000000
--- 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 19457e20ff5..00000000000
--- 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@g.o</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>