version bump (bug #473446, thx to Anton

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

4 files changed, 154 insertions, 16 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index b3df77ff722b..082c55e935b7 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.52 2013/05/17 00:42:58 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.53 2013/06/16 16:48:50 ottxor Exp $
+
+*google-talkplugin-4.0.1.0 (16 Jun 2013)
+
+  16 Jun 2013; Christoph Junghans <ottxor@gentoo.org>
+  +google-talkplugin-4.0.1.0.ebuild, google-talkplugin-3.17.0.0.ebuild,
+  google-talkplugin-3.19.1.0.ebuild:
+  version bump (bug #473446, thx to Anton
 
 *google-talkplugin-3.19.1.0 (17 May 2013)
 
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index e81d784f089d..b1e3db4587ee 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -5,19 +5,22 @@ DIST google-talkplugin_3.17.0.0-1_amd64.deb 12723112 SHA256 3dd096374c279dac4203
 DIST google-talkplugin_3.17.0.0-1_i386.deb 11192894 SHA256 cc6720a3a318897987baed97a4e88fc3d7ca7e2d26537bc58b78bc0d4452df8d SHA512 19e2c05443a1eb0522bc06f1d758df392376c584f4eddf8ca0a8ae227832150f6f8a8f0079b28a3ba512256cdd5bfd08cdd721be748d6ab649286d06281b7540 WHIRLPOOL 0c9a6cb1e98d296cd0b6eb39d309abe70243e6a1160694f4ab86e8d0bf5c3ae6ba39c971b420e8251ed10b880b24ff468bd203a5045acf6cdc8ca72ea8f9e1ca
 DIST google-talkplugin_3.19.1.0-1_amd64.deb 12800994 SHA256 a1ae4853306df919facf9c450358dc6bf1ef1e832faccd046e964a3dc6c83289 SHA512 24c9c642890442b133f3bf306751adebe204ee8e4a28f5e555ee9e9f146f4d74d0476cde6c0ebadf8c804bc9f80b52438ef62958ae89c86cff09511a667fe74e WHIRLPOOL e08f7ddb3e19bb70e472a49f4c48a0270a54efa78267fbd73b261b6045fc7043aeee1b44b7b81ef7472bd8741da994b6a725f6854c50601b60fa6f9f76d7d80e
 DIST google-talkplugin_3.19.1.0-1_i386.deb 11216090 SHA256 15ccfc507d8ed2ae2ca88cef47ee11d3e821e9ed873a15397c6dd9eb67d53423 SHA512 c1a47bfec29f89ed7c728f886c3b28e4e089d31603eb4adcf2d7bc44f18ba54db19e4250be3a67103ad4343495809eaca67622d50e7bfc30700d0ba89c1d3e44 WHIRLPOOL 57d31453112c6814031bbaff4a1bb69b94555f74aa897eab6ff72d74e17081514ad90634016c2b1eef04185fccace222228b5d3947aa92dc39cb2cd2736d5850
+DIST google-talkplugin_4.0.1.0-1_amd64.deb 12561300 SHA256 54c967ca5147ebe96634f786ec44497da851dc699a99b647fb7ab45ee0298e66 SHA512 68ad3ab27da0dd6edbfc93d4621d84dcd4e2f14cf4dfdfe64128c6808b5ea96a095142acf87972a388854c834d9096a3b9d9f2ef71ce0dab608cffc19d59e216 WHIRLPOOL a3613a3b8c1101e8f4bcf12998ddbb61a01a9944f131a0b730c2845f9a7bd10e79fa1c8b354a1f8939ee2271fa080587285dc9d4a01eee9e7518535c111d67f1
+DIST google-talkplugin_4.0.1.0-1_i386.deb 10959290 SHA256 eeb1686e2c0de9b1f6dcb0156068d10a4e48554f544ac93621da3ef7c29dc609 SHA512 c93eebcb56de8c0cda2c5d755957c43aed7ee0240f745c62736f7d431499d28013c008695139a730a4e40a658238af5f785019fc2e123a96dd0d8795498ea100 WHIRLPOOL 19f43536d406373f0fb15bbfeba2b104f80711c61df6acc48ae592fe42ab899fdaf0fb53635665ffd6a65389321724314e86f5e5ba46e1bb6fbf268a1c7dba87
 EBUILD google-talkplugin-3.17.0.0.ebuild 3915 SHA256 e16f7b9fc6a4c7e7ec295445a4c3789a964b949997a3a1f9230b6bd1eecd179f SHA512 efeb4d55a767874b8710b03d6de02d56138d697aaef959abee0ad7e689526d82557d1fd841b4f6d821640ba8790b803042186e97b0e0d1d4e961b82507197ad9 WHIRLPOOL d4753d5c7822274422834fe169c1c41772b6a1070341f47e26d03260c653842b6a68ae94c7457e66365200cd8103713272827e69717f98b876062f0643c05948
-EBUILD google-talkplugin-3.19.1.0.ebuild 3724 SHA256 4f37990ac3c48c6c89958fa6f47935be52e628bd707dfc4ad196aba7b236aff4 SHA512 ccfa7a13e82a3bc5fe37edfab80872302bf46aa0937ffbc195e66b2dce9aef22010341b8e4dad562a5ba68e8b228d2a6eb2e5d9a047e3f02e66919f56da3b174 WHIRLPOOL 464d1b0187f8f6516527fccadbca3c448c41b2803a885dc00aad21b28b87e65af797da4c45332ee68891d094e50f7afecc940df12992f8c54bc74cd0b2527407
+EBUILD google-talkplugin-3.19.1.0.ebuild 3917 SHA256 d24d55832d816705fef6a2fcd26e9da31f6db5a7ce342d9d2b138c3d3fdcaeaf SHA512 79aae6938ef91354c5e4e5e5ecae8b06f2c97da9eda835be43f9cca5147d01bd99f8a189e5c318c4fed7b91f9e3883b86232b7d7f523c7b3263cbd97f96b43bc WHIRLPOOL d9a30a48fe536c3139677f6687b1a06f16a3a25c60c830b3ff956d6c39044ac68b2b12957cc0ce9665facc5473e9888874a93c3a6e889a7973ac48bfcd4b0534
+EBUILD google-talkplugin-4.0.1.0.ebuild 3723 SHA256 e81c719d1a484d036980d81d9717e6563e6bf4c6fa274ea48ba77823b19fb3cf SHA512 1e4874289b5287863cd30953378b2525a38e2e164d5db358f3aef2330ad5011c2063926d5268dac1732b67b839eaaeced87fce971dc0026397a36efc93c26949 WHIRLPOOL 1c53474bc2d3dc2b401f0ca6e7efd8c2b2698ebdc6d5c7f567fb363834001c4d17ddab07a8213015740b2e20d41a14e530b91b8269c5e2477c257b5347f67420
 EBUILD google-talkplugin-9999.ebuild 3773 SHA256 e8649bbbfb6cbdde2279f803f9701feb80d3f3ff5f3cabb052491d4422eaeff0 SHA512 49f2040003d0069fb81b75d3439b634316726011a4d6c8c72c7b267adfbbb00f13f83dab8b5ee51ae87f3454487fc30c95f562b0eb3cc838f526ca6f40d53e01 WHIRLPOOL 7e82718322f7a2ed88c2ce271ef57cdd1066e1dbbdceb01a8ac6dc7436c4d8e97a1632e4241489c32669b6717022fcbef95b03cf43c6a7d47f3b42e95ca2f2cc
-MISC ChangeLog 9949 SHA256 e67a2cf452ca9be524c890405404f9a4a12d449b818c608ed6dc18b8a84a0034 SHA512 db1068cb067d70c1a3ed6f89cac1beddceeb9095463f71ce4e75a4cbc317acb561dd7d94fec57961868a1561dd4cdbe9e57e7bd5c2993b0099215c5fb81d4f91 WHIRLPOOL e19f7e6ebeddad091f83a0a3dec1e3bd8fa60724f0c2248e366254beee0acf059ab4ce7d66141dbac88d335fdc78ec5968df991ac0aedf31f0a626ebc5fa49e2
+MISC ChangeLog 10197 SHA256 98a2702e67a06a96239ac68ed17e8653066a694eafb16f5365b0643f18fb1718 SHA512 80f631a708f23e93666dacb0d2092cb850d4f233d75a6790593df2c5e5bbfe4fd94d763e716bed891c883920ab83417271b501343a1fbb60d22ed573f35d08ea WHIRLPOOL ab99639f3b0f1d9774fa2b650b00ca7af556ccedca11668de4b2ad7c653254eef2c386dbbd2f53405bb0cf63eaadfae30e07a3d36ef0073df80d94d77a3496e0
 MISC metadata.xml 354 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2 SHA512 cc86eee04c852fb1e40620e481712c5fc2c175fe637fb2ec1c627b88d25bf94f257a717191488981795f49488ddf6fb918b0d1d89ec05f23ba681b293a634066 WHIRLPOOL 503502973ebe813a597a56a6d013af48101902a04782c9fbcc54512b39b2fc3ae0440b63b819090ae145d54f276eca77ebf8ba6f17e9d3e05082969e28a210cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRlX0UAAoJEOeBhlrCAAWGCikIAKRAuMseLcHmsL80gV6QwLKa
-7+lwIWmIz+94UGAwW+U5mOUjY+b9j/t2jaeCxdg4o2JlIeDTEDjDt0wiBk3wa1+f
-B691EP+XFBkkUTE9p/Sbl5wc3Ye8FufnjyzlZ6Hf6Tn+L8YoOtDH4T+CuW873w+V
-4ykpITrP7J+1IW53HnZftdNUlq+TRJEP8b2oJVsniOeE5WeegTdP1IqsMP4SOZr3
-/4MEjpCXqtARV5Blqs0dWJuyAPuQwM9PxNcF9sbivXhjLGJW24rfiAdGm1J3saXT
-ApI7iuwOV1vThe10cdJjMuSlLtwhwh7HzHRmyVXphyAxlrVTmlr5MiBitbPpTyg=
-=aLqx
+iQEcBAEBCAAGBQJRvexzAAoJEOeBhlrCAAWGA5wH/2YEUtm8u3gudDz4eGYIUyJo
+Og0quoU8gUQMqz/p6KmjNz7ITG51aVV4q45NgWnO69hp0i27o1dUCOj2M6Yqe4Nu
+EHvyhUPjQXE+vzkIUtrg/UbnCzX1NEZVbIfJslDcdae/Ic0jdso2dGh7ELGruO/J
+LzcuPnJrttv/XLNb+HWcAuGML1Hmc1iEYnC0nWjW9aB3qNkiN3NEP8n8/aEdD/vO
+qAmVDqhVlokcGKJOODrUUqZ4hDV/5mTzKVJccb/Yt1/FZFzV/BJGM5jwDjw+DKmV
+ubsP2ovGWHRbiPSOFyDiWzVrt/6Ad6Rb4gFT48YYc0O989gOvwtibqQSX3Mkt/s=
+=ooUg
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.19.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.19.1.0.ebuild
index 683a651b946b..edc9f509fc5f 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-3.19.1.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-3.19.1.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-3.19.1.0.ebuild,v 1.1 2013/05/17 00:42:58 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.19.1.0.ebuild,v 1.2 2013/06/16 16:48:50 ottxor Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 #GoogleTalkPlugin binary contains openssl and celt
 LICENSE="Google-TOS openssl BSD"
-RESTRICT="strip mirror"
+RESTRICT="fetch strip"
 
 RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
 	dev-libs/glib:2
@@ -68,9 +68,12 @@ 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!)."
+	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}."
 }
 
 src_unpack() {
diff --git a/www-plugins/google-talkplugin/google-talkplugin-4.0.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-4.0.1.0.ebuild
new file mode 100644
index 000000000000..1fc0c710f292
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-4.0.1.0.ebuild
@@ -0,0 +1,125 @@
+# 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.0.1.0.ebuild,v 1.1 2013/06/16 16:48:50 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
+	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"
+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() {
+	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}"/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
+}