version bump (bug #423905)

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

5 files changed, 43 insertions, 31 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 282b3df7b5d0..055940c0827c 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.28 2012/05/25 17:22:32 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.29 2012/06/28 04:27:31 ottxor Exp $
+
+*google-talkplugin-3.1.4.0 (28 Jun 2012)
+
+  28 Jun 2012; Christoph Junghans <ottxor@gentoo.org>
+  -google-talkplugin-2.8.5.0.ebuild, google-talkplugin-2.9.10.0.ebuild,
+  +google-talkplugin-3.1.4.0.ebuild, google-talkplugin-9999.ebuild:
+  version bump (bug #423905)
 
 *google-talkplugin-2.9.10.0 (25 May 2012)
 
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index b3849e514ce7..aa5be1aaf459 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST google-talkplugin_2.8.5.0-1_amd64.deb 12458368 RMD160 5058313e0d61075107422012a6b73c8cca79c67f SHA1 ba80f0686a95d1a93de0dfab1be3408e132b64d8 SHA256 253965dab24e546d587ce08c1a439f378a1a72a82e2e18c87f67b7c7d91c81b4
-DIST google-talkplugin_2.8.5.0-1_i386.deb 10998284 RMD160 0a343a1726ba289e6a6a4535ae975ceaa10d0e57 SHA1 40db0fe77d9d44330ca3c90e0209aa49e2d184b7 SHA256 f54feb7215e6f856d757c84f9419fc173175780a116cbb6d70e0f3919d22ff21
 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
-EBUILD google-talkplugin-2.8.5.0.ebuild 3531 RMD160 87f6ca902d60659ab79d988423ed5b017a0c90b7 SHA1 a5ff8fe2f4d3e95f0784561bba05fe2966935aa2 SHA256 85ae31fff5993dd39c9e67a894a900007c1a1e6de01108ff960c8b2e1e3203fe
-EBUILD google-talkplugin-2.9.10.0.ebuild 3359 RMD160 bc481520b98c401b6548e49e78d741a488f0e5c0 SHA1 610de63eef01735f04eb0affa8a29ab3213b45e4 SHA256 b3c30f1c5bd3ae17b0024f5f8cd3f4e4fad207836c692189951e1388a1c7d0fa
-EBUILD google-talkplugin-9999.ebuild 3120 RMD160 df176f86792b76a3a2e4d149836754b79a748e2e SHA1 fecd9d1db7487165f7c3491663189c673a403be2 SHA256 c4069099ccda0af3a77be1032d9d49d255bfb5c5416c878b1acc42104d31f534
-MISC ChangeLog 4864 RMD160 03d3d70eff96569a4fb40b1806ffd72c0a76641e SHA1 3db99a827632ea74c9dd012116d782f4b70e8132 SHA256 72111e5c3c1eae990bb30e6325a527eb92e3bd24554bc8d1e0d166baaf20e4ca
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPv7/fAAoJEOeBhlrCAAWGIFMIAJh21zRKBN/KUInKba+gi3FP
-OO9mUdVrU6jjxwc1yKwcpzLehpvRCgd6HNN/kgV7bnEzMiHHcaVXioVuSQUGs62+
-jV0nOaZBxeZgeuGrFqHOYFwbKtt3H6WA6VfKr3UbeQ9n18jDm0IguR+c7iBdB0ZE
-xARO7VNZH0AMCZkPS4TTPK65OtFgmL1w/djdXfIAQLO3Q2q28Psa5uaDI+cXC3ZI
-Fb7ZAk1xGUdlxLIdXKHcSKX5ML79xge5bwfuRZV91doyCl2IrtjLSsNuzof32Mpj
-wq08tMbeFPnp/rpsS9aA7r8eFORGTKZANjMZBUGtQ+YUAKln/Zjyfzad3qBFLw0=
-=VNxE
+iQEcBAEBAgAGBQJP6907AAoJEOeBhlrCAAWGe1sH/1cDdPEDnQ/8O3FR9VNvxBW+
+/ZRVGLWeOexc5iZ2ghm78ZQIsVkYQ6XUhfcBqj3a89TjwgW6+12XPhRuDiO2yFp/
+sO+fa8v2n5UA0jc40gSUxWxoyXAZFDT+2mUeE6LpmXc0uqSq5rOntw34I8Gp/97l
+h0c/j7mc3QAeGUhq6daUBEvIXBm5WPgfsoHfiv1VSV5QnFKtnn77CwKTZSlZ7G3u
+BneB/wUwunKac/yvaEF++7+A4/PsCD/V0bzvsyTGuy0pE6SHIiAUYJnm8svOjSsV
+byz2F45eg5X19x6aILr0ScrDG9jvv2qxFPqsP+14K8cRENvO+ddDJSNWPxWdgdc=
+=Z/b6
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild
index 2ddee7a18555..7e867247fda7 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-2.9.10.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.9.10.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.1 2012/05/25 17:22:32 ottxor Exp $
+# $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 $
 
 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.8.5.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.1.4.0.ebuild
index 6bdc603efe55..03831aac1a03 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-2.8.5.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-2.8.5.0.ebuild,v 1.4 2012/05/25 17:22:32 ottxor Exp $
+# $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 $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ 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
@@ -73,12 +73,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() {
@@ -118,8 +115,8 @@ src_install() {
 		doexe "${INSTALL_BASE}"/lib/*.so
 	fi
 
-	if has_version x11-drivers/ati-drivers && use system-libCg; then
-		ewarn "There seem to be problems with ati-drivers and nvidia-cg-toolkit"
+	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"
 	fi
 }
diff --git a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
index 857dc90baa2a..ba781eb147d9 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.4 2012/04/05 14:50:33 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.5 2012/06/28 04:27:31 ottxor Exp $
 
 EAPI=4
 
@@ -114,4 +114,9 @@ src_install() {
 		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"
+	fi
 }