version bump (thx to devurandom@gmx.net, bug #457736)

(Portage version: 2.2.0_alpha162/cvs/Linux x86_64, signed Manifest commit with key C2000586)

3 files changed, 28 insertions, 21 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 0c8b4b0287c1..0609bd2c71cf 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.41 2013/01/31 18:42:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.42 2013/02/15 22:01:15 ottxor Exp $
+
+*google-talkplugin-3.13.2.0 (15 Feb 2013)
+
+  15 Feb 2013; Christoph Junghans <ottxor@gentoo.org>
+  +google-talkplugin-3.13.2.0.ebuild, -google-talkplugin-3.9.1.0.ebuild,
+  google-talkplugin-3.10.2.0-r1.ebuild:
+  version bump (thx to devurandom@gmx.net, bug #457736)
 
   31 Jan 2013; Agostino Sarubbo <ago@gentoo.org>
   google-talkplugin-3.10.2.0-r1.ebuild:
diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0-r1.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0-r1.ebuild
index bc67e8b4b542..3d32c1e9a6db 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0-r1.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0-r1.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.10.2.0-r1.ebuild,v 1.3 2013/01/31 18:42:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0-r1.ebuild,v 1.4 2013/02/15 22:01:15 ottxor Exp $
 
 EAPI=4
 
@@ -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
@@ -75,9 +75,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.9.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.13.2.0.ebuild
index 923a0be377ff..cf2e7f69129b 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-3.9.1.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-3.13.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.9.1.0.ebuild,v 1.3 2012/12/18 05:38:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.13.2.0.ebuild,v 1.1 2013/02/15 22:01:15 ottxor Exp $
 
 EAPI=4
 
@@ -26,9 +26,9 @@ IUSE="libnotify +system-libCg video_cards_fglrx video_cards_radeon"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
-#GoogleTalkPlugin binary contains openssl
-LICENSE="Google-TOS openssl"
-RESTRICT="fetch strip"
+#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
@@ -57,9 +57,9 @@ INSTALL_BASE="opt/google/talkplugin"
 
 QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin"
 
-QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so"
+QA_TEXTRELS="${INSTALL_BASE}/lib*.so"
 
-QA_FLAGS_IGNORED="${INSTALL_BASE}/libnpg.*so
+QA_FLAGS_IGNORED="${INSTALL_BASE}/lib.*so
 	${INSTALL_BASE}/lib/libCg.*so
 	${INSTALL_BASE}/GoogleTalkPlugin"
 
@@ -75,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() {
@@ -99,9 +96,9 @@ src_install() {
 
 	exeinto "/${INSTALL_BASE}"
 	doexe "${INSTALL_BASE}"/GoogleTalkPlugin
-	for i in "${INSTALL_BASE}"/libnpg*.so; do
+	for i in "${INSTALL_BASE}"/lib*.so; do
 		doexe "${i}"
-		inst_plugin "/${i}"
+		[[ ${i##*/} = libnp* ]] && inst_plugin "/${i}"
 	done
 
 	#install screen-sharing stuff - bug #397463