Version bump, drop some old versions

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

4 files changed, 11 insertions, 61 deletions

diff --git a/net-misc/x2goclient/ChangeLog b/net-misc/x2goclient/ChangeLog
index 02e454b2707c..2c1db239b7af 100644
--- a/net-misc/x2goclient/ChangeLog
+++ b/net-misc/x2goclient/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2012/12/16 16:29:13 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/ChangeLog,v 1.16 2013/01/08 10:53:53 voyageur Exp $
+
+*x2goclient-4.0.0.1 (08 Jan 2013)
+
+  08 Jan 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  -x2goclient-3.0.1.18.ebuild, -files/x2goclient-3.0.1.18-cups1.5.patch,
+  -x2goclient-3.99.2.1.ebuild, +x2goclient-4.0.0.1.ebuild:
+  Version bump, drop some old versions
 
   16 Dec 2012; Agostino Sarubbo <ago@gentoo.org> x2goclient-3.99.2.2.ebuild:
   Stable for x86, wrt bug #445766
diff --git a/net-misc/x2goclient/files/x2goclient-3.0.1.18-cups1.5.patch b/net-misc/x2goclient/files/x2goclient-3.0.1.18-cups1.5.patch
deleted file mode 100644
index 16d53fc9e132..000000000000
--- a/net-misc/x2goclient/files/x2goclient-3.0.1.18-cups1.5.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cupsprint.h.orig	2012-03-15 11:43:34.426485061 +0100
-+++ cupsprint.h	2012-03-15 11:43:52.533812925 +0100
-@@ -15,6 +15,7 @@
- #ifndef Q_OS_WIN
- #include <QStringList>
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- /**
- 	@author Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
- */
diff --git a/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild b/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild
deleted file mode 100644
index 6c6e54c1ba7a..000000000000
--- a/net-misc/x2goclient/x2goclient-3.0.1.18.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.0.1.18.ebuild,v 1.4 2012/06/08 11:42: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
-	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"
-
-S=${WORKDIR}/${P/-/_}
-
-src_prepare() {
-	# qmake looks for these files in the main directory
-	mv x2goclient/* . && rmdir x2goclient || die
-	epatch "${FILESDIR}"/${P}-cups1.5.patch
-	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-3.99.2.1.ebuild b/net-misc/x2goclient/x2goclient-4.0.0.1.ebuild
index 00276fd66781..a3198dfe5e4a 100644
--- a/net-misc/x2goclient/x2goclient-3.99.2.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.0.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-3.99.2.1.ebuild,v 1.1 2012/07/10 14:19:01 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-4.0.0.1.ebuild,v 1.1 2013/01/08 10:53:53 voyageur Exp $
 
 EAPI=4
 inherit eutils qt4-r2
@@ -23,8 +23,6 @@ DEPEND="net-libs/libssh
 RDEPEND="${DEPEND}
 	net-misc/nx"
 
-S=${WORKDIR}/${P/-/_}
-
 src_prepare() {
 	if ! use ldap; then
 		sed -e "s/-lldap//" -i x2goclient.pro || die