Version bump

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

6 files changed, 137 insertions, 10 deletions

diff --git a/net-misc/x2goclient/ChangeLog b/net-misc/x2goclient/ChangeLog
index 98804553fee9..9174b77b7350 100644
--- a/net-misc/x2goclient/ChangeLog
+++ b/net-misc/x2goclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/x2goclient
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.12 2012/08/21 23:07:46 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.13 2012/11/15 09:38:51 voyageur Exp $
+
+*x2goclient-3.99.3.0 (15 Nov 2012)
+
+  15 Nov 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goclient-3.99.3.0.ebuild:
+  Version bump
 
 *x2goclient-3.99.2.2 (21 Aug 2012)
 
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 0c855422b85f..3a3a49bef9a9 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -4,16 +4,18 @@ Hash: SHA256
 AUX x2goclient-3.0.1.18-cups1.5.patch 293 SHA256 738651174afbf4f41792fe4755eeff852d1be1cde071cb962c6814be9d17347f SHA512 5772752d05dfa1e4dbc30e33e1bca27df275963a723b5a57317c2ef64d423c21d6e8fd5eed7361edefa5ca941d897da9bc1db57ec602033803b94ab892e93072 WHIRLPOOL 0458d0edb6b1b96005a6215464b19ee8cb4a8196dcf1d4fb10eb438dea81cb6532e95179608133763feec6dc07398d4e9edfc4196f8ac4a457a38a3cc4765a06
 DIST x2goclient-3.99.2.1.tar.gz 1120478 SHA256 7976f653b703a55279d00a6a515a2b1d8c02c781e5e3c6949cb87504aa3de51d SHA512 5d00c5ce1f6925a0a4d03d1f2563be4792f5a6b7d34e9d20f902606a4010a91838ada629305b535c02c804ae2a2a2bb1ff79482bdff585513e70a52d9b6783b4 WHIRLPOOL 12888f07fc52562644a43c6f780a729ac12e13909c18f0320615e08183ccadb6467e5d79b9ab1f02ec5f14f31d951e8d27468858226ba3ce7a1ebd2583dd8207
 DIST x2goclient-3.99.2.2.tar.gz 1120830 SHA256 ef3653cb7643ea17a2e5a3beb2d3072e4c6ddff6fcee2021e5d7251a07f6ca6a SHA512 f1d06073667a7ee1d29fb63ed08fc57854014f2c99fb3e56cba34f1d424ff9fc55abc6d5d1cd52cf87843e362bbea51cbdee999c3705603c33bbefb17a5048f9 WHIRLPOOL de55e36e57d444f366ad398f4dd7930c2fd13090b65f086dfc22022e817558df920386d7a230ffeb399316474a65b9fba3ade4a6e72e959209c594829563053d
