Version bump, remove old.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 19 insertions, 58 deletions

diff --git a/app-emulation/vmware-view-open-client/ChangeLog b/app-emulation/vmware-view-open-client/ChangeLog
index 0ac1c0179347..559c2d787970 100644
--- a/app-emulation/vmware-view-open-client/ChangeLog
+++ b/app-emulation/vmware-view-open-client/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/vmware-view-open-client
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/ChangeLog,v 1.3 2009/10/21 22:51:21 tgurr Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/ChangeLog,v 1.4 2010/01/05 21:56:52 tgurr Exp $
+
+*vmware-view-open-client-4.0.0.215529 (05 Jan 2010)
+
+  05 Jan 2010; Timo Gurr <tgurr@gentoo.org>
+  -vmware-view-open-client-3.1.2.188088.ebuild,
+  -vmware-view-open-client-4.0.0.201987.ebuild,
+  +vmware-view-open-client-4.0.0.215529.ebuild:
+  Version bump, remove old.
 
 *vmware-view-open-client-4.0.0.201987 (21 Oct 2009)
 
diff --git a/app-emulation/vmware-view-open-client/Manifest b/app-emulation/vmware-view-open-client/Manifest
index d6867a397c2f..4bf731f86541 100644
--- a/app-emulation/vmware-view-open-client/Manifest
+++ b/app-emulation/vmware-view-open-client/Manifest
@@ -1,6 +1,4 @@
-DIST VMware-view-open-client-source-3.1.2-188088.tar.gz 3221584 RMD160 bb5ed70271fe4456f5d76a16025e1ee26e6872a0 SHA1 84da3e2fb8affd7d95684b47465a95b40bf48906 SHA256 b2b24d487b68b07a7e11668c1e359ddc84bf948bda80fd9237bd0967ac46f2d7
-DIST VMware-view-open-client-source-4.0.0-201987.tar.gz 1851269 RMD160 8e4c47e9c6a8e75a7f8e71e333a3cc590719c49c SHA1 64a19311dec0d7a1525b82420dd52232cf1f5eff SHA256 f654cd9fdcd30780def526a4006824e00b7a24476344b9f862b84c803d0c32ff
-EBUILD vmware-view-open-client-3.1.2.188088.ebuild 1113 RMD160 cf4756507a7eadf7adf4de290148c53051c1a216 SHA1 20c4f249d2e2331f2e454400bc2799ca5a2deda5 SHA256 cff3576d2a5ec3e407076bc996b468722a1618ff6a9d3c68950a0483b059ee86
-EBUILD vmware-view-open-client-4.0.0.201987.ebuild 1113 RMD160 ee50e79cfec4b1a8e3961c3691e5975ae6f3d189 SHA1 28f1edeabdad47ceb09c571fc3401231d984bd7f SHA256 f416a65f8259c2b955148aac519a87f9e7b2819e0f951f5460c1a9b5edcbf6d7
-MISC ChangeLog 1012 RMD160 f20da28f7d758c74e51c0c931c30e6e2d0e3cb8e SHA1 ef2a1fa82aebb8eb6ee528906a39f7cde1764e95 SHA256 6559a4d8b1bbf9a6182b2c0de28620e42eaaeb79e922832b55487293a142aedc
+DIST VMware-view-open-client-source-4.0.0-215529.tar.gz 1887544 RMD160 d17af9356d632d850f81c7a3d7e089b96d1e2a90 SHA1 204da38c19af00e3fbc84e194f1a220ba1729d8a SHA256 aba5a9b92e60f26195eb02f582f75d4a38b626acdbdde821d48a0bb82d3455ff
+EBUILD vmware-view-open-client-4.0.0.215529.ebuild 1165 RMD160 5e6a5193009b7a181875eeefa16fe7c9b5a0c06a SHA1 945dcc82572be9831ec6cbd1c42c5f1c51ac5aef SHA256 6b96845f682acdfce1ca8d2c7b47f68ac4c809641cbd7c2d92a5d1d0bcf27968
+MISC ChangeLog 1282 RMD160 0741cb3b633e81bb9e26abacef502bf7e302bba2 SHA1 bcd3e917ddcc98f7e5d21ff4f7becaecd2d606f2 SHA256 692162bab11a8ec3e640705c0f028b1524cfec1d993a34d7615545ce37326873
 MISC metadata.xml 379 RMD160 51dec18c38a8d65a232bf1ee6c2ef2637bd4bf48 SHA1 c61297aa532fad9a681539f95680f654377a4668 SHA256 b29387364e959c36d2a0eb125c7b77143bd88bd8c1dc283edc5c634a010b0863
diff --git a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.0.0.201987.ebuild b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.0.0.201987.ebuild
deleted file mode 100644
index 06ab452e5c65..000000000000
--- a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.0.0.201987.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-4.0.0.201987.ebuild,v 1.1 2009/10/21 22:51:21 tgurr Exp $
-
-EAPI="2"
-
-inherit versionator
-
-MY_PV=$(replace_version_separator 3 '-' )
-MY_P="${PN/vm/VM}-source-${MY_PV}"
-
-DESCRIPTION="Open Source VMware View Client"
-HOMEPAGE="http://code.google.com/p/vmware-view-open-client/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.34.1
-	>=dev-libs/icu-3.8.0
-	>=dev-libs/libxml2-2.6.0
-	>=dev-libs/openssl-0.9.8
-	>=net-misc/curl-7.18.0
-	>=x11-libs/gtk+-2.8.0"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-RDEPEND="${COMMON_DEPEND}
-	>=net-misc/rdesktop-1.4.1"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--disable-static-icu \
-		--disable-static-ssl \
-		--enable-nls \
-		--enable-windowed-mode \
-		--with-boost
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/app-emulation/vmware-view-open-client/vmware-view-open-client-3.1.2.188088.ebuild b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.0.0.215529.ebuild
index c6945a492215..b8db7ba7c9e3 100644
--- a/app-emulation/vmware-view-open-client/vmware-view-open-client-3.1.2.188088.ebuild
+++ b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.0.0.215529.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-3.1.2.188088.ebuild,v 1.1 2009/10/05 22:39:45 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-4.0.0.215529.ebuild,v 1.1 2010/01/05 21:56:52 tgurr Exp $
 
 EAPI="2"
 
@@ -23,7 +23,10 @@ COMMON_DEPEND="
 	>=dev-libs/icu-3.8.0
 	>=dev-libs/libxml2-2.6.0
 	>=dev-libs/openssl-0.9.8
-	>=net-misc/curl-7.18.0
+	|| (
+		>=net-misc/curl-7.18.0[openssl]
+		>=net-misc/curl-7.18.0[gnutls]
+	)
 	>=x11-libs/gtk+-2.8.0"
 
 DEPEND="${COMMON_DEPEND}