Revbump fixing linking bug #369107, EAPI bump. Remove old.

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

3 files changed, 40 insertions, 11 deletions

diff --git a/app-emulation/vmware-view-open-client/ChangeLog b/app-emulation/vmware-view-open-client/ChangeLog
index 17f4ae584e5c..d7354ff9e64a 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/ChangeLog,v 1.8 2011/03/03 22:08:34 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/ChangeLog,v 1.9 2011/06/15 22:15:57 tgurr Exp $
+
+*vmware-view-open-client-4.5.0.297975-r1 (15 Jun 2011)
+
+  15 Jun 2011; Timo Gurr <tgurr@gentoo.org>
+  -vmware-view-open-client-4.5.0.297975.ebuild,
+  +vmware-view-open-client-4.5.0.297975-r1.ebuild,
+  +files/vmware-view-open-client-4.5.0.297975-linking.patch:
+  Revbump fixing linking bug #369107, EAPI bump. Remove old.
 
   03 Mar 2011; Timo Gurr <tgurr@gentoo.org>
   vmware-view-open-client-4.5.0.297975.ebuild:
diff --git a/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-linking.patch b/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-linking.patch
new file mode 100644
index 000000000000..62b37cc993a3
--- /dev/null
+++ b/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-linking.patch
@@ -0,0 +1,14 @@
+Upstream: http://code.google.com/p/vmware-view-open-client/issues/detail?id=84
+
+diff -Naur VMware-view-open-client-source-4.5.0-297975/configure.ac VMware-view-open-client-source-4.5.0-297975.new/configure.ac
+--- VMware-view-open-client-source-4.5.0-297975/configure.ac	2010-09-10 22:09:17.000000000 +0200
++++ VMware-view-open-client-source-4.5.0-297975.new/configure.ac	2011-06-01 16:58:57.145105019 +0200
+@@ -140,7 +140,7 @@
+    PKG_PROG_PKG_CONFIG
+    PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0 gmodule-2.0 >= 2.6.0])
+    if test "$use_gtk" = "yes" ; then
+-      PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.4.0])
++      PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.4.0 x11])
+    fi
+    PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0])
+    PKG_CHECK_MODULES(CURL, [libcurl >= 7.16.0])
diff --git a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975.ebuild b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
index bc7b2c02256c..620f8f715636 100644
--- a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975.ebuild
+++ b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 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.5.0.297975.ebuild,v 1.2 2011/03/03 22:08:34 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild,v 1.1 2011/06/15 22:15:57 tgurr Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit versionator
+inherit eutils autotools versionator
 
 MY_PV=$(replace_version_separator 3 '-' )
 MY_P="${PN/vm/VM}-source-${MY_PV}"
@@ -24,24 +24,31 @@ COMMON_DEPEND="
 	>=dev-libs/libxml2-2.6.0
 	>=dev-libs/openssl-0.9.8
 	>=net-misc/curl-7.16.0[ssl]
-	x11-libs/gtk+:2"
+	x11-libs/gtk+:2
+"
 
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.21
-	>=dev-util/pkgconfig-0.9.0"
+	>=dev-util/pkgconfig-0.9.0
+"
 
 RDEPEND="${COMMON_DEPEND}
-	>=net-misc/rdesktop-1.4.1"
+	>=net-misc/rdesktop-1.4.1
+"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-linking.patch"
+	sed -e "s:e.x.p:$(get_version_component_range 1-3):" \
+		-e "s:00000:$(get_version_component_range 4):" \
+		-i configure.ac
+	AT_M4DIR="${AT_M4DIR} -I ${ROOT}/usr/share/aclocal" eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-static-icu \
 		--enable-nls \
 		--with-boost
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}