version bump

Package-Manager: portage-2.2.0_alpha120/cvs/Linux i686

5 files changed, 69 insertions, 49 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 055940c0827c..6b2c10be487b 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.29 2012/06/28 04:27:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.30 2012/07/20 20:45:56 ottxor Exp $
+
+*google-talkplugin-3.2.4.0 (20 Jul 2012)
+
+  20 Jul 2012; Christoph Junghans <ottxor@gentoo.org>
+  +google-talkplugin-3.2.4.0.ebuild, -google-talkplugin-2.9.10.0.ebuild,
+  google-talkplugin-3.1.4.0.ebuild, google-talkplugin-9999.ebuild:
+  version bump
 
 *google-talkplugin-3.1.4.0 (28 Jun 2012)
 
@@ -151,4 +158,3 @@
   15 Feb 2011; Christoph Junghans <ottxor@gentoo.org>
   +google-talkplugin-1.8.0.0.ebuild, +metadata.xml:
   Initial commit from cj-overlay (bug #333579)
-
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index aa5be1aaf459..f5b3b65c0fe9 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST google-talkplugin_2.9.10.0-1_amd64.deb 12560194 RMD160 ba94a639fde0405d671fcf6eee587a4d3292ee86 SHA1 0b58ce79878af13227ed1606da6c11950bb94090 SHA256 8b303183ea784e56e504510fd87f30f1a0dfc2ced5d005cd6ceeb83663f078c4
-DIST google-talkplugin_2.9.10.0-1_i386.deb 11094454 RMD160 e39a69a006025b8c733e49d0977a7b1f90b58f69 SHA1 c28e5dda6d457e08d65964e8054e15cc61be293a SHA256 424353587df629b57e35b309a4d304b50f6bf009914a8baf8e4af02a0859ab70
-DIST google-talkplugin_3.1.4.0-1_amd64.deb 12588668 RMD160 c89f13d41844c958bd247a05b094c0b1ff56965a SHA1 803a60e4c268c9f4f354ecb0bd9ecb7252b32d50 SHA256 2c073607b680ce1c17587398aca3ef50b135aa561841c19fde5e14f340b44499
-DIST google-talkplugin_3.1.4.0-1_i386.deb 11072026 RMD160 69b8544e870e9fcc50a9855ad656b82ae2cd3c48 SHA1 f815026e66d0eb00d1e6cbb8277f68045116efeb SHA256 043fbc38b3b6c997a99acb4e4ae827b9ca32c33418d4ab4fb98437cf32cf6561
-EBUILD google-talkplugin-2.9.10.0.ebuild 3552 RMD160 125a928cda995525875881bac9bdf880cb3a99ea SHA1 3d3ace8795d0c65632fc42ce8f9d55e846c02f0a SHA256 d2ade59891fb660f96ddd073747e3e4bb7ffead4f5fa253a25e70843d404cfc9
-EBUILD google-talkplugin-3.1.4.0.ebuild 3358 RMD160 dee113f7368006d5e116badf065e9d655809067c SHA1 bd0544ac8aa1dc980129b0e4dabe26741a78fff6 SHA256 7ec95f519a79e0b8fe1ad0236d4e061adace05f420ecb7f812cec598cc9f443b
-EBUILD google-talkplugin-9999.ebuild 3355 RMD160 7686020df25fa12ee460b4b2d6115cbd21d0da59 SHA1 5c17ea182e8455939828a5b737d95df814595870 SHA256 445b4b942e12c0a360f32c0181ff8e6cbc14d22f9210627675126c59e12e5db8
-MISC ChangeLog 5130 RMD160 e468b812ef41375a5d1e8592651625a0c69e9935 SHA1 fd11fa215a93339d454919fb8ad397265169fc7e SHA256 74a631b83224bbb48516f9abbb58b2d9fbdb6fb87fa9451b787849e3633141d7
-MISC metadata.xml 354 RMD160 996efb09eaf3af50035bac0fcf12768640f0c0c9 SHA1 ff3d2e6ce2eae43016888c2cd548b2a6962ddab1 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2
+DIST google-talkplugin_3.1.4.0-1_amd64.deb 12588668 SHA256 2c073607b680ce1c17587398aca3ef50b135aa561841c19fde5e14f340b44499 SHA512 070181239948dc82dcb631c508791546345a3b925eb04f2f4ccb9f5fe85daa568762b41de55c1b7e4e02a05bbbb7a2fb563bd3f760ee7f0de28703292cb9480c WHIRLPOOL b63a9078ff445bb0caf519bcc99f9ba3f1ebe1f172b5dc22ae7d7df4bcef65d4ce41f6fccb82eadc9aca833cdd079f48ef5d2ee50ad492606dc79cf44aa500a0
+DIST google-talkplugin_3.1.4.0-1_i386.deb 11072026 SHA256 043fbc38b3b6c997a99acb4e4ae827b9ca32c33418d4ab4fb98437cf32cf6561 SHA512 94a41db17266f754ac1d328a5ec1a9ef7097954bbcebecfb74b9a537755c38a56ef268b9fd581211a7eac2bab28764d3b8311004a5ad77689a270a64e0ff9699 WHIRLPOOL 099a525985d96841b93449891ba24df5584b39b9cf8772ad0742b56d7ecaa6a8222c40ac9320258f11104755f442a78a72edf34286b087aec9c511cda2098062
+DIST google-talkplugin_3.2.4.0-1_amd64.deb 12572116 SHA256 e19d402d5cc2ffdd4043c0ecd6e0850195a62257b20373fe22d98904b68fa841 SHA512 b92bbd943d235cbb1ce97fd08a0b28170be15d528086c7ae0787176e4b765bc32fba16d677e683d0a13b245a65f834fa96ebf4e3108a333bea6fb0d29f694b0d WHIRLPOOL a9684dc970cf0d5836cae55aff1a70a06c5a0f4552379e328b7b448ddfbde8ae013ba68cb6982675eaf9a3b83161400282f2ae1c5c443c9d0e76bf3e08cb90f7
+DIST google-talkplugin_3.2.4.0-1_i386.deb 11079528 SHA256 318c1176d505eb904db867b354cfc56dda30e054f67e120bfbcb281326d1788f SHA512 965e64e2981c8a688152dce573cf14291ac068e982a405f35c796e6bfe672ebe227910e5afb791537a67d00d78ea105818762fb8f997e27770de3365a1caef92 WHIRLPOOL 39a74a98b46066c6416844e16875c5c4d4a477aa9927442f773bc312f9bad58795dd426ea3bb5c88e33a3f2399f1d0b8516ce8aa504a56cd0c66b49617225682
+EBUILD google-talkplugin-3.1.4.0.ebuild 3551 SHA256 eb72bbf5621687bcb1314c6fb951099e9c3b04b602e91205c00aedc1c1478c96 SHA512 836563f058a26c01700577e81ee1b6bfd2d90cf6ae08c4e0d17ba5eeeb240fd2736a8f849b691198efb5a7523cfb692ae9096540c1b38801f6f642c2253ad61b WHIRLPOOL f03ea988713b33731089692e6a34dbd2085f729f3a78c884d28994b3f569c24428ec13b9c1630a24ee7d12ce5389ab163b399fac4ae88531f3cc5436d8a091ad
+EBUILD google-talkplugin-3.2.4.0.ebuild 3795 SHA256 5b801a470f0ff603e150fda00a264e99b21ec7c489155c57fc8d974c71a38c54 SHA512 6266718666f946558d11bbb0bb75cbf2fac65981d3c8c56c98eae788ff644d2521d91466b82ef6372bd0417aa64bf6ae02add03c737509cd1210ca7a0f19362c WHIRLPOOL c668eb519782daf3af82c54f4c1960d53bb72e5cfd4eadb188914ffb0f23d3f2d4fb634f9f041397123a6430e824ee679d41800b9dc7c35ea5e65ec69904f35d
+EBUILD google-talkplugin-9999.ebuild 3792 SHA256 54c73e1ef2714fa335a7efe9a4f20bc36c35b0fdb6466f4e9223eaac4cc3c8d2 SHA512 a9e1656e1a10556dd38bbdec3315e09b6ff1bff91077057ac990220292c041bdb7bb6c369ad71add307dc73a4131c2fe7ee5ed0660020c4e0354eaf9423de3fd WHIRLPOOL ec9a4bd25bf32d24bc1812c9804d5015879ddb65df2c3be87fa26ff843736ac78b0e4e9cadeffdef093f4e4736b1769eb4ccb4af061f51bcce45a73d1f4913e6
+MISC ChangeLog 5381 SHA256 84f2525727f15f7d724ae7584a848a3664372cd5ee1252507a648f7100c815d1 SHA512 21dc2d20f177f0cc2e894ead54ecef34a4b0e315046ab1fcc72c79b5038b090bf23c72006d34d5390d0c4cc56561f5f8c4caaa4953c43e8583c3169ee270611e WHIRLPOOL 4ecd9ed5022c7d9298f6c3400cac19149f05cc039f8086745242e461f71c52f2d8c2fdb5c7fb96c3486cd9e1adfa80964f53890874c8334eb281943f0c029f4e
+MISC metadata.xml 354 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2 SHA512 cc86eee04c852fb1e40620e481712c5fc2c175fe637fb2ec1c627b88d25bf94f257a717191488981795f49488ddf6fb918b0d1d89ec05f23ba681b293a634066 WHIRLPOOL 503502973ebe813a597a56a6d013af48101902a04782c9fbcc54512b39b2fc3ae0440b63b819090ae145d54f276eca77ebf8ba6f17e9d3e05082969e28a210cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP6907AAoJEOeBhlrCAAWGe1sH/1cDdPEDnQ/8O3FR9VNvxBW+
-/ZRVGLWeOexc5iZ2ghm78ZQIsVkYQ6XUhfcBqj3a89TjwgW6+12XPhRuDiO2yFp/
-sO+fa8v2n5UA0jc40gSUxWxoyXAZFDT+2mUeE6LpmXc0uqSq5rOntw34I8Gp/97l
-h0c/j7mc3QAeGUhq6daUBEvIXBm5WPgfsoHfiv1VSV5QnFKtnn77CwKTZSlZ7G3u
-BneB/wUwunKac/yvaEF++7+A4/PsCD/V0bzvsyTGuy0pE6SHIiAUYJnm8svOjSsV
-byz2F45eg5X19x6aILr0ScrDG9jvv2qxFPqsP+14K8cRENvO+ddDJSNWPxWdgdc=
-=Z/b6
+iQEcBAEBCAAGBQJQCcOLAAoJEOeBhlrCAAWGQNgH+waHLzfLCG0jj++LVLZcFSjh
+WfXb9tjpR80u0tI5BK0wJ/rXMnp2ZZhbPUPxlR9tP93hRpPPJoRpWApnnzlsVuRK
+NOEFAGC1kw2eQIEMC8Vz3bBTUu9UT1Nhz3kVkHXTb6ZU7gy5EzCJNjUETpmsmOd0
+KxrWmTKZoQ5blQYRY4axbYhADaFlQx0C+4epZmU4VbGCIRbFrPCGP33mu5FrEtWP
+lvZxxCktmgURZI3Fig7PhQldcXU6d/p8pbWFtk/5BN92sHKkJaUIGIUaJzv68m0o
+T9hfea4AIzIKmmVXKJbKuuxlJusHg6UNNH6SEvOzTcfrAfV6vyBYgl1Aa1tI9wE=
+=QIga
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild
index 03831aac1a03..edb33bb74154 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.1.4.0.ebuild,v 1.1 2012/06/28 04:27:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild,v 1.2 2012/07/20 20:45:56 ottxor Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 #GoogleTalkPlugin binary contains openssl
 LICENSE="google-talkplugin openssl"
-RESTRICT="strip mirror"
+RESTRICT="fetch strip"
 
 RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
 	dev-libs/glib:2
@@ -73,9 +73,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-2.9.10.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild
index 7e867247fda7..b30e3788d4e1 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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-2.9.10.0.ebuild,v 1.2 2012/06/28 04:27:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild,v 1.1 2012/07/20 20:45:56 ottxor Exp $
 
 EAPI=4
 
@@ -22,13 +22,13 @@ fi
 DESCRIPTION="Video chat browser plug-in for Google Talk"
 
 HOMEPAGE="http://www.google.com/chat/video"
-IUSE="libnotify +system-libCg"
+IUSE="libnotify +system-libCg video_cards_fglrx video_cards_radeon"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
 #GoogleTalkPlugin binary contains openssl
 LICENSE="google-talkplugin openssl"
-RESTRICT="fetch strip"
+RESTRICT="strip mirror"
 
 RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
 	dev-libs/glib:2
@@ -59,6 +59,7 @@ QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin"
 QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so"
 
 QA_DT_HASH="${INSTALL_BASE}/libnpg.*so
+	${INSTALL_BASE}/lib/libCg.*so
 	${INSTALL_BASE}/GoogleTalkPlugin"
 
 S="${WORKDIR}"
@@ -73,12 +74,9 @@ done
 
 # nofetch means upstream bumped and thus needs version bump
 pkg_nofetch() {
-	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}."
+	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() {
@@ -113,13 +111,19 @@ src_install() {
 	done
 
 	#install bundled libCg
-	if ! use system-libCg; then
+	if use video_cards_radeon || use video_cards_fglrx; then
+		#hack from #402401
 		exeinto "/${INSTALL_BASE}"/lib
-		doexe "${INSTALL_BASE}"/lib/*.so
-	fi
-
-	if has_version x11-drivers/ati-drivers || has_version x11-drivers/xf86-video-ati; then
-		ewarn "There seem to be problems with ati cards and nvidia-cg-toolkit"
-		ewarn "please report your experience, good or bad, on bug #402401"
+		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
 }
diff --git a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
index ba781eb147d9..ac465591d122 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-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-9999.ebuild,v 1.5 2012/06/28 04:27:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.6 2012/07/20 20:45:56 ottxor Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ fi
 DESCRIPTION="Video chat browser plug-in for Google Talk"
 
 HOMEPAGE="http://www.google.com/chat/video"
-IUSE="libnotify +system-libCg"
+IUSE="libnotify +system-libCg video_cards_fglrx video_cards_radeon"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
@@ -59,6 +59,7 @@ QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin"
 QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so"
 
 QA_DT_HASH="${INSTALL_BASE}/libnpg.*so
+	${INSTALL_BASE}/lib/libCg.*so
 	${INSTALL_BASE}/GoogleTalkPlugin"
 
 S="${WORKDIR}"
@@ -110,13 +111,19 @@ src_install() {
 	done
 
 	#install bundled libCg
-	if ! use system-libCg; then
+	if use video_cards_radeon || use video_cards_fglrx; then
+		#hack from #402401
 		exeinto "/${INSTALL_BASE}"/lib
-		doexe "${INSTALL_BASE}"/lib/*.so
-	fi
-
-	if has_version x11-drivers/ati-drivers || has_version x11-drivers/xf86-video-ati; then
-		ewarn "There seem to be problems with ati cards and nvidia-cg-toolkit"
-		ewarn "please report your experience, good or bad, on bug #402401"
+		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
 }