version bump

(Portage version: 2.1.10.3/cvs/Linux i686)

3 files changed, 125 insertions, 7 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index cbecc939c0c3..6532e566f681 100644
--- a/www-plugins/google-talkplugin/ChangeLog
+++ b/www-plugins/google-talkplugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/google-talkplugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.13 2011/08/03 17:00:51 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.14 2011/08/16 21:10:51 ottxor Exp $
+
+*google-talkplugin-2.2.2.0 (16 Aug 2011)
+
+  16 Aug 2011; Christoph Junghans <ottxor@gentoo.org>
+  google-talkplugin-2.1.7.0.ebuild, +google-talkplugin-2.2.2.0.ebuild:
+  version bump
 
   03 Aug 2011; Christoph Junghans <ottxor@gentoo.org>
   google-talkplugin-2.1.7.0.ebuild:
diff --git a/www-plugins/google-talkplugin/google-talkplugin-2.1.7.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.1.7.0.ebuild
index 81fb5f7f8ae6..211485a3e906 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-2.1.7.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1.7.0.ebuild,v 1.4 2011/08/03 17:00:51 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.1.7.0.ebuild,v 1.5 2011/08/16 21:10:51 ottxor Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 #GoogleTalkPlugin binary contains openssl
 LICENSE="google-talkplugin openssl"
-RESTRICT="strip mirror"
+RESTRICT="fetch strip"
 
 #to get these run:
 #for i in $(scanelf -n /opt/google/talkplugin/* | awk '/^ET/{gsub(/,/,"\n",$2);print $2}' | sort -u)
@@ -77,11 +77,13 @@ QA_DT_HASH="${INSTALL_BASE#/}/libnpg.*so
 
 S="${WORKDIR}"
 
-# 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.2.2.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.2.2.0.ebuild
new file mode 100644
index 000000000000..24808ee1ee9e
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.2.2.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2011 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.2.2.0.ebuild,v 1.1 2011/08/16 21:10:51 ottxor Exp $
+
+EAPI=4
+
+inherit nsplugins
+
+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"
+else
+	MY_URL="http://dl.google.com/linux/direct"
+	MY_PKG="${PN}_current_i386.deb"
+fi
+
+DESCRIPTION="Video chat browser plug-in for Google Talk"
+SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
+	amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
+
+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"
+
+#to get these run:
+#for i in $(scanelf -n /opt/google/talkplugin/* | awk '/^ET/{gsub(/,/,"\n",$2);print $2}' | sort -u)
+#do
+#  find /lib /usr/lib -maxdepth 1 -name $i -exec qfile -S {} \;
+#done |  awk '{print $1}' | sort -u
+#also see debian control file
+NATIVE_DEPS="|| ( 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=""
+
+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"
+
+QA_TEXTRELS="${INSTALL_BASE}/libnpg*.so"
+
+QA_DT_HASH="${INSTALL_BASE}/libnpg.*so
+	${INSTALL_BASE}/GoogleTalkPlugin"
+
+S="${WORKDIR}"
+
+# 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() {
+	unpack ${A} ./data.tar.gz
+}
+
+src_install() {
+	#workaround for bug #376741
+	cd usr/share/doc/google-talkplugin || die
+	unpack ./changelog.Debian.gz
+	dodoc changelog.Debian
+	cd -
+
+	exeinto "/${INSTALL_BASE}"
+	doexe "${INSTALL_BASE}"/GoogleTalkPlugin
+	for i in "${INSTALL_BASE}"/libnpg*.so; do
+		doexe "${i}"
+		inst_plugin "/${i}"
+	done
+
+	#install bundled libCg
+	if ! use system-libCg; then
+		exeinto "/${INSTALL_BASE}"/lib
+		doexe "${INSTALL_BASE}"/lib/*.so
+	fi
+}