version bump

Package-Manager: portage-2.1.10.3/cvs/Linux i686

4 files changed, 137 insertions, 16 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/Manifest b/www-plugins/google-talkplugin/Manifest
index 7e8c0f9d5e00..3bbbae839ca8 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -5,18 +5,21 @@ DIST google-talkplugin_1.8.0.0-1_amd64.deb 7315012 RMD160 5d45807b7848e50244dd35
 DIST google-talkplugin_1.8.0.0-1_i386.deb 6304798 RMD160 7dfc10989f4ffed819f40b175b1949281691ad85 SHA1 582c029d03aa72d3e470c131ca9637aa7394071e SHA256 87bf5f08a38c44ea4891f4190b4221da24bbec4577eb3d6f1ea4c96bc9b9b55b
 DIST google-talkplugin_2.1.7.0-1_amd64.deb 7725788 RMD160 0a4a9489c3b67d5b0d108efb1d9da0e33525a40a SHA1 ffe93e503690b3c11e5749c961388567823cab88 SHA256 42a70d6cff75b0730e9cafa6a412b593329c2cd8dd9fcf161f807e6b99f08cb7
 DIST google-talkplugin_2.1.7.0-1_i386.deb 6710628 RMD160 93ad1b6f150b64f04e814b4026326837371116b1 SHA1 8755d35cee0995c4fe11df75f1c5bd3029799624 SHA256 807de17e32c306e67a5186f1d809022dd8141f654d4d5de335559537077d83f4
+DIST google-talkplugin_2.2.2.0-1_amd64.deb 7783422 RMD160 cb61c264b31e98d66817e0799d65bb557eb28e3d SHA1 d258c89501e68f6cb445830c36b03a69b7287861 SHA256 2bcb1de4171d3c4928d21696ad74b0b382f2a17b476db73abe898ea774f904a5
+DIST google-talkplugin_2.2.2.0-1_i386.deb 6766088 RMD160 71c8069a58201d9ba16ddf2abf72bcbd063512f4 SHA1 a4bd85ea78b2b2dc6950e4e45f44f0026e450043 SHA256 b62ec36252c66c83bb56a2f0b3f0e6177723b39d4631b649e0899bf21131e682
 EBUILD google-talkplugin-1.8.0.0.ebuild 3403 RMD160 ce25948087a2f734a8008df2a4638ab980317c9d SHA1 be60e2083e33a572c98e1f8fa35e4c3deb9f898f SHA256 5014209cc7c768a6839b3057a5da5fcdf795c8e0d1a293bb5dd7bf78902405c5
-EBUILD google-talkplugin-2.1.7.0.ebuild 3069 RMD160 07ccce62a1cdd6775c44d4f39eea865059004da5 SHA1 0dc54eeee9aff5194270a34effe5834bbc4454fc SHA256 6767a3a04c90cdc2276d3a28c0aa1a6463220c46c89fdf6abc207c7d9bf86497
-MISC ChangeLog 2094 RMD160 072307c612804126d2bceab4b5e22b0b6174f0ef SHA1 48ef721e9814ee8129c58b8d30c0bf0b47d5a6a0 SHA256 a77061c4b140daa2f605da7b5e2729fec9c4ab31aa4a7c9c4ed516517de7bf26
+EBUILD google-talkplugin-2.1.7.0.ebuild 3202 RMD160 a78183a9c39a4aac941610b1d8a6ec9dc446f347 SHA1 18b54c7bb06c0ffefef6c828dbfc5d9f7e929aea SHA256 2650134aeefec1093b0eb71e4c5bab650d30b871f36e21c5e0d1047e26c3daf7
+EBUILD google-talkplugin-2.2.2.0.ebuild 3056 RMD160 f97481dd487e96efc62f3d807c00617a10502c2e SHA1 aa4ebfa84526e71916bed0b585ed2db078d66253 SHA256 bb568499999c9a5ab8721723accdecc58f5660171f88bb9857391a35630a9477
+MISC ChangeLog 2277 RMD160 214946193b5cb83ea8f380213b64816c3046e95d SHA1 3b40a9ab32f024cd224a7eddbabad12e59894f09 SHA256 2c633dcc9e91081053f0145200a251287a750c342831a043dc66cf28fa133b34
 MISC metadata.xml 354 RMD160 996efb09eaf3af50035bac0fcf12768640f0c0c9 SHA1 ff3d2e6ce2eae43016888c2cd548b2a6962ddab1 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOOX7MAAoJEOeBhlrCAAWGT4kIAIOial1dbT6yYCWbe5b04Z6C
-cZnCmVqFi2VEiYKODBipZbLprc6BnoS5Wvc5U0kc+JqnVAC970bI59ASjKnPovBW
-+fRDOKmCtR+L3VybaeaZeAX+ITTk5oknrJMkzBbUMXtz1miUleFRvJuIQe/0ihcD
-iWI8SueZX98VmLaAbXC8BtIyOPslaErxo7IYSgcXJ2zkkKwK09EJ5tQOplIGVL1S
-d+A2HH1Kb6OyMtdCsvc3xSPSc3tUqAc0wgnr2J7SHbd7mjAw79TOqkHbfSX8EmVU
-dTs4/wy1+MHO3PVb5fDl31BRpYQPGU67FtTNXj3tLCTxG25sbf1cQFZtpYDBGDc=
-=k/YM
+iQEcBAEBAgAGBQJOStzhAAoJEOeBhlrCAAWGpUcIALI5EqCZGM0QCgj8092kwHVi
+zdLSqAIO5NcUBgUZj7AJZ+LdJTZgYezz8gKlXvDSbFLrse6QuAsnHezpc8DW9w7G
+MpF4aK+XsV/8d7CNg6x5Uq2tFJk0GZxYjGXs/wgCmJtKgT8Jtgk0YlZVUhli75G5
+4sqI7gxe+zeZ6OLwTGd3lVdhTnOyVdQ2fFlc5lVb96CoswvJWBDWED2lT/G05kWd
+JnaH6vPQmOxVBXHuRx6C/oP+3GM5Don1BTPYQOFbmHwNI95kSqpiHplvU/U9CXOT
+kfLI6nDUnNAcWZd+TinpaS0EKPfJzzhfgVeNwm4he/KH0BG2u2byCWODnMaiPn0=
+=uW9D
 -----END PGP SIGNATURE-----
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
+}