version bump. Added ldap backend and depend on the new guacamole-server instead of guacd and its libs. Also quoted some variables on 0.6.2 to make repoman happy.

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0xC1DE54B2

4 files changed, 128 insertions, 13 deletions

diff --git a/www-apps/guacamole/ChangeLog b/www-apps/guacamole/ChangeLog
index 5b184050cafd..b8040598a737 100644
--- a/www-apps/guacamole/ChangeLog
+++ b/www-apps/guacamole/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/guacamole
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/ChangeLog,v 1.7 2013/08/14 11:31:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/ChangeLog,v 1.8 2013/11/26 12:53:33 nativemad Exp $
+
+*guacamole-0.8.3 (26 Nov 2013)
+
+  26 Nov 2013; Andreas Schuerch <nativemad@gentoo.org> guacamole-0.6.2.ebuild,
+  +guacamole-0.8.3.ebuild:
+  version bump. Added ldap backend and depend on the new guacamole-server
+  instead of guacd and its libs. Also quoted so variables on 0.6.2 to make
+  repoman happy.
 
   14 Aug 2013; Patrick Lauer <patrick@gentoo.org> guacamole-0.6.2.ebuild:
   Whitespace
diff --git a/www-apps/guacamole/Manifest b/www-apps/guacamole/Manifest
index 55900bfb9795..8dfcfbd3eefa 100644
--- a/www-apps/guacamole/Manifest
+++ b/www-apps/guacamole/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST guacamole-0.6.2.tar.gz 97138 SHA256 e0cf64202f6d2ac4e82ceed52536c1da2bb50f9fa1cfc8143bc88ca20029a204 SHA512 b37ff09d8bd376338a5ec8230390c345f396702ee48578f485cb02493f1401288a4f80a96accf38d8cc684420c7b1d610850a4d7547a085b489537e46e70be2f WHIRLPOOL ecfa13096d44998c6c4594af937a95f90c93a19626b91c971b3f0c130c275dd72c76b9b4ce460954413cc9aecdcb3856f03974d80acb176f3e2329bb5e91f23c
 DIST guacamole-0.7.0.tar.gz 99852 SHA256 01ee413933ae7e2117658f398cfe9fff0becea221b39d4f4759985c0dc4b3e08 SHA512 e28a192f076f92d6e42f8bad045cea2655adaab563a826cb5c9aa4bfa217c96fa59bc9f6fb92898d5e001fb27fbef3fcf78f25f7be6c2e5a187a69d2eda0c38a WHIRLPOOL 2f8b6b0b3ecb9dab6b4604549bb85303b7a64cfab4cdad962cc6f27a663dc7df1b0e58f5a7a58496aecaf88fa3cebb203243b630de982bcea214dc5da342759e
 DIST guacamole-0.8.0.tar.gz 132578 SHA256 536963392cac4448c6f1aae9faf0298aa14e4a93166efa56a384e3f73d000ed6 SHA512 16c24dc3d907d9531a462acd9c86b96d05e5140a46ea185008c5178cc51dd1daece9bcbcec0c2b651d0e536b12b474dad38125f835e1fc588b5ea214d4ff92c1 WHIRLPOOL 01dffd2282696e450c990cd8fed47350f499b2d0653629be783c2730c084660fc40b46bbbcb73daa6d953b552a5dedd5a15e1623b544b57b0fb654b0810a9d5a
+DIST guacamole-auth-ldap-0.8.0.tar.gz 382872 SHA256 745e7541ab5db9decb463a7358e17c13cab5843d8458e0bf04f5a8eda8f19064 SHA512 2e775de3757b0e161fd7c6ac19982763bbafec42fef3418cb469cf3cb6bf1783b01486fe28e5a250af7b67107a5c3c73e2ad2b10a4e49b3ca187e76e2b578776 WHIRLPOOL df9a926df2f2a095a816234b6499640149e81acb4b6610d94ff8588e28ae9eaace8c0ca1808d1522aa55531674c53cbc6b5f55f606d7af73918610c9eb095ecf
 DIST guacamole-auth-mysql-0.8.0.tar.gz 2067246 SHA256 51ed996ae667068f542fec3e5c45cdfdaccc120c959537ab86bfa0f2f080edc2 SHA512 9d7daeab4f06cb7e49fd070d05464cff28d531d35143bb419b18751f5d195a931e27e3958db7da87ddb89d9e2d6363f8e49ef53e9ae090675f1b81e6aaa60ea8 WHIRLPOOL c621259ea2a96bccc3941cf8eff0bd5df245d9d96440da84e983365e9bca73d886d68ba9dc571edbd770031a60fbf94bc3aae7ec927316df0991d546c02559ee
