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

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 43 insertions, 13 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/Manifest b/app-emulation/vmware-view-open-client/Manifest
index 32e2aa9c9a74..8bdd21ccef8f 100644
--- a/app-emulation/vmware-view-open-client/Manifest
+++ b/app-emulation/vmware-view-open-client/Manifest
@@ -1,4 +1,5 @@
+AUX vmware-view-open-client-4.5.0.297975-linking.patch 771 RMD160 e723052861b007025db8cef9401a34ae7502c474 SHA1 593d4cc7d30583ce54edcbdb263539d6c052e9f1 SHA256 53f3d58716394c0b4c219c03a854e816ba10cf6e41d0c624c646a98d0d191167
 DIST VMware-view-open-client-source-4.5.0-297975.tar.gz 3044430 RMD160 742663d2b58037c52be1da99fd91891febafc383 SHA1 ebd0ff4bb05c9add2eba65badafa9bdeead3e2df SHA256 8c81aed954419180c4b36807df15907b333c5558dd0b57650f3743af7c67702c
-EBUILD vmware-view-open-client-4.5.0.297975.ebuild 1086 RMD160 c653d8daef37809abb4a919d8c76c770eb058a81 SHA1 ad0275842dca64c821e84a2685a36b69825f001a SHA256 1fe98e82abb6ef1d409731dd0218c61ff8d9c4cc0f5d59639c9cfe9a86a9e078
-MISC ChangeLog 1994 RMD160 7214e873c59367532a9aa65f651bddd2015c4ab5 SHA1 1111e9a2a35f8e33b6dd0d0c177f3e63ba3f729e SHA256 95bb2604e6e07981ed5f0294f96235f9a54c33fde13d755c9bb398138c76a924
+EBUILD vmware-view-open-client-4.5.0.297975-r1.ebuild 1280 RMD160 ee963e2f5567018ec18fc20e24d18496d256bfed SHA1 f189660af42a87742927fe416a72a6de9d070dec SHA256 b23662ccdcd6952691ccadbc2d180378e314150bfeec509f84df05653ab80a9d
+MISC ChangeLog 2316 RMD160 f0f16f7a25c8ef0ef626998979da5f51244faa4c SHA1 ca277a4f4c5bd9428dfd0282e5ddbc8db3de6387 SHA256 795a1b0ee5836f840f05b31de99ee4a1d01d37eec8ea7fc27ab9030b28909005
 MISC metadata.xml 379 RMD160 51dec18c38a8d65a232bf1ee6c2ef2637bd4bf48 SHA1 c61297aa532fad9a681539f95680f654377a4668 SHA256 b29387364e959c36d2a0eb125c7b77143bd88bd8c1dc283edc5c634a010b0863
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"
-}