fix bug #424409 (thx to Jeff Simpson), removed old, license update

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

4 files changed, 25 insertions, 151 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 5edbfbc20a48..05e75995b31f 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.38 2012/12/18 05:38:53 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.39 2013/01/09 03:22:25 ottxor Exp $
+
+*google-talkplugin-3.10.2.0-r1 (09 Jan 2013)
+
+  09 Jan 2013; Christoph Junghans <ottxor@gentoo.org>
+  +google-talkplugin-3.10.2.0-r1.ebuild, -google-talkplugin-3.10.2.0.ebuild,
+  -google-talkplugin-3.7.1.0.ebuild, google-talkplugin-9999.ebuild:
+  fix bug #424409 (thx to Jeff Simpson), removed old, license update
 
   18 Dec 2012; Mike Frysinger <vapier@gentoo.org>
   google-talkplugin-3.10.2.0.ebuild, google-talkplugin-3.7.1.0.ebuild,
diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0-r1.ebuild
index 9ad089530ff2..2ebe68e0209e 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0-r1.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.10.2.0.ebuild,v 1.2 2012/12/18 05:38:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-3.10.2.0-r1.ebuild,v 1.1 2013/01/09 03:22:25 ottxor Exp $
 
 EAPI=4
 
@@ -26,8 +26,8 @@ IUSE="libnotify +system-libCg video_cards_fglrx video_cards_radeon"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
-#GoogleTalkPlugin binary contains openssl
-LICENSE="Google-TOS openssl"
+#GoogleTalkPlugin binary contains openssl and celt
+LICENSE="Google-TOS openssl BSD"
 RESTRICT="strip mirror"
 
 RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
@@ -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"
 
@@ -96,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
diff --git a/www-plugins/google-talkplugin/google-talkplugin-3.7.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-3.7.1.0.ebuild
deleted file mode 100644
index ad6a3512c1e7..000000000000
--- a/www-plugins/google-talkplugin/google-talkplugin-3.7.1.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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.7.1.0.ebuild,v 1.3 2012/12/18 05:38:53 vapier Exp $
-
-EAPI=4
-
-inherit eutils nsplugins unpacker
-
-if [ "${PV}" != "9999" ]; then
-	DEB_PATCH="1"
-	#http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages
-	MY_URL="http://dl.google.com/linux/talkplugin/deb/pool/main/${P:0:1}/${PN}"
-	MY_PKG="${PN}_${PV}-${DEB_PATCH}_i386.deb"
-	SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
-		amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
-else
-	MY_URL="http://dl.google.com/linux/direct"
-	MY_PKG="${PN}_current_i386.deb"
-	SRC_URI=""
-fi
-
-DESCRIPTION="Video chat browser plug-in for Google Talk"
-
-HOMEPAGE="http://www.google.com/chat/video"
-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"
-
-RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
-	dev-libs/glib:2
-	system-libCg? ( media-gfx/nvidia-cg-toolkit )
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:1.2
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-	sys-apps/lsb-release
-	virtual/opengl
-	libnotify? ( x11-libs/libnotify )"
-
-DEPEND=""
-
-INSTALL_BASE="opt/google/talkplugin"
-
-QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin"
-
-QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so"
-
-QA_FLAGS_IGNORED="${INSTALL_BASE}/libnpg.*so
-	${INSTALL_BASE}/lib/libCg.*so
-	${INSTALL_BASE}/GoogleTalkPlugin"
-
-S="${WORKDIR}"
-
-LANGS="ar cs en et fr hu lt ms pl ru sv tl vi bg da fa gu id ja lv nl
-sk ta tr bn de es fi hi is kn ml no sl te uk ca el fil hr it ko mr or
-ro sr th ur"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-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}."
-}
-
-src_unpack() {
-	local pkg="${A:=${MY_PKG}}"
-	if [ "${PV}" = "9999" ]; then
-		use amd64 && pkg="${pkg/i386/amd64}"
-		einfo "Fetching ${pkg}"
-		wget "${MY_URL}/${pkg}" || die
-	fi
-	unpacker ${pkg}
-}
-
-src_install() {
-	unpacker usr/share/doc/google-talkplugin/changelog.Debian.gz
-	dodoc changelog.Debian
-
-	exeinto "/${INSTALL_BASE}"
-	doexe "${INSTALL_BASE}"/GoogleTalkPlugin
-	for i in "${INSTALL_BASE}"/libnpg*.so; do
-		doexe "${i}"
-		inst_plugin "/${i}"
-	done
-
-	#install screen-sharing stuff - bug #397463
-	insinto "/${INSTALL_BASE}"
-	doins "${INSTALL_BASE}"/windowpicker.glade
-
-	strip-linguas ${LANGS}
-	for l in ${LINGUAS}; do
-		insinto "/${INSTALL_BASE}"/locale/$l/LC_MESSAGES/
-		doins "${INSTALL_BASE}"/locale/$l/LC_MESSAGES/windowpicker.mo
-	done
-
-	#install bundled libCg
-	if use video_cards_radeon || use video_cards_fglrx; then
-		#hack from #402401
-		exeinto "/${INSTALL_BASE}"/lib
-		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 4f8ad43963bd..30498772c0eb 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
+# 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-9999.ebuild,v 1.10 2012/12/18 05:38:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.11 2013/01/09 03:22:25 ottxor Exp $
 
 EAPI=4
 
@@ -26,8 +26,8 @@ IUSE="libnotify +system-libCg video_cards_fglrx video_cards_radeon"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
-#GoogleTalkPlugin binary contains openssl
-LICENSE="Google-TOS openssl"
+#GoogleTalkPlugin binary contains openssl and celt
+LICENSE="Google-TOS openssl BSD"
 RESTRICT="strip mirror"
 
 RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
@@ -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"
 
@@ -96,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