3 files changed, 16 insertions, 53 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/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}