Version bump, with official support for libssh 0.6.x, and other new features. Remove some 4.0.1 versions

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

5 files changed, 87 insertions, 121 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/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
+}