version bump

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

4 files changed, 141 insertions, 29 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 86600474864e..3f78f19b3865 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.22 2012/01/21 19:01:17 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.23 2012/03/19 03:15:03 ottxor Exp $
+
+*google-talkplugin-2.7.5.0 (19 Mar 2012)
+
+  19 Mar 2012; Christoph Junghans <ottxor@gentoo.org>
+  google-talkplugin-2.6.1.0.ebuild, +google-talkplugin-2.7.5.0.ebuild,
+  google-talkplugin-9999.ebuild:
+  version bump
 
 *google-talkplugin-2.6.1.0 (21 Jan 2012)
 
diff --git a/www-plugins/google-talkplugin/google-talkplugin-2.6.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.6.1.0.ebuild
index debe3be2d18a..d366182b13f0 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-2.6.1.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.6.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-2.6.1.0.ebuild,v 1.1 2012/01/21 19:01:17 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.6.1.0.ebuild,v 1.2 2012/03/19 03:15:03 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"
 
 NATIVE_DEPS="|| ( media-sound/pulseaudio media-libs/alsa-lib )
 	dev-libs/glib:2
@@ -82,9 +82,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.7.5.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.7.5.0.ebuild
new file mode 100644
index 000000000000..5617417e9ea5
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.7.5.0.ebuild
@@ -0,0 +1,117 @@
+# 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.7.5.0.ebuild,v 1.1 2012/03/19 03:15:03 ottxor 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"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+#GoogleTalkPlugin binary contains openssl
+LICENSE="google-talkplugin openssl"
+RESTRICT="strip mirror"
+
+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-2.4
+	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
+	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_DT_HASH="${INSTALL_BASE}/libnpg.*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() {
+	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() {
+	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 usr/share/doc/google-talkplugin/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 system-libCg; then
+		exeinto "/${INSTALL_BASE}"/lib
+		doexe "${INSTALL_BASE}"/lib/*.so
+	fi
+}
diff --git a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
index a3ab378a451e..8e39f7f519d1 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
@@ -1,10 +1,10 @@
 # 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.2 2012/01/07 04:50:06 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.3 2012/03/19 03:15:03 ottxor Exp $
 
 EAPI=4
 
-inherit eutils nsplugins
+inherit eutils nsplugins unpacker
 
 if [ "${PV}" != "9999" ]; then
 	DEB_PATCH="1"
@@ -30,7 +30,7 @@ KEYWORDS="-* ~amd64 ~x86"
 LICENSE="google-talkplugin openssl"
 RESTRICT="strip mirror"
 
-NATIVE_DEPS="|| ( media-sound/pulseaudio media-libs/alsa-lib )
+RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
 	dev-libs/glib:2
 	system-libCg? ( media-gfx/nvidia-cg-toolkit )
 	media-libs/fontconfig
@@ -52,15 +52,6 @@ NATIVE_DEPS="|| ( media-sound/pulseaudio media-libs/alsa-lib )
 
 DEPEND=""
 
-EMUL_DEPS=">=app-emulation/emul-linux-x86-baselibs-20100220
-	app-emulation/emul-linux-x86-gtklibs
-	app-emulation/emul-linux-x86-soundlibs
-	app-emulation/emul-linux-x86-xlibs"
-
-#amd64 needs EMUL_DEPS as GoogleTalkPlugin is a 32-bit binary
-RDEPEND="x86? ( ${NATIVE_DEPS} )
-	amd64? ( ${NATIVE_DEPS} ${EMUL_DEPS} )"
-
 INSTALL_BASE="opt/google/talkplugin"
 
 QA_EXECSTACK="${INSTALL_BASE}/GoogleTalkPlugin"
@@ -88,24 +79,18 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	if [ "${PV}" != "9999" ]; then
-		unpack ${A}
-	else
-		local pkg="${MY_PKG}"
+	local pkg="${A:=${MY_PKG}}"
+	if [ "${PV}" = "9999" ]; then
 		use amd64 && pkg="${pkg/i386/amd64}"
 		einfo "Fetching ${pkg}"
 		wget "${MY_URL}/${pkg}" || die
-		unpack ./"${pkg}"
 	fi
-	unpack ./data.tar.gz
+	unpacker ${pkg}
 }
 
 src_install() {
-	#workaround for bug #376741
-	cd usr/share/doc/google-talkplugin || die
-	unpack ./changelog.Debian.gz
-	dodoc changelog.Debian
-	cd -
+	unpacker usr/share/doc/google-talkplugin/changelog.Debian.gz
+	dodoc usr/share/doc/google-talkplugin/changelog.Debian
 
 	exeinto "/${INSTALL_BASE}"
 	doexe "${INSTALL_BASE}"/GoogleTalkPlugin