Fix build failure against newer intltool (bug #417335 by Randall Wald and others).

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

3 files changed, 46 insertions, 4 deletions

diff --git a/app-emulation/vmware-view-open-client/ChangeLog b/app-emulation/vmware-view-open-client/ChangeLog
index 1fb490b18a40..196d488176d6 100644
--- a/app-emulation/vmware-view-open-client/ChangeLog
+++ b/app-emulation/vmware-view-open-client/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-view-open-client
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/ChangeLog,v 1.11 2012/05/03 18:49:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/ChangeLog,v 1.12 2012/10/02 12:17:49 slyfox Exp $
+
+  02 Oct 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/vmware-view-open-client-4.5.0.297975-unbundle-intltool.patch,
+  vmware-view-open-client-4.5.0.297975-r1.ebuild:
+  Fix build failure against newer intltool (bug #417335 by Randall Wald and
+  others).
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org>
   vmware-view-open-client-4.5.0.297975-r1.ebuild:
@@ -70,4 +76,3 @@
   16 Jul 2009; Timo Gurr <tgurr@gentoo.org>
   +vmware-view-open-client-3.1.0.169073.ebuild, +metadata.xml:
   Initial ebuild, thanks to Jeremy Wood. Fixes bug #257637.
-
diff --git a/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-unbundle-intltool.patch b/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-unbundle-intltool.patch
new file mode 100644
index 000000000000..d663fb50d41e
--- /dev/null
+++ b/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-unbundle-intltool.patch
@@ -0,0 +1,35 @@
+Use system's intltool.
+
+Fixes build failure: https://bugs.gentoo.org/show_bug.cgi?id=425604
+(automake fails to regenerate missing files)
+
+Patches by Kvicadlo.
+diff --git a/configure.ac b/configure.ac
+index d127fad..b9005c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -549,9 +549,6 @@ doc/changelog.Debian
+ doc/vmware-view.1
+ doc/vmware-view-tunnel.1
+ fix-toolchain-paths.sh
+-intltool-update
+-intltool-merge
+-intltool-extract
+ po/Makefile.in
+ vmware-view.desktop.in
+ ])
+diff --git a/Makefile.inc b/Makefile.inc
+index 41dfe8f..c440f01 100644
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -243,10 +243,6 @@ testUrl_LDADD += $(GLIB_LIBS)
+ testUrl_LDADD += $(ICU_LIBS)
+ testUrl_LDADD += $(TUNNEL_FRAMEWORKS)
+
+-dist_noinst_DATA += intltool-extract.in
+-dist_noinst_DATA += intltool-merge.in
+-dist_noinst_DATA += intltool-update.in
+-
+ desktop_in_files += vmware-view.desktop.in
+
+ dist_noinst_DATA += INSTALL
diff --git a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
index 2b4ca67d4b66..8f573e50cbd8 100644
--- a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
+++ b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r1.ebuild,v 1.3 2012/05/03 18:49:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild,v 1.4 2012/10/02 12:17:49 slyfox Exp $
 
 EAPI="4"
 
@@ -40,10 +40,12 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-linking.patch" \
-		"${FILESDIR}"/${P}-curl-headers.patch
+		"${FILESDIR}"/${P}-curl-headers.patch \
+		"${FILESDIR}"/${P}-unbundle-intltool.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
 }