version bump (bug #501350)

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

4 files changed, 160 insertions, 14 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 40fb996e7d1e..b95fb1c79796 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.68 2013/11/13 02:50:18 ottxor Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.69 2014/02/15 20:51:34 ottxor Exp $
+
+*google-talkplugin-5.1.4.0 (15 Feb 2014)
+
+  15 Feb 2014; Christoph Junghans <ottxor@gentoo.org>
+  +google-talkplugin-5.1.4.0.ebuild, google-talkplugin-4.9.1.0.ebuild:
+  version bump (bug #501350)
 
 *google-talkplugin-4.9.1.0 (13 Nov 2013)
 
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index cedf0e963334..8fddb2d60b4f 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -9,21 +9,24 @@ DIST google-talkplugin_4.8.3.0-1_amd64.deb 12753062 SHA256 272a83448bda2ce3cd843
 DIST google-talkplugin_4.8.3.0-1_i386.deb 11130624 SHA256 bdbbe7b7e731283a01eb3037053c8080938d6120ac3444ec3fbd25fb5620ef5c SHA512 28fe259f5801efd875f0ae7afda42cde01b5ce39a96f3d9f00447f88363f870adbcd5ef4399a7b4ff9152891aa5cf8a09eb24f1fad372fb623a5de3e197fd63a WHIRLPOOL cb86a313df59c7e4a23868e832526c946a46966d1e04bbcfd84888b33a3510f9147a0822a905d68e6cfa368ab4a3f94c52bd6f16c5430bb308b4e2de6eb99d6f
 DIST google-talkplugin_4.9.1.0-1_amd64.deb 12766698 SHA256 11fd33acf3e8a1346d1cea1ddab0cbdcaf7b47736fba62b03aa05cc83825c56b SHA512 03aa5a2f689d00bf4d25f866b0cce1c08f102d1390bf2b3597e630303e286fcc85864165f8ed0eed82cd445d00511aecf80462c8cb91b87dc884c506247a40f1 WHIRLPOOL 667ea0944d71a0bf383a861c340df9b2d40b2c97b7d090f692d2aa2e1763174c3ba30bc5733ac1c49d5415b2d52dbac0a0abc6d0751ab54600376e080ff8e354
 DIST google-talkplugin_4.9.1.0-1_i386.deb 11179172 SHA256 2d4753494b5cca1f7117d404040c6584bd3e052b882034e85b904d0efd62f285 SHA512 b6e747be13a625b32890ed0a70c45f57b7dd76bd211495228f4c10b4fd29997836974dbb8b9457e9c34ce9b7817bb0abf56f069ef7432821d589b39cb6a9a8eb WHIRLPOOL 2f750e40c24b4ad0c3829709ec204de0ccee9429770d897c6e9b4821e68236fbf33f4a79ab287a9ae727042a21d2a338bd80a26775672d0f5e6ffe7e5ce2311e
+DIST google-talkplugin_5.1.4.0-1_amd64.deb 13031120 SHA256 8c48eeff31b35237e0c9471119c97f5e9b8c790def02e2c640889f3e8dd6a1a7 SHA512 900a91917beb9cd4638a5f11867076137565d975d2a4190cd373963e5ec6de4608f892e223bfccbc0a1da4702b827180daff261e38c6cdc5599d62846521e478 WHIRLPOOL bed2afb8c33a53caf7e36e50ea17887ecd45811efd21841f719c5584fed3fe61ef3b513c9fc243491cfc35417d1945f878c50207c2f46220aca8e6ce1f195290
+DIST google-talkplugin_5.1.4.0-1_i386.deb 11405550 SHA256 813c020b963cd6b7388c700324f4483f58e7760e68f0457cd386747c5bccaccb SHA512 e01f649eacf7a50a7f643b4063b2b2e2de793a5d9d0610c46a1202cb27e544ca3807196b1d5181d0d7da5449d0549cb4936ff28b904db89e468849cc4e8e840e WHIRLPOOL f9c5587e2039f7d4ab4947d5a8c54cae2041ae10f48d982b2d46c9f8e571095af5d228f9dc9b4c47f9695a2bb159906e4dd25df3a4fd3f52148b1ba6e736ffe9
 EBUILD google-talkplugin-4.4.2.0.ebuild 4386 SHA256 2bb208df8faccb99bc1e4953a8bf687d616409120a76ab42149a6c6a1e1bf630 SHA512 bcefe7c2c4dd543b86a8bf56085b203d39825de015c0baad4c31e68093f83d1e5da7b42cce2bfc9d66d3c5bf2a8360aae12c278d8eb3a905301f41831426a680 WHIRLPOOL 3ea924a41a037814028684a52d29338fa560d3881b4a17e354c58b3137996facc7065a3de2ea1ccb8cf781640087d7e4857524d5ae0377b041f0fdf4af88af2d
 EBUILD google-talkplugin-4.7.0.0.ebuild 4391 SHA256 760a485b8314aca8f368829fb55ffb7d4811f2470b4c40a2fbe91fb2b7dd7dff SHA512 eac04219de856753cc38573ec141db735fd50c59b52c983acb3e75403c58c88eea68735890b44585b665c820e441b2067b4e2b696e2bc586e327d07a42e67ec0 WHIRLPOOL 4816a7c4dd353c512a47fbc298482ebdf5aec84a44fd74b81ce3cf940e04a4bae7ce52dd5445f2f5bcfcb9cbf4b48fcb9545ffab50b47011eb44c872421908aa
 EBUILD google-talkplugin-4.8.3.0.ebuild 4391 SHA256 b78a09e87d6f2fe15bccfc25b0cc36f155c9d0f4e10dc510ea74e1d4415b1019 SHA512 2479c2e97bf29ae69aba9273e47ca12c013be4e3ca06e51a61b7347cf8089f02fcc1fff26cefbd6cbf46bbe1e2ce2538616a40defbbf6e10ed589b15f085764b WHIRLPOOL 0f84b98575ec0d41fc1f514bdcc35b083e620ea759c85678c2dc17a3f0dc224117d2d2cb93d6d18a605f8ccbc0759f9792b0904c1ee85e33ea63ad41c49f5cdf
-EBUILD google-talkplugin-4.9.1.0.ebuild 4390 SHA256 60ff784dd6da5724e8ee9c7cb3471dd5c09467236cfc956d7246bf4fe8fae408 SHA512 8bf1092103bd3444b5356c20af323e738d16e7e667c66ecc22acd098982e0218f03ab284cc4aa6e60c61b4c1b8b8e65260e52f47e827dae043ee45be92522902 WHIRLPOOL 23b184c1f900a0e1019544a2374696ffeba9a548e62bac25a260f54d9d2827cda71a04fb8a7ad71e8ce16fd90527503716bb5b5f5f1e5c3fbfb7452a1fdeb66c
+EBUILD google-talkplugin-4.9.1.0.ebuild 4391 SHA256 dcba50ed70dc625c3f0c60070e6bb7a0b37b5d21f1ead36fcf06429c62b68fab SHA512 be68764935ca41bdd8719b769ad2e92cd1ef0d90096d404271a1aa689dfe0906e2cba70c318b749e0b429dfb2623af1e83ef089d2210451d7740b5c44dc80ea0 WHIRLPOOL 84b7119d606ac4e153566f70af53487313dba42eadc582b41ff3dd8eb839b33758d9cc47781cf9ab08593e983034b8a99ac9dc4a5b8abf28685b2e52b887276b
+EBUILD google-talkplugin-5.1.4.0.ebuild 4390 SHA256 512890d05204dd988dc1a38c3f70f41b1eb1125d729a4f4881a7d6f37b1ee236 SHA512 8420beca8c467d8f2e955228e422f646f8cf3809f80083519d9dc11903063da08831e652f0faf4bab5b4b2dd6578c9ef8425296a6faa19eccb734504eebc79e4 WHIRLPOOL 507f99b9f1a85c0a0b3939910c049d414da219170befa88cf2b06891f36b0c5099fec33b8d1d7a847c5cdf0db5d7feaff86e062fc9c7b035b2e171a0b0fe3f5e
 EBUILD google-talkplugin-9999.ebuild 4388 SHA256 3c1cd9ee31b0edc4038a9ccf2a14e021646022311431372489c8a26c657c513f SHA512 8429dc2b0c4a35a21a4da0e60c20b1aac7fa5c2947b34375584796d9a973a84a064a20bd72ded5c469340945bcc3d6309492a4b96f196eb9238425724190a9cb WHIRLPOOL afb60a1955b9bc27848c48eb783a47f6d1c00d19e9e7a574736937e3b829597fb5f4380ecb96beb20c68a0eae6b13c4339be675bfb1a0b976098a58ed61c8d53
-MISC ChangeLog 12952 SHA256 a107bf2b19d3cb5f9b6a2a8a0736127b47cb2e123e82d5d7db4e8933cf33cba9 SHA512 7808df7d5771bf6dc44e50c831c532bff8a223a1aabfd4a3545498a54e11a82e96ad03603c71d1aec4a134cb2a3c16f8bcdd2c2542d33c02742b07e5d4a5e27f WHIRLPOOL edc660c6057e752dc86eb7f4f871ffa6773b620fc15acbf15eb104b3ca951204025696e0d47038012e7ed289d717f798412245d7dfe13cf85c3aeef66401f859
+MISC ChangeLog 13149 SHA256 6359ef2b0ca53e3812834c106b13e89a85bffa08d4800a00319dfc62112f1c4c SHA512 d96d0b7a66a2f5663cc46e7e232fff2770787866a86c612e2431627918f7b5729dc44ba7b409c4288f462afefc5e0f1b8ac3a646497c1a8f2318ccb5144fc445 WHIRLPOOL a815dc2557b7c2fafd88d6d520efa4463428a273567f5fe32a5d07d0bcc1924ce17998d69c97afecbbeb24e148258dbc76d8ff6b95c4ee285bcaacd4f42386d1
 MISC metadata.xml 354 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2 SHA512 cc86eee04c852fb1e40620e481712c5fc2c175fe637fb2ec1c627b88d25bf94f257a717191488981795f49488ddf6fb918b0d1d89ec05f23ba681b293a634066 WHIRLPOOL 503502973ebe813a597a56a6d013af48101902a04782c9fbcc54512b39b2fc3ae0440b63b819090ae145d54f276eca77ebf8ba6f17e9d3e05082969e28a210cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSgujwAAoJEOeBhlrCAAWGGD0H/j+AciODfmTPR5Ow7M9CZgNV
-rJZk9MX/06bd6tei7bRn5vZgrYLC4zgs637ao5vom2vQK3GCzBUWQN9hTc6ybSwX
-Yk3zUcoMQJ80CPdZvgSbq7/lYaWg9NiYNc4hGxydg+JhbiNNptXYTgMkz2niJOmn
-Jg7gKnlgOBDndWBEF5lwbBxwOewkH9R7Q6RLW2lkDyanphsyKl0z/vnEkpfNojTd
-WPl9jWTuII84Id79ed5KK92cV70cLuPBDzNXKJ0DHrsmXLsSgChrufp/2GEjcIye
-G3barvffOXYeTuy3zIeThc8H2Iblei4TDMWpJTceanH2Is7L7WzwvEmw//Ad8RU=
-=BNFu
+iQEcBAEBCAAGBQJS/9NhAAoJEOeBhlrCAAWGnhgH/3gTi25VywvG46qkzTGiZq0k
+9JW4enUBMutsybg2YCQOlDSdnfpyxv9zs7O4rozpLZQlA8B6ahpdfiyNHMjMud8g
+LMS4vZW3EDMS24nP735XoUBALjSkEmY1NIiufSBhxAK1gS6Dom5zBSxOkksXOmTG
+vOkYUBk9vA5tW2+cNTn0KENGkeMsLx1Qr7mmyEiDO2pW3lanfIGJSbRrXc4/zMT5
+3rLx41hXocANtusD9ZpQKwxabwUqeN7j8uG7jQXxH14DUlnwt+m33DqVIrk/o2bM
+Hb8EFeKW0QH/cUeFKq2KcoXj/+CsgFu8RLhnaDHBjWTPjTStkkn5RAYLB+vJ4Gs=
+=xrFN
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-4.9.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-4.9.1.0.ebuild
index 498990e5b5a7..b88294d43bb9 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-4.9.1.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-4.9.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-4.9.1.0.ebuild,v 1.1 2013/11/13 02:50:18 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-4.9.1.0.ebuild,v 1.2 2014/02/15 20:51:34 ottxor Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ KEYWORDS="-* ~amd64 ~x86"
 #GoogleTalkPlugin binary contains openssl and celt
 LICENSE="Google-TOS openssl BSD system-libCg? ( NVIDIA-r1 )"
 
-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.1.4.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-5.1.4.0.ebuild
new file mode 100644
index 000000000000..4709e3745b2b
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-5.1.4.0.ebuild
@@ -0,0 +1,137 @@
+# 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.1.4.0.ebuild,v 1.1 2014/02/15 20:51:34 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 system-libCg video_cards_fglrx video_cards_radeon"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+#GoogleTalkPlugin binary contains openssl and celt
+LICENSE="Google-TOS openssl BSD system-libCg? ( NVIDIA-r1 )"
+
+OBSOLETE="no"
+[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || 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
+	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_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() {
+	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}"
+	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
+
+	#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
+}