version bump (bug #423905)

(Portage version: 2.2.0_alpha113/cvs/Linux i686)

4 files changed, 29 insertions, 17 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/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
 }