6 files changed, 93 insertions, 130 deletions
diff --git a/net-misc/x2goclient/ChangeLog b/net-misc/x2goclient/ChangeLog
index 9258dc639a3c..6eab9e5f817b 100644
--- a/net-misc/x2goclient/ChangeLog
+++ b/net-misc/x2goclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/x2goclient
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.28 2014/04/07 15:25:47 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.29 2014/04/10 15:19:50 voyageur Exp $
+
+*x2goclient-4.0.2.0 (10 Apr 2014)
+
+  10 Apr 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  -x2goclient-4.0.1.1.ebuild, -x2goclient-4.0.1.2.ebuild,
+  -x2goclient-4.0.1.3.ebuild, +x2goclient-4.0.2.0.ebuild:
+  Version bump, with official support for libssh 0.6.x, and other new features.
+  Remove some 4.0.1 versions
 
 *x2goclient-4.0.1.3-r2 (07 Apr 2014)
 
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 968ada074098..29c8db74bfc6 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -4,21 +4,18 @@ Hash: SHA256
 AUX x2goclient-4.0.1.3-password_connection.patch 811 SHA256 3d0b652f4fae06adbfeccf27056389bf7488a41dc7ee24547fe1254a72f0913a SHA512 9c2116d2d97e16548638cfac286831959b2be5851777c192c27558c65d0c2df33dda1e71c3c54bc8bdf55e9cc105ef2a66dfec6d95bffc207f9bd757982fcc0e WHIRLPOOL 242ce515adff369d58893b72ad76a7a21851f91b3f16d4917c2fd239f8502c1eaa289cece255f8c934071646bee267b70df9b5933115db17bb20ae99c5229ff4
 AUX x2goclient-4.0.1.3-timeout.patch 498 SHA256 6c813e425cb7cbfbedfd9f55897d09e3b0a009140399a07d12e5c7f709ea676b SHA512 a385510522f058cf3f72f1ef2c4474ffa6397055305b7806a5f3c955b826b7250b2ab5f081889531fb3606ae13bf39b720eea0e31d5abd74e048ba0cb4dc7958 WHIRLPOOL 4bf085e9ec77daf0eadd7f5a30b73c5301b4db73d7dabbbc0aad70bce33d82929566a2bfe0a13d38013e301bba451fc570b516ffddca5a0011d3bcfec85dd439
 DIST x2goclient-4.0.1.0.tar.gz 1323833 SHA256 3c72760f901ef6801529b9b5d8c3333002a53c65bdaeb9832f80d65f44665ed6 SHA512 6127df3826f79b72562d8184b1d3742f4cf5704f13db3b0eb8cbef32e99863dc7894785e289742fa39cad26965f8615b601bd86d8b9ca94de352c9db24acd141 WHIRLPOOL 9b5781bc38c4983fd0e1704f62239b4f43439a9b3d411b683ee07e32ea84ee0908ab5a262ef39529515222b4b379840c0f55a6ec4b31b71ddb7454039fcfce94
-DIST x2goclient-4.0.1.1.tar.gz 1345719 SHA256 dd3877f8830d6085241c60becbd79608a8b2155f941bac258cc5e2079f818be9 SHA512 dc7f8e173c6d8043a1528e9fe20480191d2e9d98321c9b22fdf5b0b0a181eb67d360bc076235a4a5ffe53e11d005b9c0e764f43c972f801e04368f3a4fd4f3dd WHIRLPOOL 5918e08b9078fc3e8defe0fca128ccbf5f5974991bf7bcf90be5ff296ce864f303bcc891465c3fb398f7752f7085fc4ce1711c62bc3827819697be10a8c03983
-DIST x2goclient-4.0.1.2.tar.gz 1363858 SHA256 feaf9532ebc4ee7cc7ac1342aa9ec59726dbf7f92d2f2e8e9da39fc96afe0823 SHA512 66f41bcf8829ec23d07e5b9c0d9fdc655e8f159bb29627d72722307c4fb868b89879e5a347cdcc298510ac91d27992a145986335b192839ab98fcfd5f1f9d421 WHIRLPOOL 43d79d851b08e37d79490a20f34d0a473ea94b726614a9a43a05110ff56ef62e31c3b8010cceff8d0291887616c6f60bd6a54ffae238484c0884a4444d2eb656
 DIST x2goclient-4.0.1.3.tar.gz 1368328 SHA256 7efa1f082bfe6808e651f6086c984c17202e9a98030eb23bd66132b1875428dc SHA512 3f2e30b8ab33afdc328a969fcf766e9a79ff7fc36f55293843542173cae68a59bcfb0eebb560dc8ee6899447df01cda97f65845733a78fc9dbaea2ef702391fb WHIRLPOOL 043d448d92fc90436459dfda5ffd1d17db9123b84677c0bc464da08c6b791f50c10487d175f82db250eb2a53131d7d6e2a4562375d97ebbcaff1654259b93e91
