Version bump, license change, init options and lots more thanks to Malte Starostik. See bug 541718

Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0x60373227

5 files changed, 124 insertions, 6 deletions

diff --git a/net-misc/guacamole-server/ChangeLog b/net-misc/guacamole-server/ChangeLog
index 410ba9e9fcaa..463670bd45ce 100644
--- a/net-misc/guacamole-server/ChangeLog
+++ b/net-misc/guacamole-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/guacamole-server
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/guacamole-server/ChangeLog,v 1.7 2014/10/28 16:31:38 nativemad Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/guacamole-server/ChangeLog,v 1.8 2015/06/13 09:15:22 nativemad Exp $
+
+*guacamole-server-0.9.7 (13 Jun 2015)
+
+  13 Jun 2015; Andreas Schuerch <nativemad@gentoo.org>
+  +guacamole-server-0.9.7.ebuild, +files/guacd, +files/guacd.service:
+  Version bump, license change, init options and lots more thanks to Malte
+  Starostik. See bug 541718
 
 *guacamole-server-0.9.3 (28 Oct 2014)
 
diff --git a/net-misc/guacamole-server/Manifest b/net-misc/guacamole-server/Manifest
index e1977a3037a5..7e02d851a2b5 100644
--- a/net-misc/guacamole-server/Manifest
+++ b/net-misc/guacamole-server/Manifest
@@ -1,20 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX guacd 665 SHA256 a5b727f5bba5e34cf89c0dc26a810abe1fd3d8438b1cc94f3baedaae0ed6bb72 SHA512 760d64c4950d4bd942f5f2acdfe44db4f55af785065a3e28c7eb2f66793880c274354ad144b09dcf7ad13ada8f4a7d286e9d889ae36936bfbfbd0bf3622e79a2 WHIRLPOOL 2a109850bb7999905c2c417dba060410199a9896194a1b8057c4e1d7334f373792ece6e80e48202b68beb8c330930814e8571749eabb05e9eef9c13658dd7224
+AUX guacd.service 178 SHA256 4f0201fd1888bf1b147736691ea15c5081cc04603b983b004449817fb2e9e30e SHA512 a7b36ab99a88c5f37ca37ae57bd59e21c7d5a890ad6d3a19756ab9655da44abed98867114799407d070376a8207a29ceb6097785bbce377826686c4e7601e0e0 WHIRLPOOL 1c8ae0675b2cb8c0227f33a50c5e93d16b7622f7c9afbf554481240b6497f540bf1a96a97bdc0dd31f36d361cca73d306f9f3b237224b758f91cdc2060758444
 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
 EBUILD guacamole-server-0.8.3.ebuild 910 SHA256 98657fc75250e84d0d018e305ce82c6573328989869105c13a6e05ba1c8517c8 SHA512 3d511208d997200704dc00e00a387a575fdfe467020b1a5c57c0880ccac8ca810f53640361276b553a419f3a1599db1b82a70ed3e189cebd5da4be3b9ac4d041 WHIRLPOOL d83b6872cce0598fe9f279455c3789c601a0474a7790f65211d5c3796c919ab4234eb4f563a55d871f1dcf3d3e3ac83d18dfcc77117ba4203dcc75b0c9787a55
 EBUILD guacamole-server-0.9.0.ebuild 918 SHA256 bac9fce197fd76a5c6ce05a1e9fa5ca4d50d09c5876fa7bf37206e149c0d5331 SHA512 4d1f8a1606391a324ed00d6460026508b9b2539c572ce4d0a4422148170d723a9af4a75a8b15582044b391450067bd2cef3bf7b1050d64df0bc785dcc8e1bff7 WHIRLPOOL aaff442eecaf5d2aad646f072e03a43a14f8432d98a90ea7469b97edf639cf5457ed08f3d3dd16d0e4f297660c906bb8ba4eaff65817a57ac86b698c97e96a4e
 EBUILD guacamole-server-0.9.2.ebuild 967 SHA256 d406747deb641074c18c002ce2c5cae23b870a1a690807fc579a58937d2e850d SHA512 f0b3aef1d629d3319dbefe26017d452c0e79213a83358f9b8834ed4cd776213dda61a91a52cd488c6303bd475bd97395167bc2cef3455b3ed3e4c0bff43d4a2f WHIRLPOOL aeb3609ce517f964599b22fe9eb1d76caa3c2ecba177cfa7da22a7b0771440373d5a827e84c34961b75cb1290f412aa3d2c53c2066b9115da6a1fd654b10c7fa
 EBUILD guacamole-server-0.9.3.ebuild 1649 SHA256 71e5d46d802273cdaad48d59bcad7f0cce50c1a33e8eed83af254081dfaa9532 SHA512 98cb86dd784bb2e101257a3591803a0da66135dcf027f1c0e8392e670ac1833a65eb941f0118836c9d9e14cb6926af00524631cd38cba76264df0e23a6e6d982 WHIRLPOOL 536a38460d59f47bfd2e5abd671ef41e7c021f3112e2c446c63557f0654424089e828e9ca5b472308532aeaa5534561eea459d494665a86bab98be842516eea1
