net-misc/guacamole-server: version bump to 0.9.9 and remove of 0.8.3.

Package-Manager: portage-2.2.20.1

3 files changed, 63 insertions, 42 deletions

diff --git a/net-misc/guacamole-server/Manifest b/net-misc/guacamole-server/Manifest
index 291baa068af7..c628ca8ea615 100644
--- a/net-misc/guacamole-server/Manifest
+++ b/net-misc/guacamole-server/Manifest
@@ -1,6 +1,6 @@
-DIST guacamole-server-0.8.3.tar.gz 515611 SHA256 e958291ca967ce05d9e5e55d884b25725330fff6c067cbde4bbb7b039fb8db09 SHA512 c61428e83104fce004d99c83b31a195ef5dd01d601f5e5e15ab03530401fb9e23a8a6927b39a8854b14da7ab90407d9f56190ffc7649ff52501c59055d9a145a WHIRLPOOL 78ce02e7ad87120ca31be56a98fbeca71ab5b0725b7a456b70a5f8cef8d1d98b4b7fbcdc4bba4dd1f43da897118e3532ea5d1f4458864ef7ac6081942074542f
 DIST guacamole-server-0.9.0.tar.gz 556465 SHA256 289cb1ea0261396e9ede6aa0d2ac8d80b9ec03a124cb0669802f7e8556e21a58 SHA512 73942eecdeb8204a32e0d6ef0b92c2b23dea0b4a0e82693c05a81539319a7ff9db9ac897822f9ca33fb1913cec25058a16c67ec10d91778a3f1cf9615add5f0a WHIRLPOOL abb9c1d3fa144ae817fd87f42a1f4bfc69e9c6c3f41bac5f76b06b46dc8087d279a061b81097c3dad3c6ed5b528d8b400d8f8b3d3a4338189d401f6dc1845799
 DIST guacamole-server-0.9.2.tar.gz 595062 SHA256 b6e26751023082b6f0380323f05b8b50e71bcf4c1421c3118237b5a8df22660d SHA512 ed01bcbfc0612a1b05434cc5c412fbed6f877713049418aa25a577e9e020bd6abddeab4d31a50b5b4a6785b8c79f0625dd90181a643913bd813cbbba3a24bf6c WHIRLPOOL 6eac4e63cfabcedc2d31ed9c2063c6a0f0293dc0a9769e70bbf785d8236e5139caec5d255f9d2094220aca37eb2f96677223de6351a6c818141daf74e6b36185
 DIST guacamole-server-0.9.3.tar.gz 614640 SHA256 545e22401bbe62734c02577331c52e54dddf14dd950844d2ccc5aad318c16076 SHA512 eb296f17b27bc14633b511ce6cbe0025e18ea24e3b9b3e132b103de2071a9f18b64d7ced8f20bea1ab8f65755a047e98d670d522f4a5b4ec73e5696ecfb7d948 WHIRLPOOL db2f8f4d0839de9fa82bd0aeb047ed33468f817c0ee094388c7fb587ce044b586a097de94ac2e0e997bb757f31e6f4927e3b1d059f0caab6b7177ca37b5717a8
 DIST guacamole-server-0.9.7.tar.gz 639630 SHA256 285f367d89ee51981db84b00698b05b3d9ba5de2fb2922115c9e38d2b9b88d09 SHA512 c9ef2df6d0724c19e61b3f8913e94ff7c39f17e3beca0bd2eab1648e3c96d4b248bef9bc09b47fd8a4da6b994aea9df94e442286ce0fa3881d5e44b4923b1b14 WHIRLPOOL c7f2213b92e6ca40b93a251a72698229c7e34fbfaf00006b372910d7f2456c0cf6ccf75f8d89f136c41b61cd41ea492c52a14e970ff5bc2231fe826584c8d723
 DIST guacamole-server-0.9.8.tar.gz 691627 SHA256 6fcbff7b540ae296e049ff9b25b7b84bae247b54d2d8dfb5672fea4967406bdc SHA512 3bdbc9502070fa11fc276c7122a33a8428d130ad122157740618a5addf77bebf8d79e2c1a765f36a30feed2ac18f1911c84c9dc4a04e0235dd4d4069c8990a73 WHIRLPOOL 2e9be3f0a6492f1d6dab34f00f7decd5b7e133ad879ca6c4822496731a7fe3aac6cb22af43f634f3e526790187acea91f0ae3f3c6a4ab7901c2cbbec71b70ca3
+DIST guacamole-server-0.9.9.tar.gz 679635 SHA256 b37ac2013f278558094488c15ec4d6ee8f01e60cd2bcb0d976a207eb9d9c4e7d SHA512 bdc004c45e63bb2c692c1dfd280840ea682e461b2c578da511247cd36d727ffa22c3fdde22b3635ef6ac7e35a1b5e63f5971bdbb4d227f88d1b81ff035bd5f83 WHIRLPOOL 42a15cab6d723a9d0fe3376afad96e3283447bb7664c102b3795869fd72dd518281db447bceab18502ceaa38c9a322903a3b85dcff37c38f3bd568ea07f47ecb
diff --git a/net-misc/guacamole-server/guacamole-server-0.8.3.ebuild b/net-misc/guacamole-server/guacamole-server-0.8.3.ebuild
deleted file mode 100644
index e7dc62387b17..000000000000
--- a/net-misc/guacamole-server/guacamole-server-0.8.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole"
-
-HOMEPAGE="http://guacamole.sourceforge.net/"
-SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-
-SLOT="0"
-
-KEYWORDS="~x86"
-
-IUSE="rdesktop vnc ssh pulseaudio vorbis"
-
-DEPEND="x11-libs/cairo
-	ssh? ( x11-libs/pango
-		net-libs/libssh )
-	rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
-	vnc? ( net-libs/libvncserver
-	pulseaudio? ( media-sound/pulseaudio ) )
-	vorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf --with-init-dir=/etc/init.d
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/net-misc/guacamole-server/guacamole-server-0.9.9.ebuild b/net-misc/guacamole-server/guacamole-server-0.9.9.ebuild
new file mode 100644
index 000000000000..d093bf36ed71
--- /dev/null
+++ b/net-misc/guacamole-server/guacamole-server-0.9.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd user
+DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole"
+
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="rdesktop vnc ssh pulseaudio vorbis telnet ssl"
+
+DEPEND="x11-libs/cairo
+	media-libs/libpng:*
+	dev-libs/ossp-uuid
+	rdesktop? ( <net-misc/freerdp-1.1.0_beta1_p20150312 )
+	ssh? ( x11-libs/pango
+		net-libs/libssh2 )
+	telnet?	( net-libs/libtelnet
+		x11-libs/pango )
+	vnc? ( net-libs/libvncserver
+		pulseaudio? ( media-sound/pulseaudio ) )
+	ssl? ( dev-libs/openssl:* )
+	vorbis? ( media-libs/libvorbis )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myconf="--without-terminal --without-pango"
+	if use ssh || use telnet; then
+		myconf="--with-terminal --with-pango"
+	fi
+
+	econf $myconf \
+		$(use_with ssh) \
+		$(use_with rdesktop rdp) \
+		$(use_with vnc) \
+		$(use_with pulseaudio pulse) \
+		$(use_with vorbis) \
+		$(use_with telnet) \
+		$(use_with ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doinitd "${FILESDIR}/guacd"
+	systemd_dounit "${FILESDIR}/guacd.service"
+}
+
+pkg_postinst() {
+	enewgroup guacd
+	enewuser guacd -1 -1 -1 guacd
+}