+DIST x2goclient-3.99.3.0.tar.gz 1170567 SHA256 cd339920b933cd8fd319bfed69abac55e604c08fdd648968f8594d48df71a618 SHA512 ada6dec2b799a88b400928edde60c13f4f377679cf0adea643f4452ec1cb5bf26a4c92a530da29b8d6d7dae2d93e4476fba8a2f234f0878666bd5be8f783d363 WHIRLPOOL 08534dcea822ab6b048daf5aedd2dbe9a6f63fba0892496c9822a62d5420737e1e004b836f439fab4784eaf1153e778623d46a1d3b41cedf9d49a1d8cd0418ca
 DIST x2goclient_3.0.1.18.tar.gz 1070652 SHA256 92f5f9de071b47c381ddbfcbe90e0ed9fc615c128ab7c1b80a67f167a97826f3
 EBUILD x2goclient-3.0.1.18.ebuild 1082 SHA256 94d1b61f12e60339bd07ddfdc7689a9b7f7e3741044f9796754dfe5c11a5f1d5 SHA512 2f83467376868c44fb7ad21b8489467ab0edf5665ccde89ad5e35b33313be8e2ffcf787731e9dd46322b3926433a2494bd488f79a1f70deb385953cc646c3f26 WHIRLPOOL 0318034e3f02fedd67e7dfea7fc35b4f9f0b9c3af6814c45dfd2e99b12a5765d03a228337f3b2662e58f00561a67dacba8dec1201551016606599cfbda12220d
 EBUILD x2goclient-3.99.2.1.ebuild 938 SHA256 525c2bbdefbac478f9bcb76e2033708d39a5e092caa15d492a4400759bfcc80a SHA512 092b3cad57089dc9034ab8fec7e06044b1955302c7c1bc0cd034ab03c32820d5c02e4ae770d89103dbdd38aca44a27e851592ffbba3bb355f12d7833d7b677dc WHIRLPOOL 1ca85cbc79b5f344112ec50f0810a01d074640c22a352abbacba0836fd44db21e84da8a6cf005ea73a7042dacf506bde097b9f7965582cf7cd6c710279231346
 EBUILD x2goclient-3.99.2.2.ebuild 915 SHA256 7ff5950d8908cc8c7879e1346eae6cc9b6b5f692df745b11d90ab4ae2f04b84e SHA512 dda773feabfafa4f20b08f011e6bd45d599bdd0589893653d4d793048f1e1472747c30edf73c16f3ef8dc1b2273299103f5038f8a7bd5af62fb81aad80c338ad WHIRLPOOL eec3e20f9cae67b4efff0b7582e7eee6d13ac2aec943f6abc85a138a78cabe41ddb4e2a1fb5ee09880be6364f2da04bda41a59c21f55dd5ae4dfa962fac5db73
-MISC ChangeLog 2426 SHA256 854399fd8a319b8b49d2f3f06e6af73b4ac639ef3528b49b796236cc361e2280 SHA512 3f056d88fd1c55a627f43f6c3b6fd1d7b2fbef089fd6da55a9655959939e496e46b8cf7a535160f5c6f4279a860817de1eef88ee555a610182d46eaf2b663e06 WHIRLPOOL c6d41815a092e2378eeb34f716b095510eb61244a5ddabeba626e7f96a152189ac51d9fd5dd5348433ee1e034893e91f472ecbb156dc2724e812007c4868174e
+EBUILD x2goclient-3.99.3.0.ebuild 915 SHA256 1cc284b7b9ecf3fb125c3e5a4ab7d3f800aa029d3d05cc48edd63b5b34160b88 SHA512 a8b780e9e3a1d7e032e9c1ff540f4af45b8a56b074674bb149a3abff8a80d416cdb9db4ff8e0bf9361d0595ecf4ef7902455250308dd26998a2b7a4dcdca3e18 WHIRLPOOL f44f2e654fca0b87f4b5a4130246756aafeb3b1251fbc9be5e47f607ebe992b62deb4a053dc4551ffbfe281a5b11d875b0d391c6f800c69320a7df939a78eb16
+MISC ChangeLog 2564 SHA256 044c1a52e20a8456ef37cee10f964d7c7081559a8cbaaef26be6140d9ac6a8d5 SHA512 fd0fe95cfa888dc287d362e3cdb2ab2d96166aba4b6eac4f3217ffc214b054b609f6e37589e74f7366e21cb1c7ddc285ff603e30c2584809f7cdcffdfe25b90f WHIRLPOOL 0e02f279e16fa156e2737fe2dbb4e6378948644d2422994f331a58b253c2484a27c3bdbdf3bc29f60062a8925efea50d953ded5bb43ee857e55afc0195ac78b1
 MISC metadata.xml 211 SHA256 a6b5a5387c7e7f441d794c61edf1718caa3c58ffbf9b595ec536ff9617a7471f SHA512 a07791c0d23ed28f99fa6d1b38e25477b2a4a3eecc8dbcf3a098ed4a9d8ede755a8711f35046e8ae77107814c2c702ce26ea4b35a014b243301e2cae8fd747a0 WHIRLPOOL 83c2fcc96384e3bd5a97283fe0392d4bd9af41d175bedda09686349c2e26b64796157b81b42b74faed1adc1035d1fe3442986f2a89a84a8b29241283381c0d1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlA0FMwACgkQFYEBGcdFJfJ8hwD/f1ROKtAPNqOV5zzyD1XfZahs
