Version bump, drop some old versions

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

5 files changed, 24 insertions, 67 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/Manifest b/net-misc/x2goclient/Manifest
index cff898020a3f..c395a4116af8 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,11 +1,18 @@
-AUX x2goclient-3.0.1.18-cups1.5.patch 293 SHA256 738651174afbf4f41792fe4755eeff852d1be1cde071cb962c6814be9d17347f SHA512 5772752d05dfa1e4dbc30e33e1bca27df275963a723b5a57317c2ef64d423c21d6e8fd5eed7361edefa5ca941d897da9bc1db57ec602033803b94ab892e93072 WHIRLPOOL 0458d0edb6b1b96005a6215464b19ee8cb4a8196dcf1d4fb10eb438dea81cb6532e95179608133763feec6dc07398d4e9edfc4196f8ac4a457a38a3cc4765a06
-DIST x2goclient-3.99.2.1.tar.gz 1120478 SHA256 7976f653b703a55279d00a6a515a2b1d8c02c781e5e3c6949cb87504aa3de51d SHA512 5d00c5ce1f6925a0a4d03d1f2563be4792f5a6b7d34e9d20f902606a4010a91838ada629305b535c02c804ae2a2a2bb1ff79482bdff585513e70a52d9b6783b4 WHIRLPOOL 12888f07fc52562644a43c6f780a729ac12e13909c18f0320615e08183ccadb6467e5d79b9ab1f02ec5f14f31d951e8d27468858226ba3ce7a1ebd2583dd8207
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST x2goclient-3.99.2.2.tar.gz 1120830 SHA256 ef3653cb7643ea17a2e5a3beb2d3072e4c6ddff6fcee2021e5d7251a07f6ca6a SHA512 f1d06073667a7ee1d29fb63ed08fc57854014f2c99fb3e56cba34f1d424ff9fc55abc6d5d1cd52cf87843e362bbea51cbdee999c3705603c33bbefb17a5048f9 WHIRLPOOL de55e36e57d444f366ad398f4dd7930c2fd13090b65f086dfc22022e817558df920386d7a230ffeb399316474a65b9fba3ade4a6e72e959209c594829563053d
 DIST x2goclient-3.99.3.0.tar.gz 1170567 SHA256 cd339920b933cd8fd319bfed69abac55e604c08fdd648968f8594d48df71a618 SHA512 ada6dec2b799a88b400928edde60c13f4f377679cf0adea643f4452ec1cb5bf26a4c92a530da29b8d6d7dae2d93e4476fba8a2f234f0878666bd5be8f783d363 WHIRLPOOL 08534dcea822ab6b048daf5aedd2dbe9a6f63fba0892496c9822a62d5420737e1e004b836f439fab4784eaf1153e778623d46a1d3b41cedf9d49a1d8cd0418ca
-DIST x2goclient_3.0.1.18.tar.gz 1070652 SHA256 92f5f9de071b47c381ddbfcbe90e0ed9fc615c128ab7c1b80a67f167a97826f3
-EBUILD x2goclient-3.0.1.18.ebuild 1082 SHA256 94d1b61f12e60339bd07ddfdc7689a9b7f7e3741044f9796754dfe5c11a5f1d5 SHA512 2f83467376868c44fb7ad21b8489467ab0edf5665ccde89ad5e35b33313be8e2ffcf787731e9dd46322b3926433a2494bd488f79a1f70deb385953cc646c3f26 WHIRLPOOL 0318034e3f02fedd67e7dfea7fc35b4f9f0b9c3af6814c45dfd2e99b12a5765d03a228337f3b2662e58f00561a67dacba8dec1201551016606599cfbda12220d
-EBUILD x2goclient-3.99.2.1.ebuild 938 SHA256 525c2bbdefbac478f9bcb76e2033708d39a5e092caa15d492a4400759bfcc80a SHA512 092b3cad57089dc9034ab8fec7e06044b1955302c7c1bc0cd034ab03c32820d5c02e4ae770d89103dbdd38aca44a27e851592ffbba3bb355f12d7833d7b677dc WHIRLPOOL 1ca85cbc79b5f344112ec50f0810a01d074640c22a352abbacba0836fd44db21e84da8a6cf005ea73a7042dacf506bde097b9f7965582cf7cd6c710279231346
+DIST x2goclient-4.0.0.1.tar.gz 1239157 SHA256 569cc69f03edcece997a56ccb57b9e70c65b8697000328bde2d75cdb928f4ac9 SHA512 efe0597669946d06735004afc94087133d42c59e1f32b5dd4c5c7b78437736af882301cdf241686a547619bce64ee0456d052a60796579cd28d48b04c945d18d WHIRLPOOL fedc88e4c18b3a3b7800f98c0f95fdd3659dd8cb9c5c25991d20b9f789687fc88d12bb30b6d6f6534ab2877225e0736e78bfd4e88b638f36c4d6b8a27170d307
 EBUILD x2goclient-3.99.2.2.ebuild 908 SHA256 1e41f35783b12ee768ae2b12bb447c436445953c70bda1e3cc48e260005a2ba2 SHA512 a7153ee8ed1bbaf3bafe0ef8c8746c3f59ae32353d9bc49faab4bebb86cec15cb4452850654ef27bc2be58ee20296070c2ddb74bd8b1dab25802baa35986c5ed WHIRLPOOL fb6f68c6d6d9b16c28bf8d4aed5317affb84b0c0ea2cba0809ebfbab71aa2ee6dfee9cc06453db9b744cbad2bcca43881f8e30f5af4e82042a44f794be0942b9
 EBUILD x2goclient-3.99.3.0.ebuild 915 SHA256 1cc284b7b9ecf3fb125c3e5a4ab7d3f800aa029d3d05cc48edd63b5b34160b88 SHA512 a8b780e9e3a1d7e032e9c1ff540f4af45b8a56b074674bb149a3abff8a80d416cdb9db4ff8e0bf9361d0595ecf4ef7902455250308dd26998a2b7a4dcdca3e18 WHIRLPOOL f44f2e654fca0b87f4b5a4130246756aafeb3b1251fbc9be5e47f607ebe992b62deb4a053dc4551ffbfe281a5b11d875b0d391c6f800c69320a7df939a78eb16
