add screen sharing and LINGUAS support (bug #397463)

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

3 files changed, 38 insertions, 14 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 49e42aa9e1a7..14c3a2800a45 100644
--- a/www-plugins/google-talkplugin/ChangeLog
+++ b/www-plugins/google-talkplugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/google-talkplugin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.19 2011/11/19 16:46:04 ottxor Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.20 2012/01/04 05:25:42 ottxor Exp $
+
+*google-talkplugin-2.5.6.0-r1 (04 Jan 2012)
+
+  04 Jan 2012; Christoph Junghans <ottxor@gentoo.org>
+  -google-talkplugin-2.5.6.0.ebuild, +google-talkplugin-2.5.6.0-r1.ebuild:
+  add screen sharing and LINGUAS support (bug #397463)
 
   19 Nov 2011; Christoph Junghans <ottxor@gentoo.org>
   -google-talkplugin-1.8.0.0.ebuild, -google-talkplugin-2.1.7.0.ebuild,
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 2843f78b632b..5a803af9ebfb 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -6,18 +6,18 @@ DIST google-talkplugin_2.3.2.0-1_i386.deb 6738522 RMD160 ec95ed1d31e42b3b08539a7
 DIST google-talkplugin_2.5.6.0-1_amd64.deb 11341592 RMD160 845691c6aa43d40c6048bc2d2d3c59a154a7b067 SHA1 484151f690ca6eee21cabe8eaeda24a7ab7a1b8b SHA256 bd1ade08d3ca4d89edb875214026c16fd3e66adbf52812095c267378cfd7aada
 DIST google-talkplugin_2.5.6.0-1_i386.deb 10371766 RMD160 2d80e799dcea89760bd0a9a68ad8deca84c60b71 SHA1 c382cfee89b5a33d15ea19762d10dc6bee77a9b9 SHA256 57834794d05dd03062bd5c2fa70cee40185a09ceb7480782a4d4473eaf0d7324
 EBUILD google-talkplugin-2.3.2.0.ebuild 3249 RMD160 4c53d6004880d33d373b1064c6c4e67301b36406 SHA1 60e2d54648e5300b09848c9ef2aaf9efb0f9a66b SHA256 b0f618154f4f507afc1f728b6c1297154c5e69dcf174049c7e377d93c233c81b
-EBUILD google-talkplugin-2.5.6.0.ebuild 3009 RMD160 41332fd98f8887fc049e8877e066d0a20e7dad23 SHA1 31c8702249a2663796d6fa5e760c390b7e645348 SHA256 f4244e4ea80a826659891e0cd2da2533e8926e63281748d8e5798e7f5dbf16ce
+EBUILD google-talkplugin-2.5.6.0-r1.ebuild 3521 RMD160 cdbf463379a5076590bc906bf1f98ba8e77816c6 SHA1 1317edae0ee25f32a57aad81d6af099124f8e54a SHA256 638d9a88af50b839271ac08593031ed6ec88280103ee7ce0e266d0f338119302
 EBUILD google-talkplugin-9999.ebuild 3006 RMD160 e8228e70939d1b80cdcac691c0a500295661fd19 SHA1 80722b8303c8d6df9846f2b9afd2a5ff48ae9920 SHA256 60970c2ed2479fb09e19bc862b637ef9d1b1d8395aa75a98bbeed586d67b5c80
-MISC ChangeLog 3201 RMD160 801c0cbc30a9f761026fdbcd0897980f18d2dd80 SHA1 33bc27e294a043a4e4ab2b05685198c68ffc1ec5 SHA256 f438f6890237983ec4dfd42b12c0bcae94b8cf8d4dd45104afa0eecd969e99b8
+MISC ChangeLog 3431 RMD160 3559e20f55e4cf92b5de850b151b63f9f94ffab6 SHA1 4306833336987d20d12b2688fa13584c3294efc6 SHA256 2a7af28066b0c5cf86c732511f014cf4c6720098e3b6350312d383a1f2442550
 MISC metadata.xml 354 RMD160 996efb09eaf3af50035bac0fcf12768640f0c0c9 SHA1 ff3d2e6ce2eae43016888c2cd548b2a6962ddab1 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOx91SAAoJEOeBhlrCAAWG06YH/118ellBj0YTcNHhl5aQ6gV7
-cCPJeRKTyHTY/8dj473Ho+K1LjQVUnBhRJOdosw5a5qUVOxT8plbADabQjZNdR0V
-P2W3C0cZMRaYhPK+wiKfx8wry7eu5ENy31lOJlXLKEYNUYzEf4uM2gP78EQv+x1s
-izFRHj/rmzKSxN43WGiOzJk4ym+70UNQJTDgGKliAjNAFrohtrSfoLpnhon35Aut
-rV+1FLu5z7DiwaRbhWbspuo/dKzx+e0kSFv2j/9IIb+0p7qUqrNTQw/ERgs6WQ5Z
-k57SlW9spklnZ8rcDn8JFeBhCkXhBTdJeNORaFYOoYoE5xHcYj/MxZ4wBJgzjF0=
-=kA1U
+iQEcBAEBAgAGBQJPA+LdAAoJEOeBhlrCAAWGSVcH/RaWBQk6niUuPYSS7ZE2mEiZ
+OikAsF+jtzvStxLRnZ47nAukomrO+kqY2KmNLpCocUUCw0iIBztcUPBLiZOmwK33
+yRq7uOVDVNvgAj9yygfcl2yzU9+qvMz1pG1bSw8atXpXckNwEqNS3glx9XXcsypw
+jht0Sri09npxawhMcv4vHGK10QCiBoLB2Hhv6WxN+/YeF6WPyWy5yN0nXD1U7ffE
+sTS1l+32GQ+KgqEp4Ts8GGmHId8zdr6nnBiBlvCjBvrKbEwI3BtuaOZdIpyD2K0p
+dM0dJDEBFnMBhWD0wOOscE5x6LxrMWyqGsqdFzzhCUHebWKORdGFNM+X4YtX+lM=
+=wDse
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0-r1.ebuild
index 1e3544dc94be..2f974764fe1d 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0.ebuild,v 1.1 2011/11/19 16:41:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0-r1.ebuild,v 1.1 2012/01/04 05:25:42 ottxor Exp $
 
 EAPI=4
 
-inherit nsplugins
+inherit eutils nsplugins
 
 if [ "${PV}" != "9999" ]; then
 	DEB_PATCH="1"
@@ -72,6 +72,14 @@ QA_DT_HASH="${INSTALL_BASE}/libnpg.*so
 
 S="${WORKDIR}"
 
+LANGS="ar cs en et fr hu lt ms pl ru sv tl vi bg da fa gu id ja lv nl
+sk ta tr bn de es fi hi is kn ml no sl te uk ca el fil hr it ko mr or
+ro sr th ur"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
 # nofetch means upstream bumped and thus needs version bump
 pkg_nofetch() {
 	einfo "This version is no longer available from Google."
@@ -106,6 +114,16 @@ src_install() {
 		inst_plugin "/${i}"
 	done
 
+	#install screen-sharing stuff - bug #397463
+	insinto "/${INSTALL_BASE}"
+	doins "${INSTALL_BASE}"/windowpicker.glade
+
+	strip-linguas ${LANGS}
+	for l in ${LINGUAS}; do
+		insinto "/${INSTALL_BASE}"/locale/$l/LC_MESSAGES/
+		doins "${INSTALL_BASE}"/locale/$l/LC_MESSAGES/windowpicker.mo
+	done
+
 	#install bundled libCg
 	if ! use system-libCg; then
 		exeinto "/${INSTALL_BASE}"/lib