version bump, install ppapi plugins (bug #509116)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 157 insertions, 14 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 5ca6a6e23df7..941ee628184d 100644
--- a/www-plugins/google-talkplugin/ChangeLog
+++ b/www-plugins/google-talkplugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/google-talkplugin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.73 2014/04/03 15:12:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.74 2014/05/12 01:44:55 ottxor Exp $
+
+*google-talkplugin-5.3.1.0 (12 May 2014)
+
+  12 May 2014; Christoph Junghans <ottxor@gentoo.org>
+  +google-talkplugin-5.3.1.0.ebuild, google-talkplugin-5.2.4.0.ebuild,
+  google-talkplugin-9999.ebuild:
+  version bump, install ppapi plugins (bug #509116)
 
   03 Apr 2014; Christoph Junghans <ottxor@gentoo.org>
   google-talkplugin-5.2.4.0.ebuild, google-talkplugin-9999.ebuild:
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 319a2134d09c..a4c0e5ededb3 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -7,20 +7,23 @@ DIST google-talkplugin_5.1.5.0-1_amd64.deb 13024714 SHA256 a0b68a3f060f8f8b0b399
 DIST google-talkplugin_5.1.5.0-1_i386.deb 11410650 SHA256 ec3fda00735c0570b44ffc80e1f3e6c4846ec5186857dc3ab162085386db5289 SHA512 5df58264e73d8075d4ab8d22e7fb2272ead36ae5d2ddd98f3681a9adff0756401cc3eb385fac11351be21ecb2c7c61fd644e176f2d06294f1f95f403afdfed52 WHIRLPOOL efbdc82440f27f202e8f7ca990afb91287432c69987a9af2b23701f858db42a2f5fef62eb3277d16eb4195d80508c0860c590ff9180a0c3be1799009f84e923d
 DIST google-talkplugin_5.2.4.0-1_amd64.deb 7639118 SHA256 b4f35588663cb11edcf9b7d273668693244d774977f08df39277b0d1507f7fb1 SHA512 8efe606b977d541405e411599b0fd7fabafd5b2c9675f78af1f817aa1d392e92d14c0702a5b75c2852f21c95fb94c1a85c5f9877ee6f5c45f2cef9553f62a380 WHIRLPOOL ba6985ee49b61a73b4aeab8e880cb57e9d6646314dc8631430145e6b152b80c0e34a9bda2a14fce68a656cd8d592c3802f8a7f5e813af1fedea089951ace595f
 DIST google-talkplugin_5.2.4.0-1_i386.deb 6864640 SHA256 5ea418a29a426c9df92c6876cac8b52fd9cbde9bf56541ed9079af48b16ad7d0 SHA512 3102c2354b4e04fbfae4b8fd999dc6a1f00244de769140b2d31786279eac16af79eb70f7e56d999d556d2439fb17b6051315eee0ed367d27977bd3d2c796898c WHIRLPOOL fd03a6da252b8a6a4ad51e894f23aa078e77a101fe7c9b6fb6df5fb7cd64b2f534d6afc248f6a80c0c75cca3ff7cac934b28c6068bde6332b24ffc851429c8bb
+DIST google-talkplugin_5.3.1.0-1_amd64.deb 7658490 SHA256 f2095ee4c6c1cb1c614130a80245a5e7e6237790cb5f6b7e0b19e7e44c6c5fc0 SHA512 e275fdb8d0d1b4d9e1f39d57c32a469a29e470fa23b1f9a4d4fabc38abc7ce0ea87f1783681f10c55d2dbdaa9643ace621eb51f3dd3fe37cf36cb986080e034a WHIRLPOOL 4de471a0b8d379a0e9b0090b87eeeeb2c782c58ffa970de1da2ff40aa60a45ec1192886d692f6e81028427d4d3d44ed3b667065d0ea871bf62339613aaaef487
+DIST google-talkplugin_5.3.1.0-1_i386.deb 6885864 SHA256 5d01659abbd7f2011ea4ad5ed9fe4358e2404b4590eaf20fcf8abf8020e8ca1a SHA512 90590cb448ad28f027cd2d5248b6ecb118c9c0752698ec90cb7e50b8864c9b65e93bd27b6079522a614a972a94333d596338d08f6a50f3e5231220f1a4cfbbdd WHIRLPOOL 25733c7a9860ce628be487a3dc84f480578bbb44f20809d6cce58d8e50bb0e23455f8b69c6290782b350750c1685db37ae25aaddfa425c2368679267259b44d5
 EBUILD google-talkplugin-4.4.2.0.ebuild 4386 SHA256 2bb208df8faccb99bc1e4953a8bf687d616409120a76ab42149a6c6a1e1bf630 SHA512 bcefe7c2c4dd543b86a8bf56085b203d39825de015c0baad4c31e68093f83d1e5da7b42cce2bfc9d66d3c5bf2a8360aae12c278d8eb3a905301f41831426a680 WHIRLPOOL 3ea924a41a037814028684a52d29338fa560d3881b4a17e354c58b3137996facc7065a3de2ea1ccb8cf781640087d7e4857524d5ae0377b041f0fdf4af88af2d
 EBUILD google-talkplugin-5.1.5.0.ebuild 4391 SHA256 c4cc33b9d8f732926be71d508771f1d0a33f296de4eb8adeaf14ca1196f5d6bf SHA512 7062de4a0982b43e6f5b581ba113742c958d9dde03cf34750703fa99218b5d3d8492cf5977bc4e1d29aad31ec3965c075784649cfb0511ee725d2cd6f2c1f446 WHIRLPOOL aec24b78a1151fc8c8d0bb265f266dfbdc32c330f07571c0fff188fec290edef67a31cf2bb9801edaab05765f15f724891d57aac9c6095af629f1ddd1499adda
-EBUILD google-talkplugin-5.2.4.0.ebuild 3457 SHA256 d90c6e362d4dfa6d016b7e41f9b8331dc88505c82884e669345e428b6aa1bbb2 SHA512 01b0bf051eb8202d68a73c0af9896087532961434ee66aee3043d0f953aadd2d7355a74d4880f2a73c3785bcabdd7136599634ff473abf2e3ec8d9ebedc75cda WHIRLPOOL f9557cf844cbe3d18c071f18577bc725f364ace3f68d9b547a7cfe2ce82fec5d4be2e445e825acb3557d632e1bcb32d98075ce0575907916adeb97c5f7a35c69
-EBUILD google-talkplugin-9999.ebuild 3455 SHA256 a6b0cde6c7e0aded155725aab49b2332f37a6635a5b653b796e22e0a05c794a1 SHA512 2a5db92af5bca7dce28d17a6baebc19dd32d48ac6d423533c4563b61f4ed7f7a82c03dbc91eeeca81ae07a76910e73b9506501f1858f58ecb47aa9e0bb3a70bb WHIRLPOOL 993c657ae38070154fc1333885696823b328597140e2e29c0b28fd91241733a38fb26bb787c5248185357d88ec41e717c5a475be97607068d98076218e361ae7
-MISC ChangeLog 13889 SHA256 d8bc3f36b053202931043652f45a1efed0edb9f531afcede14f3a6327d9593ac SHA512 46f348dc443564d6f6bc3a28ea5ae1a36cdd3e1721bd128835b0c1608e1a82e9fa64779146b6542fb0ee8c0abeb523e6b34c4a43777430c5dcc31e9a0d458dd3 WHIRLPOOL edfcce77bd7bed5b083361be687dd0ea81be6d8ba5f8f0090dba4ae429286f375e88805ae6b66a22bcc38693ebd72f643b654aca59327c20123c0ed0ba8e2ba2
+EBUILD google-talkplugin-5.2.4.0.ebuild 3458 SHA256 085d485591762ad1cb0c0cad834d533e8666654ae97156a70da6cdec00beabd2 SHA512 cd7101b389f9cbd39e02e7b49053ab0b225ccfffb0b224870a544608c571f1214ce70a929f1e0be91971162f1778257016607d17506520bf4cbaf55b986d3152 WHIRLPOOL 8e1b4caa443cce07b80c36de2ea788d73073937c6385604fe7f8d1a4778310aaa5697ecd5f8f34b1e625c0ac784453fb8035c3b62fa5a6d0e9b2b6d241d2580a
+EBUILD google-talkplugin-5.3.1.0.ebuild 3726 SHA256 acc475445ea6e1e22d045e3974ce0aa90f33b97b5de3e3d91b4b88e2149817c2 SHA512 cb3ab2bc9ec96e2583ef84af8267bec8a086f412e770eab7b7e1026d0e72695fd04f47cda2f8323055d90f3337ccb34dd1c53ea6adbb0357c834d4b5c93c80d7 WHIRLPOOL d11cf209e1d3f3298f21941afcf5902d32a7964746339d57aac32f15f226a80b6fbab26fc2e4b708d28b8e63adec54e928722ed3f949d7dd5d37eb7e79c69abd
+EBUILD google-talkplugin-9999.ebuild 3724 SHA256 de32f47b1b64e39affc4e9d1d759416d8b3a19353b07edd2767f4ca4c4bde129 SHA512 b75edad8fa909ca0446865078e7f47231239886617590989a7fd7ba13ab1465624e48cb8927c72b27adb107befc152af73d440b9548e071997ece21e07f2430e WHIRLPOOL 73980eac6ae036343f7211ae7d7aa8306106fa79feec2a22ad65e5022a357e79b892358aee4fb00766ba72edbc6708223023b4a416b19c9e8fa45e9d57828bf4
+MISC ChangeLog 14142 SHA256 b58395bdd081a8682e71392790b5b7021f167b45eda5da5b0e5493e63851c9f5 SHA512 0867e6e43e3021e68063367b553c1bb396c1610e4430a4801fe79af86627aca4976e4732d6e704f3a7aea98b0033ee23a831846fb186f07c6819b746de3097ab WHIRLPOOL edfb5636cd24f99edb087b3101d8c57c51440e572343c6886fa6fcdf69a6a9792d0b8be9ff366660d5af3640486465cc2e975959b68e05c626702dcc23f0193a
 MISC metadata.xml 354 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2 SHA512 cc86eee04c852fb1e40620e481712c5fc2c175fe637fb2ec1c627b88d25bf94f257a717191488981795f49488ddf6fb918b0d1d89ec05f23ba681b293a634066 WHIRLPOOL 503502973ebe813a597a56a6d013af48101902a04782c9fbcc54512b39b2fc3ae0440b63b819090ae145d54f276eca77ebf8ba6f17e9d3e05082969e28a210cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTPXpnAAoJEOeBhlrCAAWGI3YIAK7N0GGqNxa9AXTWmtVycRZC
-ZD3vFOKfIk8qyPndVKzC5FzSOU1nJ14rCdDsthb85bN9ReI5+QzZGo0iTexSaQoD
-j1kAYFkyvrMhkuTeb+XuWy9hL0C3jwp0K93DD4EtAMPg0KB6tDPA7pM2tqYfZ5Nb
-RAau4WNuy9dCls76MVRLSuV1ChrAFcCV0poIpP+sZ8vTgepxy3CZ1HCJjbatkxdH
-6WM0VAC4sYh9VS6WdwiQuNWoye3AmNd9ba2bHFmUfbpJfqQoV+riNSPXFabMKZk2
-Za9/Z5h5QaANNu5hodZqzVJVJvbmUkAQxUJr5OzE2DHH/a/ih/4gg3rF2Jq0fkk=
-=cke7
+iQEcBAEBCAAGBQJTcCemAAoJEOeBhlrCAAWGJkgIAIWSruUeDD60sWjw4af5FfyA
+qA1t2bdJz1QZ9Pg1dzgHgpMMOAvMbN2dj2PMPejlt64WWWOuzNr60ruR1y7GZixT
+MAOWZCRgJvbd8pRUJ0u3Plp1DZh8TvvkZIg3tvevpXNvhZzf6x4UGFX3bUDLE1oG
+ZNreLYEsKQzOCZ14RA1n1vW1RKPzwU0/qnqQWFzs6ZtTZn/h3Bnhj4yBllImmvvs
+CRGGNK89KZEXneJxLsr/rzYybsFC5Mpl5gvHlZQAwzGhzJv4ivpHJJuvtGqvkgEH
+uRf5+ggFkWS9a4B8O6OWedLEzweR7P47GaiavWokdyGoEjkJDmSTBukxVXqLSdg=
+=FrEG
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild
index 82022611e286..b470f2849391 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild,v 1.2 2014/04/03 15:12:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.2.4.0.ebuild,v 1.3 2014/05/12 01:44:55 ottxor Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ KEYWORDS="-* ~amd64 ~x86"
 #GoogleTalkPlugin binary contains openssl and celt
 LICENSE="Google-TOS openssl BSD"
 
-OBSOLETE="no"
+OBSOLETE="yes"
 [[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
 
 RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
diff --git a/www-plugins/google-talkplugin/google-talkplugin-5.3.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-5.3.1.0.ebuild
new file mode 100644
index 000000000000..c6e22b750fd6
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-5.3.1.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.3.1.0.ebuild,v 1.1 2014/05/12 01:44:55 ottxor Exp $
+
+EAPI=5
+
+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
+	inherit cvs #hack to make it part of @live-rebuild
+	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"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+#GoogleTalkPlugin binary contains openssl and celt
+LICENSE="Google-TOS openssl BSD"
+
+OBSOLETE="no"
+[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
+
+RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
+	dev-libs/glib: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/pango
+	sys-apps/lsb-release
+	libnotify? ( x11-libs/libnotify )"
+
+DEPEND=""
+
+INSTALL_BASE="opt/google/talkplugin"
+
+QA_PREBUILT="${INSTALL_BASE}/*"
+
+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() {
+	if [[ ${OBSOLETE} = yes ]]; then
+		elog "This version is no longer available from Google and the license prevents mirroring."
+		elog "This ebuild is intended for users who already downloaded it previously and have problems"
+		elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search"
+		use amd64 && MY_PKG="${MY_PKG/i386/amd64}"
+		elog "it with google: http://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}"
+		elog "and copy the file ${MY_PKG} to ${DISTDIR}."
+	else
+		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!)."
+	fi
+}
+
+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() {
+	local plugindir i l
+	local ppapi_plugindirs=( /opt/google/chrome{,-beta,-unstable}/pepper
+		/usr/lib/chromium-browser/pepper )
+
+	unpacker usr/share/doc/google-talkplugin/changelog.Debian.gz
+	dodoc changelog.Debian
+
+	exeinto "/${INSTALL_BASE}"
+	doexe "${INSTALL_BASE}"/GoogleTalkPlugin
+	for i in "${INSTALL_BASE}"/lib*.so; do
+		doexe "${i}"
+		[[ ${i##*/} = libnp* ]] && inst_plugin "/${i}"
+		if [[ ${i##*/} = libpp* ]] ; then
+			for plugindir in "${ppapi_plugindirs[@]}"; do
+				dosym "/${i}" "${plugindir}/${i##*/}"
+			done
+		fi
+	done
+
+	#install screen-sharing stuff - bug #397463
+	insinto "/${INSTALL_BASE}"
+	doins "${INSTALL_BASE}"/windowpicker.glade
+	doins "${INSTALL_BASE}"/remoting24x24.png
+	doins -r "${INSTALL_BASE}"/data
+
+	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
+}
diff --git a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
index be4688bae84e..79db3b5bbbe0 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.18 2014/04/03 15:12:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.19 2014/05/12 01:44:55 ottxor Exp $
 
 EAPI=5
 
@@ -91,6 +91,10 @@ src_unpack() {
 }
 
 src_install() {
+	local plugindir i l
+	local ppapi_plugindirs=( /opt/google/chrome{,-beta,-unstable}/pepper
+		/usr/lib/chromium-browser/pepper )
+
 	unpacker usr/share/doc/google-talkplugin/changelog.Debian.gz
 	dodoc changelog.Debian
 
@@ -99,6 +103,11 @@ src_install() {
 	for i in "${INSTALL_BASE}"/lib*.so; do
 		doexe "${i}"
 		[[ ${i##*/} = libnp* ]] && inst_plugin "/${i}"
+		if [[ ${i##*/} = libpp* ]] ; then
+			for plugindir in "${ppapi_plugindirs[@]}"; do
+				dosym "/${i}" "${plugindir}/${i##*/}"
+			done
+		fi
 	done
 
 	#install screen-sharing stuff - bug #397463