Allow to build plugin and install provider sample files, bug #500302

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

3 files changed, 90 insertions, 5 deletions

diff --git a/net-misc/x2goclient/ChangeLog b/net-misc/x2goclient/ChangeLog
index 5c282d915c6f..59d96dc64d4c 100644
--- a/net-misc/x2goclient/ChangeLog
+++ b/net-misc/x2goclient/ChangeLog
@@ -1,6 +1,12 @@
 # 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.26 2014/01/22 08:49:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.27 2014/02/05 13:15:01 voyageur Exp $
+
+*x2goclient-4.0.1.3-r1 (05 Feb 2014)
+
+  05 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goclient-4.0.1.3-r1.ebuild:
+  Allow to build plugin and install provider sample files, bug #500302
 
 *x2goclient-4.0.1.3 (22 Jan 2014)
 
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 8847e3ec2b9e..fd7cb76b0495 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -8,13 +8,14 @@ DIST x2goclient-4.0.1.3.tar.gz 1368328 SHA256 7efa1f082bfe6808e651f6086c984c1720
 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.ebuild 917 SHA256 7683aab36ddaacc4a1009e54c970057f90b3e80be808b01bc8a33144c2c218bc SHA512 c74104bec215d98203e63ced5a2376851b7474951d949e7aa210f442b2ca706dd12d3382d08e1aef2fb12e8175ca0de366db432bbe3f5ed89b353992f45c6244 WHIRLPOOL 90dcc729159109ac4803dbc26b33035f16e38ac3e083d69f7ba0d7f461e6d65a673adb8b74dfef42dc00a6d98c2a850e1b111309be399628c77d95078713e690
-MISC ChangeLog 4569 SHA256 7847812dbab7176127d1861ebd2b3a702446ac71c6b1c0e15b9d8eacefb41f33 SHA512 00a1c18cc4a7c517a6e18ca4fcde085b311edb9661074249c7bbba37a13404b9c1ad2bce7dfa8ead0b23c12ea8331eac1824cb96b129b80c64a3adebd47ab93e WHIRLPOOL 2d4a4515296ab498789abc7092f9d2b7ee8960bcb8ead19be7c206714ec31daa120bf8d774aff6ef530eada2b1683e32d6f6a4b7fcedccf74e66e4dd51d680b8
+MISC ChangeLog 4767 SHA256 21ce7810841a47960174d548de2f200abcff053727f467c957edf0f27771b1cc SHA512 8db9f7f76d57e0f30ec5f6fc2c74f993419a57bd12153e55ea05ea62da142fa2eadde5ce96869a57bacd3b37178e92956bd3e5189bc34d5aa8404464ce7b7dd5 WHIRLPOOL dc84e24e27913039e7291d42f7ee8aba378ed1996e0904d5dc2efddf050e4e36585e31c7d47ae56792e1c2ebab412fbfcf7da864bc16f287d62f12377caba283
 MISC metadata.xml 211 SHA256 a6b5a5387c7e7f441d794c61edf1718caa3c58ffbf9b595ec536ff9617a7471f SHA512 a07791c0d23ed28f99fa6d1b38e25477b2a4a3eecc8dbcf3a098ed4a9d8ede755a8711f35046e8ae77107814c2c702ce26ea4b35a014b243301e2cae8fd747a0 WHIRLPOOL 83c2fcc96384e3bd5a97283fe0392d4bd9af41d175bedda09686349c2e26b64796157b81b42b74faed1adc1035d1fe3442986f2a89a84a8b29241283381c0d1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLfhiwACgkQFYEBGcdFJfIhYAD9HYEmtbtIDUSdVgUNniNVruCx
-9kzIFA9o4z8JJF6S4FgA/3paBQwr5PXnQsUsmRIDRQIZponQ3nCT1zWVbqDzzY1p
-=eV9l
+iF4EAREIAAYFAlLyOVoACgkQFYEBGcdFJfKQjgD+MrsczNgTJumF9xdVh+G8WxNN
+oKosJn8P31V6gu7+98gA/0I2LLG+FJXDDDnYVOv0PJAEmzTFAVYXNOIBaG1vwle8
+=wp9e
 -----END PGP SIGNATURE-----
diff --git a/net-misc/x2goclient/x2goclient-4.0.1.3-r1.ebuild b/net-misc/x2goclient/x2goclient-4.0.1.3-r1.ebuild
new file mode 100644
index 000000000000..84bfd8ae305b
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.0.1.3-r1.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.1.3-r1.ebuild,v 1.1 2014/02/05 13:15:01 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
+}