-MISC ChangeLog 2767 SHA256 d8de8c77bc7194a1c6b338ed82cec7682706cc9afe379761bb31bf17a4db02df SHA512 1908c5c4dc21cd358e1fcdfc9601adcfb904db0f94c52767f8a584c876812771af83a17ddfba5c6ec4b2c4558e668b7d3b5ec639ec4ae609db180cd3a8938b13 WHIRLPOOL 0517db895c57e6cd5459dbe31318c339a944302682f8515f3ae4b798ec180b942fc11986c6c3c181d427e3acc9bfe235ceb38e7f98ffb3904db1f1e4345525f9
+EBUILD x2goclient-4.0.0.1.ebuild 914 SHA256 bdce1193340788da1d9b0b3c27d22242c9257114fe030eebff2dddaac7fdcdb5 SHA512 b023155a28ba701181a65ed5029bdb04b77a57a2ab6ccae6aa9db396e75d74c070be1ff3751f5f68dbdd672ed9949f9a6e988ceb6d7be69f797d00f77a5d5a6b WHIRLPOOL 6524265f85cf03d02fdde18b5ed6f8a361046e727e6ccd27e936df70d98cc05691c394de69e8680ab290c35fb682c964aa45b0fd8b5b6d0254466f7aa74d8290
+MISC ChangeLog 3034 SHA256 c404dbafcdc3bb4a014b35e182148331ea2d0105dd66cc0a17ae341b35931592 SHA512 20bfbf0ff9181bd0cfacc736e1a8e7654ff4dc96463e0210bed8f134987594eab07c2c61103f429000fee83ffa4cfbee192d302cfebbb52f117625b1dbf60ffc WHIRLPOOL 5986b5d9739551767104bb0a3725f2d8dd0bd981554ee17c7de204a9295f6da2c609a69d297c0cd311b69990b97faafbf1c2375692a67fb916fff056add6a812
 MISC metadata.xml 211 SHA256 a6b5a5387c7e7f441d794c61edf1718caa3c58ffbf9b595ec536ff9617a7471f SHA512 a07791c0d23ed28f99fa6d1b38e25477b2a4a3eecc8dbcf3a098ed4a9d8ede755a8711f35046e8ae77107814c2c702ce26ea4b35a014b243301e2cae8fd747a0 WHIRLPOOL 83c2fcc96384e3bd5a97283fe0392d4bd9af41d175bedda09686349c2e26b64796157b81b42b74faed1adc1035d1fe3442986f2a89a84a8b29241283381c0d1b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDr+tAACgkQFYEBGcdFJfKd+gEAoAcQMEdbIKaVMUdJYZSVU+k9
+XzKY0wQGPuoVKKYHuVUA/j+SLtBfNAcDGrLqxA30atzEa5yoVS1PArRYy7VZrZEb
+=kynm
+-----END PGP SIGNATURE-----
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