version bump

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

5 files changed, 52 insertions, 36 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 6b2c10be487b..2dd65448c363 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.30 2012/07/20 20:45:56 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.31 2012/08/26 04:27:39 ottxor Exp $
+
+*google-talkplugin-3.5.1.0 (26 Aug 2012)
+
+  26 Aug 2012; Christoph Junghans <ottxor@gentoo.org>
+  +google-talkplugin-3.5.1.0.ebuild, -google-talkplugin-3.1.4.0.ebuild,
+  google-talkplugin-3.2.4.0.ebuild, google-talkplugin-9999.ebuild:
+  version bump
 
 *google-talkplugin-3.2.4.0 (20 Jul 2012)
 
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index f5b3b65c0fe9..9c8f4eef7245 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
+DIST google-talkplugin_3.5.1.0-1_amd64.deb 12626896 SHA256 32e3b9ab917ed30beb5f7fdd9da00beb61873945ad6017026f8ab2f673f48456 SHA512 b431b9154c6c830944cab5ec56798bf4d443aab0d38aac34fb14d5ee0db8d8fc8c95120b61a6f2425314163d55cf12e183120e8670a27f73cd5677640b57af0d WHIRLPOOL 637f6514dbaf3316859a10ad69423e73ceb6a3003da8be37e056dc42ea47b1af5217d864410999296511accb044969a7d7716219e8fcaa8abc1b730e0bb80295
+DIST google-talkplugin_3.5.1.0-1_i386.deb 11119864 SHA256 a7d81acad6ca7f9c1940d684e332f8abc064cf3c6e58942d8ee6ace7bf11cdcd SHA512 5a52a068200c06756c28ac9145d3b2ed2a3571ae3258df4abf0ebdc464a5f2cd89e0bf0d3a731655a08e35e4503c560f1d6eb028bfeb09a984f193cc25a5f8b7 WHIRLPOOL 92d5bbf5ecd5b74fd8f57acd6c2d8305ba7789530f4e9975df43a5bae281f931cd2796caa19593c562cb3d597e1f03354c82a5569bb5882d0378d4b351e612c7
+EBUILD google-talkplugin-3.2.4.0.ebuild 3988 SHA256 f3a5c38187862caa30010cbd11b0dc3867a9a60ca576dfbf87aec85540ff2030 SHA512 dc0057748baac9613b155c6a5d57323ea2d5b241090daee13ecc33fcd3078a20da881d686502fa8b1619ca90ef8942fc1fcd76a3d14fb8087c14949585a556bb WHIRLPOOL e36a44b9811508c62c317a3ff17d5ce85059a4af5ea7a7c7801742e835dcd2bf3251a0f1d7742a1288525ffdb2326e8c85ed3470e5542565fd7d5af361bbf69e
+EBUILD google-talkplugin-3.5.1.0.ebuild 3811 SHA256 cace1789422568a2236e9103cee10c17f875ebbc6abb9e95f3f3ed603c904ba0 SHA512 8bdc44a45bc5e1d4c322fc76d5e0d875d77055a453c239c84af5a3063fd56c4042806f2a4c79764751277926c719e6623925ecfcb79efcedf9a8ff9a344119ea WHIRLPOOL e142b839b04851b9c4ca4b644e4b3852b94a01bbb058b535ae2c906210a25175435eb834c9a97112153e3c5fd9bc226a1f8425dc1ab94a90b817f01fec92017d
+EBUILD google-talkplugin-9999.ebuild 3808 SHA256 0aee9eae976f5f48a91b45e39d26c658c60fc73d1280725351b1447b508b878b SHA512 e910a87c81aaaecf7de3e59d0e9b05d99baa28e8bf0a348853377d63ed3fc979e6110f604923c7b44fcfbb2ac16a532988cd102def5c98a7ddeb31c32dd27e81 WHIRLPOOL e1f8fd505f1126998d5ae68682662d6873401302144f01df7ce785dbbf370f67eae35854aaa1b87cb7f91cefc1654aee47cd49e6d055cba4ba1ed5e60d773072
+MISC ChangeLog 5632 SHA256 e119accd14f8f7ec5f2963dff3f9a7ebe259ad4cd196ce634313da642a5fe285 SHA512 26047887ba1971ec3042b3075d79015662f7384fa03e74c6ad4a0f2187b47042cc1ea95bb48d47ca20b5141c73d6132e85a377d2cfb6d051105ae3e9de88b7c5 WHIRLPOOL 85adf2bb73152b5292317a8be19d44e36b332e344ee4741577b426511085c41582afe08d434386a7a6f8a3b2a98a5a417ddef3d1192e56b6a715ff19e398b1c1
 MISC metadata.xml 354 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2 SHA512 cc86eee04c852fb1e40620e481712c5fc2c175fe637fb2ec1c627b88d25bf94f257a717191488981795f49488ddf6fb918b0d1d89ec05f23ba681b293a634066 WHIRLPOOL 503502973ebe813a597a56a6d013af48101902a04782c9fbcc54512b39b2fc3ae0440b63b819090ae145d54f276eca77ebf8ba6f17e9d3e05082969e28a210cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQCcOLAAoJEOeBhlrCAAWGQNgH+waHLzfLCG0jj++LVLZcFSjh