+DIST x2goclient-4.0.2.0.tar.gz 1398919 SHA256 7b1d42e30041d469ef986e686a1dacb4d0fb55d04fdcfc20ad26f5a4282d30b3 SHA512 09dfec61961aa63bb7e67aca26b765cd663dfab74d800990bdd6384cbbe9152c9dec91e5b46f44c211b31a12323920c1f6478f05c32ac42e530ce15652fcdeb8 WHIRLPOOL 06a07b033567fa5e3174462179abb1ef392fd43dc2b6985c27e2c87e49b7dbb017cafdbbd91cd5eb8e1476cff4433a56892f244328bc78183f295566733ac9e4
 EBUILD x2goclient-4.0.1.0.ebuild 1208 SHA256 94152fb30776ba6b51ba33b4572ffd61348ccc39036adea7e95066bbf3633e5e SHA512 03635477fdeb9fa8dc681bac9e04533b3fe80eb4c7ec3da981ff3fb56935ee6b5f3c065318ae629dcb4151a0c56c3d9ccd35590cbc3269d9fe6cde2756b0d5fb WHIRLPOOL 30610179c5ffa4fde5f69ae34842153d99de0781dd279289bc6588f75884e6b8598230d405f33891b2553987afbb40802cc47a71b6338c03e582b81254ee7944
-EBUILD x2goclient-4.0.1.1.ebuild 917 SHA256 667c4b4c04ced53876503ebd5f1b8461bd900a735a6dcc399e590e462c52d999 SHA512 d89dc0b58b7a1657f523df0b88005ff3510da5d26a3d4205331b21b3a54f2d1a49c0c259b0dae01371fd5a7b04e350e58888be04884b5d5be3deee9123634c9e WHIRLPOOL 8859611524c83d8e85232409a298922f2585bedf62402cd867dd37218cb734cbf54bc60a39a6e0a7a9ffb70e21bdb253941c1ef2026c7c4eee7b9b0b306178a6
-EBUILD x2goclient-4.0.1.2.ebuild 917 SHA256 a81c6940415f67552422ac8432155ad8eb7aae40f0ee5df1795e8c013e9f1de8 SHA512 0db5c326cdb0ff3b1779c52fcd0d23820b8497e7c96ac71829fe0a824e6ffc9608b09fa77fe6d594111f9bc759c739dbe40a5f22f34db1b929db9b849ed41c1f WHIRLPOOL 4ae528e9e56a7d3a428f4e46ac54e7b9e4d685d8c1c405cc3cc42acc91b1454f765c8bfd85cb2d5fb9c0c4c26c14a2ebe27e9daf2b064359b18a10aaa0d33447
 EBUILD x2goclient-4.0.1.3-r1.ebuild 1643 SHA256 9106187a5d153b7d52fb44432fda58463bd63584630eff2d738c186e4db173a2 SHA512 f48861adaefccbc10395b0c84bc97fc372f46d8457f1553820531dc1c156098043fb1e1f2a2445f2e3d13343447a470c34819b4ddc286f6af171f21e29f5371d WHIRLPOOL eadfbf6b20a7a5ee4cc33fcb057146670e5ed6d7df424ab783f004fdb68126e567f5f909c4dac73603a9bd0a1c62401032b05e22e3383b1c695c124af4d7de26
 EBUILD x2goclient-4.0.1.3-r2.ebuild 1732 SHA256 b50e5fb85a40664dfdae84ca56c2305b5c236ae17c0c0ae773ac2d4abcfef419 SHA512 2a0fdd304c8ac10771c6364e10c0b5ea3676b31ec991def15b512907907267f63422375255fcaac4b42221ce227534e71b9cb3e2d8a07960f9ee5db456e31e2c WHIRLPOOL 5ab241583ddb66855a92a381a1846fcfb085a2b9f4acf5a071764638513300d88f7be968e892a8185806f37c4ead1f5a375822d52574c7a7996239633ded694b