-EBUILD guacamole-0.6.2.ebuild 1680 SHA256 34761263fb296ca724bea5d85c03bfd4945ebde3d7b2fdace98773d083168511 SHA512 c10557897441278ef8c3a31f187ae2bc443114477443e696ab9fdeb5c0dab633301ff4a93641fdf1a6ea005c94fc43c522e9c789439554c9ef30c2078a261a19 WHIRLPOOL bb472df126c85aa344e8880caf04953d4f71620e70433e1d6c3ac8b9094f5a9186e441e9bfc36f1c3e152c9d88be28278062229f40494193440d1c8115680d6f
+DIST guacamole-auth-mysql-0.8.2.tar.gz 2101795 SHA256 26902d50237a5bcb65b5dc9e31e7c51d6318614b97200c58c030a655e57aed82 SHA512 9bc5e7a5750d52a3df288088fa331f9e442cea06abf704df3989e714daba03e20b07ff5c531b4966ccc2f50c49124b9b7819447330d3be9ac5cce79c368663c6 WHIRLPOOL bce4711ca03315feb770cd82f07b4370ea8ff74ca38a952827b36428150ee31c3e6deaf633fd7e256047ccf9e361e80b2d46248e5f2f6c3f896363b2e2badd13
+DIST guacamole-client-0.8.3.tar.gz 345097 SHA256 a2e3d96b9f83308caf35068d657882fff9c3977533bb3b125cda1971422112ce SHA512 395ffbb08b877e4af538b1d0859d8e28e3352f2fe41482e7790c9b3c7597f37882ca032d383c7994d5f2e193404c5c267cdf793d642fb551e04465edfe93d7f0 WHIRLPOOL 19a778b40b7220604a7c5ecd93fa8a7680b7efadf304ffb5b747dad52bbf6dffdeed5a16c26cdd3773b6a0a155b7ba23a76b3233bdd2d658c0dc71a4a86ada80
+EBUILD guacamole-0.6.2.ebuild 1702 SHA256 a2e6ee8cf0e4290eb5e352516205b951aeb59606a8c98e675a0aa995bc9d5a5f SHA512 493fe76ef7cb304c7a992c87b40d613de95226dce0888a85c4d072006361da718a819bafca2ff74cb2a56377cf871014138316d112081edc63e3d19a663f416e WHIRLPOOL bbc48f8dc208ccc0149fa225ea668b4db6eced420cb750cfc80fd3cae762fcbeba7cb2baaff4793892f647e9a875e5fd9c8c180f4b47149c191e171b773c3326
 EBUILD guacamole-0.7.0.ebuild 1863 SHA256 70b9c864e4d290cc9c419f79208bf13e2189f7d075f6a62ba06c0be688c2429a SHA512 0d13c0368ae4347036b4690cb84f359ea364b730eec859b8c7e8bf754d3d445067554c8216b7433f13ccf96750b81ca9529d671512dd8203ade41cfdf53bc96b WHIRLPOOL 93ce76246cb7002c301aa506efde216b4b269f913a8bb053d90d11aad63d80afa009cd9f0b7aa0b7031edb982423923678c2c7683972343cc4b80ce0824e9071
 EBUILD guacamole-0.8.0.ebuild 3498 SHA256 3ef88190f0c064834f758a77d64fafd2096f60b279c816274f8ed05fc81cd2d6 SHA512 ae396389e501377abd6d49a6a74ff10e631ffeac89d93d6db4a30e7ab9d76bfcbd2ef4f8304f5ce755061e45d5c288ef6b372279a142f569253ac9702c31f097 WHIRLPOOL c92a95ac1cc356fab288c2792a362f5769363243388fc4b2039c71d70081ba42fc6f664a37981096b0a36d43cf13482b911119a4f4d16882b62cfd070cfa5744