-WfXb9tjpR80u0tI5BK0wJ/rXMnp2ZZhbPUPxlR9tP93hRpPPJoRpWApnnzlsVuRK
-NOEFAGC1kw2eQIEMC8Vz3bBTUu9UT1Nhz3kVkHXTb6ZU7gy5EzCJNjUETpmsmOd0
-KxrWmTKZoQ5blQYRY4axbYhADaFlQx0C+4epZmU4VbGCIRbFrPCGP33mu5FrEtWP
-lvZxxCktmgURZI3Fig7PhQldcXU6d/p8pbWFtk/5BN92sHKkJaUIGIUaJzv68m0o
-T9hfea4AIzIKmmVXKJbKuuxlJusHg6UNNH6SEvOzTcfrAfV6vyBYgl1Aa1tI9wE=
-=QIga
+iQEcBAEBCAAGBQJQOaXCAAoJEOeBhlrCAAWGLN8H/3z3vMe3rVXWHk15H4dHJ1EN
+kvKGKUSc/51+XBVAuI9oMjEDuJhGJuegfoRLHW0DPVy+2BeleoH6cAxWm3Bz2SXo
+vthzp5W/4k6bxMOT4uQYqrerAXbSznFxRxEBc0x9skahswkILvQ26NjD55a6RUUz
+XlPSMwyr0gikesDJ5nOKlGV0lczjUtz5dFXDsajKy6vorQiY7UCzQWBZX0qBH7DB
+xtxEi2WZMjKvXQ8Z5KXf8ZyqweCrdgzlcqyqEsnoGUc9O0ELyznWS1Fcfv2jcV3g
+U0e5hY3CuaH62mN3kT7nJPTKvHsh2mRi5NkRxe3tuIVrB83IiZxleepPa8FmUzM=
+=Dde/
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild
index b30e3788d4e1..bf55986950d2 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-3.2.4.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-3.2.4.0.ebuild,v 1.1 2012/07/20 20:45:56 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.2.4.0.ebuild,v 1.2 2012/08/26 04:27:39 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
@@ -74,9 +74,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-3.1.4.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild
index edb33bb74154..1f2dc039b65d 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-3.5.1.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.2 2012/07/20 20:45:56 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.5.1.0.ebuild,v 1.1 2012/08/26 04:27:39 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
@@ -46,6 +46,7 @@ RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/libXt
+	x11-libs/pango
 	sys-apps/lsb-release
 	virtual/opengl
 	libnotify? ( x11-libs/libnotify )"
@@ -59,6 +60,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 +75,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 +112,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 ac465591d122..c9e7f424c25e 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.6 2012/07/20 20:45:56 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.7 2012/08/26 04:27:39 ottxor Exp $
 
 EAPI=4
 
@@ -46,6 +46,7 @@ RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/libXt
+	x11-libs/pango
 	sys-apps/lsb-release
 	virtual/opengl
 	libnotify? ( x11-libs/libnotify )"