-EBUILD x2goclient-4.0.1.3.ebuild 917 SHA256 7683aab36ddaacc4a1009e54c970057f90b3e80be808b01bc8a33144c2c218bc SHA512 c74104bec215d98203e63ced5a2376851b7474951d949e7aa210f442b2ca706dd12d3382d08e1aef2fb12e8175ca0de366db432bbe3f5ed89b353992f45c6244 WHIRLPOOL 90dcc729159109ac4803dbc26b33035f16e38ac3e083d69f7ba0d7f461e6d65a673adb8b74dfef42dc00a6d98c2a850e1b111309be399628c77d95078713e690
-MISC ChangeLog 5125 SHA256 9fe696ae147c5ae59fc87a599c3df0002da55a69be85f4e11fec3be1d07fdc07 SHA512 25cb63b34250970b75aa6ab01f0c726554403cbd65885c672f65c12e59d2e44acd68f1d696bd7d37dbaeab7f5894a504abeffe976ae97543796484523869df64 WHIRLPOOL 2c274b3d572df8be2a8f52d5a2eb6469e4b95e81c6b06a3a0b47810891482dc7894e4ff1a253f9dede66890e6c6dd968150e72788cdb517e6fef33af68c775c9
+EBUILD x2goclient-4.0.2.0.ebuild 1640 SHA256 1db2280e9d7dcd525e5c75fffdf5d163845fcf98d35d24cb6e0f50a230c2b97a SHA512 22c170abac2a9a6e312510f486c348823282af55f361dd872616e5a84b7ffa098655dbd65327b60cd0627ebd1448741299982e9464e1a704e2024699e91193c4 WHIRLPOOL 804f40a3d7bcb66fe6c4f75e69d82f68d51337cb0d44872a50af17a8e6e2202bfdd8a974aec3a6f05f6b0201587d12c5e5ef749b17d5f7f8ab72277a15b9339e
+MISC ChangeLog 5441 SHA256 8f99b5f390f80f65dbfa7900963c33d3442f952333b57a6d22d0e53ce0bc5f2b SHA512 845683b93f3c2bf832b6bd405b40c9ba246fd675ba8e22f9ae6d8594234d82f2375172ef2e3ff58fd6f590c5cc155c5519c3ed7f67e47426a0cec304842be2ee WHIRLPOOL a13e6a6879683e99db22364a7a0e57dd3f57a6be05e3300f6c212b6a8665b2ae626278a84017b6e2d8791275d6ce9d0e690fe4edab876102fed0e70a0cb35a59
 MISC metadata.xml 211 SHA256 a6b5a5387c7e7f441d794c61edf1718caa3c58ffbf9b595ec536ff9617a7471f SHA512 a07791c0d23ed28f99fa6d1b38e25477b2a4a3eecc8dbcf3a098ed4a9d8ede755a8711f35046e8ae77107814c2c702ce26ea4b35a014b243301e2cae8fd747a0 WHIRLPOOL 83c2fcc96384e3bd5a97283fe0392d4bd9af41d175bedda09686349c2e26b64796157b81b42b74faed1adc1035d1fe3442986f2a89a84a8b29241283381c0d1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNCw4AACgkQFYEBGcdFJfLBpwD+MEHPdw6jFde1VlFvTaa/aehI
