Version bump from NX overlay, update to qt4-r2, drop 2.x versions

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 88 insertions, 121 deletions

diff --git a/net-misc/x2goclient/ChangeLog b/net-misc/x2goclient/ChangeLog
index 7489ed5ad204..20b1deb524fa 100644
--- a/net-misc/x2goclient/ChangeLog
+++ b/net-misc/x2goclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/x2goclient
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.4 2009/10/06 17:29:34 ayoy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.5 2010/04/29 13:40:04 voyageur Exp $
+
+*x2goclient-3.01.5 (29 Apr 2010)
+
+  29 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -x2goclient-2.0.1.24.ebuild, -files/x2goclient-2.0.1-noldap.patch,
+  -x2goclient-2.99.3.ebuild, +x2goclient-3.01.5.ebuild,
+  +files/x2goclient-3.01.5-noldap.patch:
+  Version bump from NX overlay, update to qt4-r2, drop 2.x versions
 
   06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> x2goclient-2.99.3.ebuild:
   Removed alternative dependency on Qt metapackage also from 2.99.3
diff --git a/net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch b/net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch
deleted file mode 100644
index fb87922f7c46..000000000000
--- a/net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur x2goclient-2.0.1.orig/x2goclientconfig.h x2goclient-2.0.1/x2goclientconfig.h
---- x2goclient-2.0.1.orig/x2goclientconfig.h	2008-12-11 19:56:03.000000000 +0100
-+++ x2goclient-2.0.1/x2goclientconfig.h	2008-12-11 19:56:40.000000000 +0100
-@@ -10,13 +10,4 @@
- 
- //#define LOGFILE QDir::homePath()+"/x2goclient.log"
- 
--#if !defined WINDOWS
--#define USELDAP
--#endif
--
--
--#if defined Q_WS_HILDON
--#undef USELDAP
--#endif
--
- #endif
-diff -Naur x2goclient-2.0.1.orig/x2goclient.pro x2goclient-2.0.1/x2goclient.pro
---- x2goclient-2.0.1.orig/x2goclient.pro	2008-12-11 19:56:03.000000000 +0100
-+++ x2goclient-2.0.1/x2goclient.pro	2008-12-11 19:56:23.000000000 +0100
-@@ -37,7 +37,6 @@
- INCLUDEPATH += .
- RESOURCES += resources.rcc
- RC_FILE = x2goclient.rc
--LIBS += -lldap
- QT += svg network
- ICON =icons/x2go-mac.icns
- QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk
-diff -Naur x2goclient-2.0.1.orig/x2goclient.pro.default x2goclient-2.0.1/x2goclient.pro.default
---- x2goclient-2.0.1.orig/x2goclient.pro.default	2008-12-11 19:56:03.000000000 +0100
-+++ x2goclient-2.0.1/x2goclient.pro.default	2008-12-11 19:56:23.000000000 +0100
-@@ -37,7 +37,6 @@
- INCLUDEPATH += .
- RESOURCES += resources.rcc
- RC_FILE = x2goclient.rc
--LIBS += -lldap
- QT += svg network
- ICON =icons/x2go-mac.icns
- QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk
diff --git a/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch b/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch
new file mode 100644
index 000000000000..ccb27e6ae728
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch
@@ -0,0 +1,26 @@
+diff -Naur x2goclient-3.01.orig/x2goclientconfig.h x2goclient-3.01/x2goclientconfig.h
+--- x2goclient-3.01.orig/x2goclientconfig.h	2010-04-19 20:19:56.000000000 +0200
++++ x2goclient-3.01/x2goclientconfig.h	2010-04-19 20:21:05.000000000 +0200
+@@ -8,10 +8,6 @@
+ 
+ //#define LOGFILE QDir::homePath()+"/x2goclient.log"
+ 
+-#if !defined Q_OS_WIN
+-#define USELDAP
+-#endif
+-
+ #ifdef Q_OS_WIN
+ #undef USELDAP
+ #endif
+diff -Naur x2goclient-3.01.orig/x2goclient.pro x2goclient-3.01/x2goclient.pro
+--- x2goclient-3.01.orig/x2goclient.pro	2010-04-19 20:19:57.000000000 +0200
++++ x2goclient-3.01/x2goclient.pro	2010-04-19 20:21:30.000000000 +0200
+@@ -70,7 +70,7 @@
+ 
+ linux-g++ {
+     message(building x2goclient with ldap and cups)
+-    LIBS += -lldap -lcups
++    LIBS += -lcups
+ }
+ macx {
+     message(building x2goclient with ldap and cups)
diff --git a/net-misc/x2goclient/x2goclient-2.0.1.24.ebuild b/net-misc/x2goclient/x2goclient-2.0.1.24.ebuild
deleted file mode 100644
index 5977daac0cb1..000000000000
--- a/net-misc/x2goclient/x2goclient-2.0.1.24.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-2.0.1.24.ebuild,v 1.2 2009/10/06 17:26:47 ayoy Exp $
-
-EAPI="2"
-inherit qt4 versionator
-
-MAJOR_PV="$(get_version_component_range 1-3)"
-FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://x2go.berlios.de"
-SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap"
-
-DEPEND="net-misc/nx
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MAJOR_PV}
-
-src_prepare() {
-	use ldap ||	epatch "${FILESDIR}"/${PN}-${MAJOR_PV}-noldap.patch
-}
-
-src_compile() {
-	eqmake4
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-}
diff --git a/net-misc/x2goclient/x2goclient-2.99.3.ebuild b/net-misc/x2goclient/x2goclient-2.99.3.ebuild
deleted file mode 100644
index 4666e45af753..000000000000
--- a/net-misc/x2goclient/x2goclient-2.99.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-2.99.3.ebuild,v 1.2 2009/10/06 17:29:34 ayoy Exp $
-
-EAPI="2"
-inherit qt4 versionator
-
-MAJOR_PV="$(get_version_component_range 1-2)"
-FULL_PV="${MAJOR_PV}-$(get_version_component_range 3)"
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://x2go.berlios.de"
-SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap"
-
-DEPEND="net-misc/nx
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MAJOR_PV}
-
-src_prepare() {
-	use ldap ||	epatch "${FILESDIR}"/${PN}-2.0.1-noldap.patch
-}
-
-src_compile() {
-	eqmake4
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-}
diff --git a/net-misc/x2goclient/x2goclient-3.01.5.ebuild b/net-misc/x2goclient/x2goclient-3.01.5.ebuild
new file mode 100644
index 000000000000..0ed0ba5cfa68
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-3.01.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-3.01.5.ebuild,v 1.1 2010/04/29 13:40:04 voyageur Exp $
+
+EAPI="3"
+inherit qt4-r2 versionator
+
+MAJOR_PV="$(get_version_component_range 1-2)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 3)"
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://x2go.berlios.de"
+SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cups ldap"
+
+DEPEND="net-misc/nx
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-svg:4
+	cups? ( net-print/cups )
+	ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${MAJOR_PV}
+
+src_prepare() {
+	use ldap ||	epatch "${FILESDIR}"/${P}-noldap.patch
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+
+	# copying the icons
+	insinto /usr/share/pixmaps/x2goclient
+	doins icons/*
+	insinto /usr/share/pixmaps/x2goclient/16x16
+	doins icons/16x16/*
+	insinto /usr/share/pixmaps/x2goclient/32x32
+	doins icons/32x32/*
+	insinto /usr/share/pixmaps/x2goclient/64x64
+	doins icons/64x64/*
+	insinto /usr/share/pixmaps/x2goclient/128x128
+	doins icons/128x128/*
+	insinto /usr/share/pixmaps/x2goclient/hildon
+	doins icons/hildon/*
+
+	make_desktop_entry ${PN} "X2go client" ${PN} "Network"
+}