-glqFSJfgtuv+PdaZ8KcA/AsFqu4wszd3qjr0/V92+SVlHLhymFZKVRupJT7NpALr
-=Whe/
+iF4EAREIAAYFAlCkuDIACgkQFYEBGcdFJfKEWgD/Z+rSnNWq1f+mE0l4Qfly4cBC
+b7G2IanYOILnkq4olhAA+QE949+U64NgKpr6pLRlMcFg9F1MmbXLIMOQwV4nPPt5
+=osaU
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goclient/x2goclient-3.99.3.0.ebuild b/net-misc/x2goclient/x2goclient-3.99.3.0.ebuild
new file mode 100644
index 000000000000..33f6d18fd662
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-3.99.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-3.99.3.0.ebuild,v 1.1 2012/11/15 09:38:51 voyageur Exp $
+
+EAPI=4
+inherit eutils qt4-r2
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+DEPEND="net-libs/libssh
+	net-print/cups
+	x11-libs/qt-core:4[ssl]
+	x11-libs/qt-gui:4
+	x11-libs/qt-svg:4
+	ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}
+	net-misc/nx"
+
+src_prepare() {
+	if ! use ldap; then
+		sed -e "s/-lldap//" -i x2goclient.pro || die
+		sed -e "s/#define USELDAP//" -i x2goclientconfig.h || die
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/pixmaps/x2goclient
+	doins -r icons/*
+
+	make_desktop_entry ${PN} "X2go client" ${PN} "Network"
+}
diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index cc777a838e2b..5af8fc1f95ae 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/x2goserver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.13 2012/10/31 14:23:28 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.14 2012/11/15 09:40:22 voyageur Exp $
+
+*x2goserver-3.1.1.6 (15 Nov 2012)
+
+  15 Nov 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goserver-3.1.1.6.ebuild:
+  Version bump
 
 *x2goserver-3.1.1.4-r1 (31 Oct 2012)
 
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 6d515f68bf27..623a54f03770 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -5,17 +5,19 @@ AUX x2goserver-3.1.1.4-cflags.patch 600 SHA256 5d65df4fb976121f2311205ae519a8cee
 AUX x2goserver.init 563 SHA256 c051f263ad2ad9b6064ce12098ad0c3d48b2a83a2c02ccd79020e0ce4be3331c SHA512 cac89ad0032b56188dc30f09bd461762934d5fadf53ccf361125dbefed3c09000b9b00684f7823424340d290c759e112e618f4d4e9d7e739c79702b70a6b3b3c WHIRLPOOL 0f134b9aed4e60f48e7089f97ca6d183387049d6f3ff44c9e8fe476acf3aa5cade1f205ac1d8c1905cacb1c58ea13e1c14545dc993f4dd59cf5a4d36c3e0a511
 DIST x2goserver-3.1.1.3.tar.gz 64250 SHA256 1326cacc23da835ba4739cefcc7024dd12818a1b8159c38233601e48e4c10827 SHA512 679ebf833c7c98463d838cf44ebb10df40758c5d0b1d5820f298a09e2d7de59da62049da5cdef69c83dbba70442ca80563ec8eeb44de95402e6ff93fe90bd5d6 WHIRLPOOL 987f85225c131fec8c8a354e4f335a98400feba231cfc86adec735c42e3f691ab45cbfd0d5425835c671add11de19f556c89c4031bb353199b6fbf59ea61182b
 DIST x2goserver-3.1.1.4.tar.gz 64858 SHA256 17139f5c9b9d649ced0c9c6723cfaa1afdbfeb4001748ced9d05fa88848dceae SHA512 fd55a0a415fd9d0633f788783ba70ae8d5544283ab9f454e16c05249ea75eb141a4d40e7875048cd87610cb14654e04a986b22b460c6a3974bc0c491bcdf8b76 WHIRLPOOL 4040513461e6bd90c454791ba7c6c291e93ca7e0dd179eda1cb507174784c8746d8806416ad19c368271c31cda20fafabcac0f14c0e755db445da5e9f6ffda61
+DIST x2goserver-3.1.1.6.tar.gz 65941 SHA256 f89c889a11a5183e6d0bdc5d2f37d32353096b6645fc6e3e2a2486bb6f5114b9 SHA512 39729bafe3329f6d2aff6a90be42eab3d17b712516503cd4a2dd61e8af02a9b3bdd20543147eeadeca0ffa4b05fc5187120b9932145d9753c5ea47fc053a6545 WHIRLPOOL 5177d77337fd3857c2bce896729fca8180e0e86617234860b93ef067a0e7e15c1db0a647276427f6d26be956517f8b4017a9c41d00356207a1584b363fda4794
 DIST x2goserver_3.1.0.1.tar.gz 57696 SHA256 5a8c5576be25ffcf147171c009962ceef3d23fe5c43b7d1f2b08d5953b8b677d SHA512 32b56416c9fd77efbc6da0655435f0f4d5f02a3a53df544a97dc546db02ee548c29fe9fe63a6cf8744bcdd33be0c457360dd8ca1d435592b5f1961211de20594 WHIRLPOOL 2eebbdfb940c8db36558baa3f5afaca562ae5e49265f8abd6cf8064f991eb64e91969a39932f9d33716a30c4724ac5be48d172b7ef2ff95eb340ed0e8a523f4f
 EBUILD x2goserver-3.1.0.1.ebuild 1553 SHA256 aec026e3ce44a12dc5dc30afb0b6a920120253c5819cfef11ad5568be3204032 SHA512 fea9798c960c70778bfda924016c5a62b533378aa6c301beb55e8bab0930de6f5af20267083643ecd9e645c36e224bc105892aece6f7db5fa058e10f5caacc53 WHIRLPOOL f1af4e477f58a4a399274e512ca79aab55cb3c3d506c82ccae51783b19cb75c6d0501ce4872c7f16d49a478a164e3de697820abdfc82e04f17b29cbe30206766
 EBUILD x2goserver-3.1.1.3.ebuild 1777 SHA256 9338b4b7241c384cb8346cb7838a9125947a910db9c6cf0784af88562688135e SHA512 d718dc4af88a819224f08223ba8ae995f55710ab1dc5d568e3fbe9bfed1e4e230b93ced0e18b4f575d01fb13f028c9314b8f2501aea6557bd58c65c88bcb5aad WHIRLPOOL 94c20d9962d31492c887f71f33356ce359efd9d328e8fbf5631b2f48a99ffd32474a844c87f6cf32ab6f4c4ce14e5c50984d99f92dfc9417aace4383ee416ad6
 EBUILD x2goserver-3.1.1.4-r1.ebuild 1971 SHA256 a4605bc3bfadd1217d6b4054e2499b63d15b78645dc4c5ee80caf2bc7af3d838 SHA512 07b4ee8437d88b2792c9f662aabd81b639324a1062c81386dde24656a285e6aeb99c93ec4efe66cac828283679c431196c9c863b6508cb403981af1dc89386a5 WHIRLPOOL d2f6b5b2bd399433780bf11aa82d80635c6f2e0eac7c47c1f1763d0c8c73c37148dbff082463386df51e9b930991c253bd85ca2e3a584264d466decb29021450
 EBUILD x2goserver-3.1.1.4.ebuild 1777 SHA256 491246f1ad365209292de2d3ff4ac659dcb29b55e1b1afaccf5f8708912fde8b SHA512 d832af1d7b9f70fc25aefc2d55cd833644597c735c39172853d826dfb271630d5fa16ea7c3caa0ef19058cc53d27be5bda5705019fc6bb4fb1107fbeddf95c75 WHIRLPOOL ac47a6268a071adfbf7856e5138bee6914fb69e699991250f0a7c7bced0c3650234d4383defc14bacc07995b6de2c1a757bcfb391581191faaff24f368f68e60
-MISC ChangeLog 2864 SHA256 f2b43e30022a919c74d3ded07c1d5917487d61018b7f232d1ffce53b01eac4c7 SHA512 113fefb276e835c5faac67db77ba480fe17067eab4e85d932b69ee2e2ec26a1d595404d8671a4e7109397af896d7f97db2c2ec150f7b5a7173da0dce002745d8 WHIRLPOOL 3aa26d709d84866b89843320408f2b9a849568d5987696ef73b7912a5239707fa1314caf6d5f376988a0742b4bf10d04ebde7e618d6d2257180e8e297f770b84
+EBUILD x2goserver-3.1.1.6.ebuild 1977 SHA256 6e5de3076f49f025903ec5c2bd54054de28e9b643bd2879025450aff76c95217 SHA512 3641243c3b270ad7ecee95db8b8e230c29eed3ba58a1518769c3561a8ff65f79710bc7101a5319956198829df8670e9e128041123dce74c9a7c4447adc62b8e2 WHIRLPOOL b6f74c2716bee4024f379490c76549a73177bec446b698af0386f84b77274687542e421a848bd9f1f1fa07aeeede2e0e116593eccfb8282d6a94dad387c6960f
+MISC ChangeLog 3000 SHA256 01df3708de545db4d79cbc45592331da6b3fbc44e4903de32f6604fc9d747dd5 SHA512 d036d03683350b9596d9c3c28f42eee04d0d7d508ceedfdf9cf1fcc1aa7a3db7e52bbb6ea80c020ce09d17b2b6b09f1c868c6c12d7ac455c89a30ea6f5130321 WHIRLPOOL 9fc67a8dcc682932cc4f624d427847b7c59e9b435caa3246b2cae2cc053247a50446e7a03c3787cba9f58fe5d0b60b3bc20fcd007fb74807145ca20acfb6b8e0
 MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCRNGYACgkQFYEBGcdFJfLPpQD+OdCYl82d3kCWakaCD1i34t6S
-BE3aSow6Y9M2iyDYPlABAIObUiXEdjfYdPS+DsdCpuCZf9zpc+sXNUkcNY3cTbrY
-=jJwj
+iF4EAREIAAYFAlCkuIsACgkQFYEBGcdFJfKtcwD/aW5S2997q5jedCk74N9QyK2f
+CwvPC2wdxGlbnamTM9wBAILKDjt4/tE7FdiIZK3JfWaFxOsjqzkPvLqvi+KxpVN/
+=GV6F
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goserver/x2goserver-3.1.1.6.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.6.ebuild
new file mode 100644
index 000000000000..b32f1fa0ee0c
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-3.1.1.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.6.ebuild,v 1.1 2012/11/15 09:40:22 voyageur Exp $
+
+EAPI=4
+inherit eutils multilib toolchain-funcs user
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND="sys-apps/man"
+RDEPEND="dev-perl/Config-Simple
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc
+	net-misc/nx
+	virtual/ssh
+	fuse? ( sys-fs/sshfs-fuse )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+pkg_setup() {
+	enewuser x2gouser -1 -1 /var/lib/x2go
+	enewuser x2goprint -1 -1 /var/spool/x2goprint
+}
+
+src_prepare() {
+	# Respect CC/CFLAGS
+	epatch "${FILESDIR}"/${PN}-3.1.1.4-cflags.patch
+
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i */Makefile || die "multilib sed failed"
+	# Use nxagent directly
+	sed -i -e "s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+	dosym /usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+}
+
+pkg_postinst() {
+	if use sqlite ; then
+		elog "To use sqlite and create the initial database, run:"
+		elog " # x2godbadmin --createdb"
+	fi
+	if use postgres ; then
+		elog "To use a PostgreSQL databse, more information is availabe here:"
+		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
+	fi
+
+	elog "For password authentication, you need to enable PasswordAuthentication"
+	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+	elog "An init script was installed for x2gocleansessions"
+}