Version bump by Seong-ho, Cho (bug #441574).

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 144 insertions, 9 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index af9094d43937..aae012cfeccb 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.35 2012/10/13 16:49:08 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.36 2012/11/03 17:20:34 jer Exp $
+
+*google-talkplugin-3.10.2.0 (03 Nov 2012)
+
+  03 Nov 2012; Jeroen Roovers <jer@gentoo.org>
+  +google-talkplugin-3.10.2.0.ebuild:
+  Version bump by Seong-ho, Cho (bug #441574).
 
 *google-talkplugin-3.9.1.0 (13 Oct 2012)
 
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 992a304a1a25..793056576926 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST google-talkplugin_3.10.2.0-1_amd64.deb 12782298 SHA256 19b2ed148adccb34cbf2ee0a14816e8db5aa0ff958017125e6b30fdf33ae7247 SHA512 b4aac9017ef46640741eb7bee6ef853b0aaa26ddb2387d3b7a80b9ec6eaf025558dd812e0ac45fed3c48b4d49fbc21bd2875367d34c8fd42a436646d5ec5572a WHIRLPOOL 2e675356356e350878945e0f3910e1c070f6a8539e240fa69a553ff78e59a7aff03aeb1329452cb5100823f689f29e4cb1ded894de3b9614c7ce872a387a27de
+DIST google-talkplugin_3.10.2.0-1_i386.deb 11272544 SHA256 724b80c447dddeaca45ceab57b7f00691c8329d855d3a9dd613a889372494cad SHA512 eadb06e1cc0d1101c19f98722919a9fea3bda117dd7b135a33ff14e90680e2136b9d62ea8ccaa40f1d30bfb9bc1fce6c6a8fc5fc16a40dbbb854f15b64db250d WHIRLPOOL 87ba7ed467c51078153da176cd881ae80008c410c5a27d7bf4589a7d83133a8c2f3cca94942b0fd7e2fef0d540c0df8fb6f1329482155ab461400ac7d7c0ef80
 DIST google-talkplugin_3.7.1.0-1_amd64.deb 12698056 SHA256 e14b194aa5a2299d2439b881634c914ee60dffd7659725593ddeca26562ec786 SHA512 461f09fcc6917e4c2cae19adfd67e1ca7383c9045249d75e432e8671df923080026b4f5a85732bd31961a5d19182daac05daaf58d1d31c8c977f38b3fa1533b3 WHIRLPOOL ff4122430a85642b009bf1e61c8e592b502375d96a4dd36e3290f75293b0c2f0bad7678fa8a5ce23d197234fa6995c1860a9f6b89bb88539392c20c224de036f
 DIST google-talkplugin_3.7.1.0-1_i386.deb 11190562 SHA256 b0ddc4807f13ed68c80502be564acfa6289e8e975a55b663a56040d90bff6dae SHA512 c31f91535da348a2094a16a4f13009e5a8f0d4eeec78ebf560208dea8b63db821227b74b50d49a4c6a1b97743dec12843ed90424f86071a532609aa4e02af684 WHIRLPOOL 32d896ade1c58fb6b388a8f3bf56b46b265398e39c55715d9c8d441a863383d7efd662e58ab3691d93d7c8b3aa416ce46319b4da205b5a16a7630ab2b067dc41
 DIST google-talkplugin_3.9.1.0-1_amd64.deb 12733898 SHA256 3395406e8d4ab14b408994cbef92b6ca9c2cd2c8716170c1e224511b3f5baaaf SHA512 f5312c929aeebfc77aadc9cd1684ffd445651649546cd5930cc8fbf344049e75f5891f883a5e70d130ca27cb1ec48872732797e81862fe43612565bedbaa4e4a WHIRLPOOL 5b281c67937ea5c82fd6527ca23efa3375d332fd6801c665b78f2db4438ee97dd90f7ce4366c459abb4f6c1cdedeba2ba0b617144d9ba141a80660cc19568c04
 DIST google-talkplugin_3.9.1.0-1_i386.deb 11219516 SHA256 8eab48348c466c294ae3c50835b533682926fe7d54a3c7fdc2044575fb9af513 SHA512 c60599215904b29ef3efda25086c8832de43437a29a517330cb159e70159f27b81787f6306886ce3bc977d1c103c6b83b292bce9c37245cb6f05ab152efa6368 WHIRLPOOL 2502006a61590bed8febef186ae58afd4599f821425372e90bafba3967c3e673112b51b9a3d8f7799fc47f3fa1e1c6890f3db769d8e055806a22bd9d62ae5d40
+EBUILD google-talkplugin-3.10.2.0.ebuild 3809 SHA256 fdc162faa21c7d3431aeafa2b30977d266969555a8f50d6ebccc0e937afd1d23 SHA512 09a3ab171f5d2653b25c840112b13cd48cb33392dc7b864fddd4f74bb62a5f569e2728e09093ab9c8873d68b9c8c48326074c9e087f293fed7664f14e0937054 WHIRLPOOL 58a2c386b6a9c9c2b102115295de7b35fcae3e3bcba39edddd93f58140467b58e567d3c11298d25915a95a15daebefa412ac6aa860ce834def0949a149eedb36
 EBUILD google-talkplugin-3.7.1.0.ebuild 4004 SHA256 c6d2c08f2bf9474e24dfb42abd9129c27b358e2bd1f313c43e34bc3e04918145 SHA512 8c900e6ba39eb46de924d148a1333634c1a58527ff30462a22b66c26cddea8eb932d9d8cc9b939a218ab35d6292d8b9cedffbbdf15011ff5ac71ca3ac3f3bd0c WHIRLPOOL 4444d4c7bfb43981470f0c7b176c1de5c9084b0fc15fc5d0a67a426bf643978c795cf8ad029d2ab9cc2c537a595800c8ec584ff64647f570a0e074af2de78e52
 EBUILD google-talkplugin-3.9.1.0.ebuild 3811 SHA256 e49fcc3470b54b7a71339928c8664875d929e2272884f4745b34c920936e256d SHA512 589a8b2b27217293134bad4a4739865103435f85f85f3d7ef4897c5fbf3d8b5f5b05c81a060215fdec2d1b749e0a1f5e57b0592aad4e8f3329d7492a0dd3695e WHIRLPOOL 4776176d491ad97838ad844c1c691f595b68a1f5e2abe119cd3b9b0117e624134ec2a76fe1807faffadda4527015c85bf5fa06731db2b27c9fdacfe35e232f43
 EBUILD google-talkplugin-9999.ebuild 3808 SHA256 87c44ee937309f90a59f818b7bfe04ff46ee50386bbdcadc9367f830da10bf28 SHA512 8663e683d6000adcb8d47f0cfe8bbd3a07edd83d76316db1272323d717ec074d846894b5831ee7a77eb3400dbaba38e619d554dcf555d5b9d3f9351e59c2806a WHIRLPOOL e8ef95321cbf3367b6b366dfd3a86fa72f0d399fc2dbb25865310576580b96ce2855a5d1e68be85bc0f94255668bde696e9fca418f860203be52a47a1702490e
-MISC ChangeLog 6570 SHA256 ddc0c104070c38062b3a67f09bba95e5e317b894a5960eab2bdfb93a28a40b9d SHA512 95cd809bf9c712a5c227e4056f0085651bd72e53513326d9059473c6ef6c4aca7df93edbbd6f5886063187a2c18d817a1148c35d28a113bf2dbe7d78613a3851 WHIRLPOOL 1db2e0baa51eba960446705f8ffdc41472f3aa2cc8bc4230b0c154275ce3d54498f414286fe702e7af74df221f7b4b61cdf29826ed8bcbd117ce7ee48f0abf27
+MISC ChangeLog 6743 SHA256 2ed8fc2a4bbd9d9f4109c84a393c4c152fe3eeb59b2a1420565d6892b3951202 SHA512 1cb71de2e7af08e2b86823dae34ecabf59a3d8f3775bb594053256d201d1bb05f9e8b6f8ced94460624d563a502ce455abb7323d8ee16c283ba06b184d19882d WHIRLPOOL ae04ef8f3486df4a419229fbe77389b19a84048bb9e75fa5b4318b7b1fbe969ee2493b2f4e39df1694e03620c00d3e437b43d2e5d2ebdfe0578c93afac402bea
 MISC metadata.xml 354 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2 SHA512 cc86eee04c852fb1e40620e481712c5fc2c175fe637fb2ec1c627b88d25bf94f257a717191488981795f49488ddf6fb918b0d1d89ec05f23ba681b293a634066 WHIRLPOOL 503502973ebe813a597a56a6d013af48101902a04782c9fbcc54512b39b2fc3ae0440b63b819090ae145d54f276eca77ebf8ba6f17e9d3e05082969e28a210cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQeZufAAoJEOeBhlrCAAWG47YH/jO8t0tUTKpEJGhL4hZvFFNv
-DGxlKMcSC9V6biZ8CSP5Nizx+e9ZG7p4iv5+d22gF96duccwjLKS+bARA8pxdO9B
-8AmU1OwEvTuR4Yt7TV+wypXyvTQRA1P6TBFtJMJgd9xSeAyz1e9M8g+zVw+LAGbi
-kgTkBiKyEpC/bcWlGL6K9Qw8YDHtxQz1eGvqqum9KuXnEphIORnwiSy7tuFGV6I0
-j9BQKDmUE4XhoKB7NNzQf/tas2JAqcu9DpUEzo+HzP2PmrNtjpyyizVc6vfjQaGH
-5rMqW+Sg1vg3i18qbFkldHTCK8hAFLJMxEauHYPd2GrALB4jvojTLVEHFZuLmOc=
-=do+s
+iEYEAREIAAYFAlCVUmMACgkQVWmRsqeSphNuBgCeMYAmGvhdHazNDqS7PiLhVVTG
+Y5AAnAvLMu+Cqi8gAeND+KXDFkRK5NOv
+=a4ft
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0.ebuild
new file mode 100644
index 000000000000..b1a409ec1ef0
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0.ebuild
@@ -0,0 +1,130 @@
+# 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-3.10.2.0.ebuild,v 1.1 2012/11/03 17:20:34 jer Exp $
+
+EAPI=4
+
+inherit eutils nsplugins unpacker
+
+if [ "${PV}" != "9999" ]; then
+	DEB_PATCH="1"
+	#http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages
+	MY_URL="http://dl.google.com/linux/talkplugin/deb/pool/main/${P:0:1}/${PN}"
+	MY_PKG="${PN}_${PV}-${DEB_PATCH}_i386.deb"
+	SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
+		amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
+else
+	MY_URL="http://dl.google.com/linux/direct"
+	MY_PKG="${PN}_current_i386.deb"
+	SRC_URI=""
+fi
+
+DESCRIPTION="Video chat browser plug-in for Google Talk"
+
+HOMEPAGE="http://www.google.com/chat/video"
+IUSE="libnotify +system-libCg video_cards_fglrx video_cards_radeon"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+#GoogleTalkPlugin binary contains openssl
+LICENSE="google-talkplugin openssl"
+RESTRICT="strip mirror"
+
+RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
+	dev-libs/glib:2
+	system-libCg? ( media-gfx/nvidia-cg-toolkit )
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:1.2
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+	sys-apps/lsb-release
+	virtual/opengl
+	libnotify? ( x11-libs/libnotify )"
+
+DEPEND=""
+
+INSTALL_BASE="opt/google/talkplugin"
+
+QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin"
+
+QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so"
+
+QA_FLAGS_IGNORED="${INSTALL_BASE}/libnpg.*so
+	${INSTALL_BASE}/lib/libCg.*so
+	${INSTALL_BASE}/GoogleTalkPlugin"
+
+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."
+	einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
+	einfo "Please file a version bump bug on http://bugs.gentoo.org (search	existing bugs for ${PN} first!)."
+}
+
+src_unpack() {
+	local pkg="${A:=${MY_PKG}}"
+	if [ "${PV}" = "9999" ]; then
+		use amd64 && pkg="${pkg/i386/amd64}"
+		einfo "Fetching ${pkg}"
+		wget "${MY_URL}/${pkg}" || die
+	fi
+	unpacker ${pkg}
+}
+
+src_install() {
+	unpacker usr/share/doc/google-talkplugin/changelog.Debian.gz
+	dodoc changelog.Debian
+
+	exeinto "/${INSTALL_BASE}"
+	doexe "${INSTALL_BASE}"/GoogleTalkPlugin
+	for i in "${INSTALL_BASE}"/libnpg*.so; do
+		doexe "${i}"
+		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 video_cards_radeon || use video_cards_fglrx; then
+		#hack from #402401
+		exeinto "/${INSTALL_BASE}"/lib
+		doexe "${INSTALL_BASE}"/lib/libCg*.so
+		if use system-libCg; then
+			ewarn "There seems to be a problem with ati cards and USE='-system-libCG,"
+			ewarn "so we install the bundled version of libCG anyway. (bug #402401)"
+		fi
+		echo "O3D_OVERRIDE_RENDER_MODE=2D" > "${ED}/opt/google/talkplugin/envvars"
+		ewarn "We have set O3D_OVERRIDE_RENDER_MODE=2D in ${EROOT}opt/google/talkplugin/envvars"
+		ewarn "please report your experience, good or bad, with this workaround on bug #402401"
+	elif ! use system-libCg; then
+		exeinto "/${INSTALL_BASE}"/lib
+		doexe "${INSTALL_BASE}"/lib/libCg*.so
+	fi
+}