version bump (bug #485856)

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

4 files changed, 158 insertions, 12 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 616ade623811..2473d8297465 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.63 2013/09/24 14:46:23 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.64 2013/09/24 14:49:17 ottxor Exp $
+
+*google-talkplugin-4.6.3.0 (24 Sep 2013)
+
+  24 Sep 2013; Christoph Junghans <ottxor@gentoo.org>
+  +google-talkplugin-4.6.3.0.ebuild, google-talkplugin-4.5.3.0.ebuild:
+  version bump (bug #485856)
 
   24 Sep 2013; Christoph Junghans <ottxor@gentoo.org>
   -google-talkplugin-3.17.0.0.ebuild:
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 3315d016d528..de5a778ae058 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -5,19 +5,22 @@ DIST google-talkplugin_4.4.2.0-1_amd64.deb 12575448 SHA256 c35fae9b5b13d4db635f4
 DIST google-talkplugin_4.4.2.0-1_i386.deb 10972844 SHA256 5da82bb9df5023cf2d48be1248ccaf16f3abe454604a5852d3c94a5fdc151852 SHA512 cb6d725b3f6d5b137583cdbb189ba014bddd2b3664ba1b5eaae1ab1842d5faf89b1dd9f810d101beaea6153ec27361a5acdf91ee5abe73525ec753655a11287e WHIRLPOOL 7bd9a87febf94f3cb9fda0a4e1e7b1b24f41353c437d71fd4f6a136b8460b6092f2383b65cd48774a0d0ffe927bbad970ba58b7c89ec552c07d426bb57735011
 DIST google-talkplugin_4.5.3.0-1_amd64.deb 12653332 SHA256 ef7fbb5dfb314dd3b33260fb808c8d689375a56f49e98687b75c91c8d263ccd0 SHA512 6bc54027681f780129d4dec36f50a221e31e93515e86ab186ae5cba75362a3f06b80a9d9f3f5cf55a47857537ff921c995e55946ba21f2af6680a2c44f72a018 WHIRLPOOL a68ccc39186a8884c02ed592c1a7aefa7e8f7d74c2403730c1d559f9fc347c25979c152bb0855cba85bf761b069c11cc3c371e06df31ee6b59111276b405ed30
 DIST google-talkplugin_4.5.3.0-1_i386.deb 11047914 SHA256 bd8c77b6d11c48ae74f8645d1aec5dcabfe6d78fd7413e905dda2402e6ce9157 SHA512 203a40572fbdc4b3a76bc9b51fd85bf54384f179a755f5818790a74f9354f3e0b2a94745a996cc7c46749011e63e591bb7fcc0cd4bf2084f4f60bb49b933c332 WHIRLPOOL 5385e42001b8bdd5b0f056481c329a0ba6db31a106e52c0fd3ef506a557b0325f5656e4fa4b20823806e035f62655822507822ed5fde50e2878b2214b8514a68
+DIST google-talkplugin_4.6.3.0-1_amd64.deb 12718398 SHA256 f7b32388fd23644a2d07173df87490ccdfe2cb9815afece2d49dde32d6bf9ff3 SHA512 c8ce49ea9904e878f895073245472415eecdc4773392a81bab88d02b0d48fd8f4579d04688c23906ef5b06deeb231591d8bc5b1802485cafeb048a385f28baa2 WHIRLPOOL e58e17de00f6f825bbfa02466ea78d2e4d9afcbdb5741f20b267b6235f4f8a034fcaa9439f44c7d83cf0a951c11d1c0818563669d2c61fa7119ca7a49273dce4
+DIST google-talkplugin_4.6.3.0-1_i386.deb 11103940 SHA256 7cc17b2f3c137753598a324ce1e05fc985d7b9e1a9b689edcca2c667a4374de0 SHA512 cfb2ae9c8e53f92297aeef8a539b1e466a4373625ebe844d554fce7d11eec837a3a9d04493e559ae9d200b4157c224d182f2a1910757bbb8303ae12d4889cf8a WHIRLPOOL 07284a643b6404b9c157e24ce004c2c8ef6be32ce194c7da1ca32eab2af1132497d8ea6263a24d3a06ade380e777877defae5a5c0cd53768894a01883a99c516
 EBUILD google-talkplugin-4.4.2.0.ebuild 4386 SHA256 2bb208df8faccb99bc1e4953a8bf687d616409120a76ab42149a6c6a1e1bf630 SHA512 bcefe7c2c4dd543b86a8bf56085b203d39825de015c0baad4c31e68093f83d1e5da7b42cce2bfc9d66d3c5bf2a8360aae12c278d8eb3a905301f41831426a680 WHIRLPOOL 3ea924a41a037814028684a52d29338fa560d3881b4a17e354c58b3137996facc7065a3de2ea1ccb8cf781640087d7e4857524d5ae0377b041f0fdf4af88af2d
-EBUILD google-talkplugin-4.5.3.0.ebuild 4390 SHA256 9193899d6c870cc256027d65d4ef27c9d1e64786dce49022f1e459e7404d5486 SHA512 9ca557c70bf88119008bfb695a33dc8df52f32b473cdf8fa895347026845ae8ee8344c8a575dc6940ae0a39c55374d4322498a91ebe6c0fb5cfb19147370a37a WHIRLPOOL 86262da72515a40c0f755caf85acdcb7c8144369b3a0ce7568f5cc255aaeff72830a25cf761cdfb6dcecffcb7a6a397b64467ea075031a43a3f422efaa8b7f9b
+EBUILD google-talkplugin-4.5.3.0.ebuild 4391 SHA256 9e93ca3154319638e50d77f8e8b84f8d5234c82bac783dc877b9474aaee1841b SHA512 b951a9d75ad45e31d873589b5dadaafa4f0ec7a259fdf0ec30dd5afc4cc2b23b4ec5e7b93cc79d1fdd1c1eaec3f23faacd5e697677918df9e954a36505e9b602 WHIRLPOOL 852dd34b04c9216aa0838f885d3f5ffd833b201367763b0cd27b869fbd95436c1dbb80fef32a1c8a2c311fa09e72f602fce515727140b7c81509ad77796f674e
+EBUILD google-talkplugin-4.6.3.0.ebuild 4390 SHA256 cd2a7435fd56cab57046e55a5f19f865a1349ed74e3552902f21742b66e7f328 SHA512 f90ca74c76401d4268eeca2e48b383f9f9e4da4af3abb6d64af2f13962a8646cec4ffe84f43f5977346567ce77f937e9654c7407c7c3244ac8ea134ea85c53ac WHIRLPOOL d7b4be8aa9ec4f69f8098d1fec7646ef0d10a7a8317ef47be279a466fd7e3955e54240442f73f7303fdc297f4eb4cd924cc8547996bfcaa0c88d6c0921ebc623
 EBUILD google-talkplugin-9999.ebuild 4388 SHA256 3c1cd9ee31b0edc4038a9ccf2a14e021646022311431372489c8a26c657c513f SHA512 8429dc2b0c4a35a21a4da0e60c20b1aac7fa5c2947b34375584796d9a973a84a064a20bd72ded5c469340945bcc3d6309492a4b96f196eb9238425724190a9cb WHIRLPOOL afb60a1955b9bc27848c48eb783a47f6d1c00d19e9e7a574736937e3b829597fb5f4380ecb96beb20c68a0eae6b13c4339be675bfb1a0b976098a58ed61c8d53
-MISC ChangeLog 12024 SHA256 7385055b4e0acd5ea197c915fd79381b4b9101727afce0b2d7bc034979f520f2 SHA512 c4e514f1f8625c5d663dd55c9fe77b7cfb51a17d7a7c116e3d7ed6cd8c38535fcd058ac99afc9719858e4756aaf4930a414a392803ec72479be6232b7e0d936c WHIRLPOOL 78b0905a72c219aeea7d09c0543f137022b5cc8568372d832d4864369547a34c1f15414d2d97643d399262f0873b392503a0993889c4ef1984344df4150b315e
+MISC ChangeLog 12221 SHA256 66fbc52d196b43dd70fa505c17d96295c8405d82d9c200d5ba2bf74e4ff0e313 SHA512 de4cf44d2520eafcf61d72be95134c2773b2995ffc43cee49903930c4345e9b74147d3a442a88d7d4ce8231e3aadb708cc764e22775d00849487d431389da050 WHIRLPOOL 906a3c595c2cecda14b36b19ae62a16bb2c1c13f320434a2274ae82a68492066fc598108706b5f2864f2bc9ab1ad70a54df3fd1d304be1be32d8f63932113265
 MISC metadata.xml 354 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2 SHA512 cc86eee04c852fb1e40620e481712c5fc2c175fe637fb2ec1c627b88d25bf94f257a717191488981795f49488ddf6fb918b0d1d89ec05f23ba681b293a634066 WHIRLPOOL 503502973ebe813a597a56a6d013af48101902a04782c9fbcc54512b39b2fc3ae0440b63b819090ae145d54f276eca77ebf8ba6f17e9d3e05082969e28a210cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSQaXEAAoJEOeBhlrCAAWGzroH/i5aoDg8WOLyoJrk2IL4YP/L
-iKQgE4xrAaZ4Vc8Y5Ui4yAuCgAAK1DNivE35ic+B0+XMonX8CwGVQwjfuM+pkq7S
-+uDzzLbKZ95d4032vXOG0/tNvNl1nxLolpx63luAyg8sRV2F9i5lZZ+S62PniVwQ
-SgqYrKs+OwPenwP55XcRLRPP+d+EWivUiSz7iMArVtPRxBH/EXXK2ZcW0sPn0NlC
-QCbAs56c3q82eVU03Lo9CmaJ0DFUr1WEACocnGcMdwImC+kIfSK0GY6jyr/re42W
-E97D9LdO8i+hqi63ypJ1fjbvUMAs8Wp9f68+cwW5zXmDP2F0+YX0PjHMtOxyDa8=
-=WbOI
+iQEcBAEBCAAGBQJSQaZuAAoJEOeBhlrCAAWGf0QH/2/C2VSAJkIGzGeRnWClb1pS
+wSuu8ypd5NgQI54WM4mzyWDwc4rHS9UxLmwW169uveUbuMA7hID6CTcOmLwDs9nH
+6QciHmFBmqLI717SIg9Sw69BfSeMXJSEI08LggHR4c/XtSDQgdGIJK8vNCR87tCz
+vjkOhUmrfke1VDQFiEgf34jnzdC3jQH1O9MmveOZce0aH4mzDAO4azbRw7zoDjkM
+AEVls7jhItFJ5mtufXNgNGUkUszsUlMtrX5r3xEfmaOijy/xY6o/Ivq4aj9S0WiZ
+f88y9aZxudsQ16VkfmFizIwoGKUeMpSkKvkkd1VOiYhtyovmMVW7Xl4zSlE5kMM=
+=AY0p
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-4.5.3.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-4.5.3.0.ebuild
index cf9410b03fed..8195fb96f1fb 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-4.5.3.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-4.5.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.5.3.0.ebuild,v 1.1 2013/09/04 14:44:34 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-4.5.3.0.ebuild,v 1.2 2013/09/24 14:49:17 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-4.6.3.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-4.6.3.0.ebuild
new file mode 100644
index 000000000000..da6740486612
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-4.6.3.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2013 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.6.3.0.ebuild,v 1.1 2013/09/24 14:49:17 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
+}