-MISC ChangeLog 1344 SHA256 d293bd5b06b1eab4ca12661b856b5f3228d6ee99b81a10d97aa6f56ad6a7a2c1 SHA512 c108940cf4b47360751439d346ffdef27173c938aa6cd924ec42659579e2375beb5adb39a84796d78d0dbb9af46c56a7652d3729b81503dd05cd3a06502d5037 WHIRLPOOL de4fe840600f038f25714927a063dbffc72b9c02c738cf3cd3dfaa8da3bb79dbdb703a92c23d9fbccb3903fa7164180e2fe867d9378dd8f68706881d5926c191
+EBUILD guacamole-server-0.9.7.ebuild 1426 SHA256 a9cfef6ab8c25c06dbff09653cc2d5d1bbb4ee56a1970211e46fa156479e8a9c SHA512 c4f8923a4233df0fc39d5c91fc3c6b850c657e87d0cfddf5965adf84de12fe325a153e50f30e1202815465e06be234e8080e6fa0fbe23331df3d23a4363bb1c1 WHIRLPOOL c27602d78f5758d83d79e7af62bb30a7ba115550b947241fcd38c8d3250a1c82ae017f6948c02b29c042341a87bf9989afa5a9b9175bf0fa9f387cb70a7e169e
+MISC ChangeLog 1612 SHA256 734ad7131993b53cd28816186ffdff7c5e996254c5a88826b3cf11dde40c4999 SHA512 696080d8380957f8d76f82776a132d51889fcd68d933914994e0cfee0ddc9e31436d4fe0f457c7224b3f17121e424246689cedbadd6e5b8a3e85f4f0f1f4b4b5 WHIRLPOOL 8a3908c87bb894daaf9ff9193e44678111593d9358ead4b185644170687c825f1f7c143d8516f75e4060adf86c8e89316753484662e8a44ec4fc914ab8cb8bec
 MISC metadata.xml 627 SHA256 48656b6c4364c17f75d8678673e41899923df6ce9884a8e0e468a7030db1ee83 SHA512 fbff490c62c1ec4871310cd0deaae719c2e40321ca32035c0073c93047415edae9160da1f8936def498dcdf960fb2fdec19e1101375acda95effddf6d54a8f90 WHIRLPOOL 52bfb428390be8f6e65851772b9265f80680afa1183b59842d5966b1f470f41710a6efd8fe13d3455def9d1a815c3bf08c7fe4af9c7241888639e6ea42dd8391
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRPxNgACgkQakKUmsHeVLLckgCfRukpXCH2iO5xED9m2nhdfYYf
-DUQAn0JtLc/O8a3zrwdS7vdpMyjU2GOu
-=kJ/p
+iQIcBAEBCAAGBQJVe/Q1AAoJEIug43o+kWudcL4P/j6mOyXlgC16BrxBx20zxySO
+abVnqi+Cig7RPiJA/EkuilSJa5+c1bwqwKWPN810ILcaL5CMy+WLITKq6FkG1BW6
+meRDOy/CoRP32irTlMMOy5nF6oxNWmGNvgChXqohTFqMQZgdoMZ9n0SQnf1afYNx
+n68C8DsVhRkPC+DnLM4IAPkm54/9F7zBX6yZnrtOgLZqqwXEHWWptZZw0d0o5gZy
+8KkIIHSkucBIXa+vaVGOVi1HDpuraJiLQugqDGIECxhDt+z/CY4n2AFxKKzV+5/u
+xbMsEX8EAnLN5uMlGEUvXU+ZlJU7NqoaA/2kkZMtgSmyNh6mb9rQeydcGbxVS798
+Hyr2yFfUx/XrYKmPifTrVUKob28/A3Ec5Fh8ubHs3HKzY5OA06tYCB/yReSDTVJ0
+1qDqa5W4/g1opJ61BleOzAjmn1vi2zNe8aN+gn1Ja9M+2p9BkYGCB3JBeZ0OOqCU
+cQOqdvzsXa/gDHMUEC19y4o5+xOdtd9Dy2fF5RaWxcEuEr85WH6TR5di2P1De/Cs
+HlYZGBZiDaZYF76sk1U1XiEfRQgzxkCw4SYw0Twd6H83Upuij8xnkgiDHeJa7Jxz
+U2rMIUOjVyY3ITdBT5XJ2f9F20a+hDMxW5w3ZlgsBvU2WBpeg7OSS4yEQoTJdJ8Q
+jmjaRHfkQW/Uc6/FvtWx
+=bJ13
 -----END PGP SIGNATURE-----
diff --git a/net-misc/guacamole-server/files/guacd b/net-misc/guacamole-server/files/guacd
new file mode 100644
index 000000000000..6a75a9dedf09
--- /dev/null
+++ b/net-misc/guacamole-server/files/guacd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/guacamole-server/files/guacd,v 1.1 2015/06/13 09:15:22 nativemad Exp $
+
+DAEMON="/usr/sbin/guacd"
+PIDFILE="/run/guacd/guacd"
+
+depend() {
+    use net
+}
+
+start() {
+    checkpath -q -d -m 0755 -o guacd:guacd /run/guacd/
+    ebegin "Starting guacd"
+    start-stop-daemon --start --user guacd:guacd --exec "${DAEMON}" -- -p "${PIDFILE}"
+    eend $? "Failed to start guacd"
+}
+
+stop() {
+    ebegin "Stopping guacd"
+    start-stop-daemon --stop --pidfile "${PIDFILE}"
+    eend $? "Failed to stop guacd"
+}
diff --git a/net-misc/guacamole-server/files/guacd.service b/net-misc/guacamole-server/files/guacd.service
new file mode 100644
index 000000000000..547dc030259d
--- /dev/null
+++ b/net-misc/guacamole-server/files/guacd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Guacamole proxy daemon
+Documentation=man:guacd(8)
+
+[Service]
+ExecStart=/usr/sbin/guacd -f
+StandardOutput=null
+User=guacd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/guacamole-server/guacamole-server-0.9.7.ebuild b/net-misc/guacamole-server/guacamole-server-0.9.7.ebuild
new file mode 100644
index 000000000000..e4f683c23208
--- /dev/null
+++ b/net-misc/guacamole-server/guacamole-server-0.9.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/guacamole-server/guacamole-server-0.9.7.ebuild,v 1.1 2015/06/13 09:15:22 nativemad Exp $
+
+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
+}