-MISC ChangeLog 1188 SHA256 003b694bb6073ab09e6b9a7f5b8d0e5389fc84a7b9c6f566c5621b7c64325aea SHA512 2ea4ea043012e3c0639befa56ed75fa819d82cbd5c15a2a970c69a2d20b3ddc35e47db9ee96afc7825bd9322888ad71f5af7218bc129eb88b2f352a0cb578447 WHIRLPOOL d2be9187f613c637cf8de19341711a788eba52fae70ad0388669752c627bab784ca46452ba3614f36d382c1d63130af48f43a9fc437510e2d872ee01cb4dd7fb
+EBUILD guacamole-0.8.3.ebuild 4989 SHA256 b8a4046aaf9370bd088fa646d0391f212cc99bf3262b7cc03588aa87bee96394 SHA512 c6d79b0fc3e7a8874715dc4c43501174b74c9ff18ca26c98b04af947cc43f460beb770e1574efad593ce5ee79e144ecef7f19121fa630489e09b4e7cce288706 WHIRLPOOL 4a8b2ab3e2ff4b435752e6331c44b070901db93a6bcb39c622ebcf61a162bccd2e9ca40ea7eb4d4cc5b8c793704422333ec4d739b1c1135d35b2c13022dadb1d
+MISC ChangeLog 1495 SHA256 66e48914f450d297c9c45134380d8eee2754fc77f755eb50328ca53abc66d1ed SHA512 dff1dbd87e92076cd1b594c291ce4e8d1eec8ed32d7ecc56d3fb93b91d9e224872526732a47ac8d6c45f312704c66cb5e853426ae9060e5fb3c181e4063a6013 WHIRLPOOL 34bae342151d6d9003dbff3378cc4073a750117e897f875e45af49742459574f6a2b861ba6d0f7a633fd6a8387b9d386a0f5c88e03b84152fe0c95bd330ff006
 MISC metadata.xml 641 SHA256 8da01a09b9826c5d47a704916466f320c7da31f5356db20874ebd7fc737bd51f SHA512 caef7a3e86f7e1cd1338e4abab0ee96c06690ab831f66260007a3ae732449fd4c87e98b97009b6a7f7be5f80746828b8bd0f49dde5c5a89717caedc6435b3773 WHIRLPOOL 45ddf48b13040a4f0fb36d7cd39fc030b0e087bb353b09d6d8c83ee8bb627cac82ee5d23181373675395394d8c4a3435855b4001d8a686557df701819a7f34bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlKUmQ0ACgkQakKUmsHeVLJtygCfefge+X+AnBN0VuFMWdxInLo+
+7jcAnjNZmTAz70j9SB1SKecoBIHbpyy/
+=aaJX
+-----END PGP SIGNATURE-----
diff --git a/www-apps/guacamole/guacamole-0.6.2.ebuild b/www-apps/guacamole/guacamole-0.6.2.ebuild
index 09d4b07ca0f6..49af284a8ef1 100644
--- a/www-apps/guacamole/guacamole-0.6.2.ebuild
+++ b/www-apps/guacamole/guacamole-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.6.2.ebuild,v 1.5 2013/08/14 11:31:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.6.2.ebuild,v 1.6 2013/11/26 12:53:33 nativemad Exp $
 
 EAPI=4
 
@@ -26,19 +26,19 @@ RDEPEND="${DEPEND}
 	rdesktop? ( net-libs/libguac-client-rdp )"
 
 src_compile() {
-	mkdir ${HOME}/.m2
+	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-2.2 -s ${S}/settings.xml compile war:war
+	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}/settings.xml"
+	mvn-2.2 -s "${S}/settings.xml" compile war:war
 }
 
 src_install() {
-	sed -e 's:/path/to:/etc/guacamole:g' -i ${S}/doc/example/guacamole.properties || die "properties sed failed"
-	insinto /etc/${PN}
-	doins ${S}/doc/example/guacamole.properties
-	doins ${S}/doc/example/user-mapping.xml
-	insinto /var/lib/${PN}
-	newins ${S}/target/${P}.war ${PN}.war
+	sed -e 's:/path/to:/etc/guacamole:g' -i "${S}/doc/example/guacamole.properties" || die "properties sed failed"
+	insinto "/etc/${PN}"
+	doins "${S}/doc/example/guacamole.properties"
+	doins "${S}/doc/example/user-mapping.xml"
+	insinto "/var/lib/${PN}"
+	newins "${S}/target/${P}.war" "${PN}.war"
 	elog "Please unpack /var/lib/${PN}/${PN}.war in to your servlet container!"
 	elog "Please also link /etc/guacamole in to the lib directory of your servlet container."
 	elog "like this:"
diff --git a/www-apps/guacamole/guacamole-0.8.3.ebuild b/www-apps/guacamole/guacamole-0.8.3.ebuild
new file mode 100644
index 000000000000..723fb15a0d00
--- /dev/null
+++ b/www-apps/guacamole/guacamole-0.8.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.8.3.ebuild,v 1.1 2013/11/26 12:53:33 nativemad Exp $
+
+EAPI=4
+
+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? ( http://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-mysql-0.8.2.tar.gz )
+	ldap? ( http://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-0.8.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.8.2/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-mysql-0.8.2/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-mysql-0.8.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.8.0/lib/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		doins "${WORKDIR}/${PN}-auth-ldap-0.8.0/schema/guacConfigGroup.ldif"  "${WORKDIR}/${PN}-auth-ldap-0.8.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 connectrions in /etc/guacamole/user-mapping.xml if mysql is not used!"
+}