-9PFOMyXlFDIm99iKmx4A/AoOIeqrQFpRVJ1cU5OaUeVAW32vHYq/tRQE/k7luJS8
-=rgYQ
+iF4EAREIAAYFAlNGtqAACgkQFYEBGcdFJfL14AD/eDHIGZmREGg+D0pblr3Gt3YB
+appCfbXpXsKFnoscscQBAJTMgqhWmIQKCG5W/Q9hayuoKiVc+tfPb8N9tiNGztri
+=u0P7
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goclient/x2goclient-4.0.1.1.ebuild b/net-misc/x2goclient/x2goclient-4.0.1.1.ebuild
deleted file mode 100644
index 2aa2320b0912..000000000000
--- a/net-misc/x2goclient/x2goclient-4.0.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-4.0.1.1.ebuild,v 1.2 2013/10/21 09:15:07 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-0.6.0_rc1
-	net-print/cups
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-	dev-qt/qtsvg: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/x2goclient/x2goclient-4.0.1.2.ebuild b/net-misc/x2goclient/x2goclient-4.0.1.2.ebuild
deleted file mode 100644
index 02561ab0ebc6..000000000000
--- a/net-misc/x2goclient/x2goclient-4.0.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-4.0.1.2.ebuild,v 1.1 2014/01/03 15:34:28 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-0.6.0_rc1
-	net-print/cups
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-	dev-qt/qtsvg: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/x2goclient/x2goclient-4.0.1.3.ebuild b/net-misc/x2goclient/x2goclient-4.0.1.3.ebuild
deleted file mode 100644
index 2398ded540a0..000000000000
--- a/net-misc/x2goclient/x2goclient-4.0.1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-4.0.1.3.ebuild,v 1.1 2014/01/22 08:49:25 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-0.6.0_rc1
-	net-print/cups
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-	dev-qt/qtsvg: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/x2goclient/x2goclient-4.0.2.0.ebuild b/net-misc/x2goclient/x2goclient-4.0.2.0.ebuild
new file mode 100644
index 000000000000..d69219c3cb37
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.0.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-4.0.2.0.ebuild,v 1.1 2014/04/10 15:19:50 voyageur Exp $
+
+EAPI=5
+inherit eutils nsplugins 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 nsplugin"
+
+DEPEND=">=net-libs/libssh-0.6.0_rc1
+	net-print/cups
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}
+	net-misc/nx"
+
+CLIENT_BUILD=${WORKDIR}/${P}.client_build
+PLUGIN_BUILD=${WORKDIR}/${P}.plugin_build
+
+src_prepare() {
+	if ! use ldap; then
+		sed -e "s/-lldap//" -i x2goclient.pro || die
+		sed -e "s/#define USELDAP//" -i x2goclientconfig.h || die
+	fi
+
+	mkdir -p "${CLIENT_BUILD}"
+	use nsplugin && mkdir -p "${PLUGIN_BUILD}"
+}
+
+src_configure() {
+	cd "${CLIENT_BUILD}"
+	eqmake4 "${S}"/x2goclient.pro
+
+	if use nsplugin;
+	then
+		cd "${PLUGIN_BUILD}"
+		X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
+	fi
+}
+
+src_compile() {
+	cd "${CLIENT_BUILD}"
+	qt4-r2_src_compile
+
+	if use nsplugin;
+	then
+		cd "${PLUGIN_BUILD}"
+		qt4-r2_src_compile
+	fi
+}
+
+src_install() {
+	dobin "${CLIENT_BUILD}"/${PN}
+
+	insinto /usr/share/pixmaps/x2goclient
+	doins -r icons/*
+
+	domenu desktop/${PN}.desktop
+	doman man/man?/*
+
+	if use nsplugin;
+	then
+		# PLUGINS_DIR comes from nsplugins.eclass
+		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+		doexe "${PLUGIN_BUILD}"/libx2goplugin.so
+	fi
+
+	emake DESTDIR="${D}" PREFIX=/usr install_pluginprovider
+}