version bump

Package-Manager: portage-2.2.0_alpha74/cvs/Linux i686

4 files changed, 141 insertions, 15 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index ec36c27a77e5..5508c70110ee 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.15 2011/09/14 17:28:09 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.16 2011/11/16 02:42:04 ottxor Exp $
+
+*google-talkplugin-2.4.5.0 (16 Nov 2011)
+
+  16 Nov 2011; Christoph Junghans <ottxor@gentoo.org>
+  google-talkplugin-2.3.2.0.ebuild, +google-talkplugin-2.4.5.0.ebuild:
+  version bump
 
 *google-talkplugin-2.3.2.0 (14 Sep 2011)
 
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 4d30c8f2926c..8486f83bd655 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -9,20 +9,23 @@ DIST google-talkplugin_2.2.2.0-1_amd64.deb 7783422 RMD160 cb61c264b31e98d66817e0
 DIST google-talkplugin_2.2.2.0-1_i386.deb 6766088 RMD160 71c8069a58201d9ba16ddf2abf72bcbd063512f4 SHA1 a4bd85ea78b2b2dc6950e4e45f44f0026e450043 SHA256 b62ec36252c66c83bb56a2f0b3f0e6177723b39d4631b649e0899bf21131e682
 DIST google-talkplugin_2.3.2.0-1_amd64.deb 7728830 RMD160 6e6304f8b9f46655286ee939f0fd8cc831f28514 SHA1 96b6e814dcd811e45afec2047927f4a8ee89cf93 SHA256 6950777bdf96ef82aee80b7c857f10212824a1eed582f38c8163345ea61dc3f2
 DIST google-talkplugin_2.3.2.0-1_i386.deb 6738522 RMD160 ec95ed1d31e42b3b08539a7fdbd0bc9af12382ef SHA1 fc77263ff5dd62264b82ef77acdc679d7d3977a7 SHA256 0cf9d284fae27642c47e6c9104c31b282a36eab9b3be3c118a04716ae9f6e1b1
+DIST google-talkplugin_2.4.5.0-1_amd64.deb 8025096 RMD160 a50cdee3b0ce413ef0a537db79af6ba907b60bea SHA1 75b023a68827173785d62611c39b7385856031e7 SHA256 b5c28d6dbc7ba970d9c8593dd6a0a881e5f50333ef04d7ed38cbb36f02fce866
+DIST google-talkplugin_2.4.5.0-1_i386.deb 7054316 RMD160 bf15a23a3b8b37bb0fe8eb99416727d58881686b SHA1 4186dbc074c1d798a1925d42b08af857ef391699 SHA256 e8c7c3098b544e37779370cd402f42aeba72c10bd5acadf31e18ece102823e1f
 EBUILD google-talkplugin-1.8.0.0.ebuild 3403 RMD160 ce25948087a2f734a8008df2a4638ab980317c9d SHA1 be60e2083e33a572c98e1f8fa35e4c3deb9f898f SHA256 5014209cc7c768a6839b3057a5da5fcdf795c8e0d1a293bb5dd7bf78902405c5
 EBUILD google-talkplugin-2.1.7.0.ebuild 3202 RMD160 a78183a9c39a4aac941610b1d8a6ec9dc446f347 SHA1 18b54c7bb06c0ffefef6c828dbfc5d9f7e929aea SHA256 2650134aeefec1093b0eb71e4c5bab650d30b871f36e21c5e0d1047e26c3daf7
 EBUILD google-talkplugin-2.2.2.0.ebuild 3189 RMD160 55d9710561aea816722c3df87b7e125fecc83cc2 SHA1 616d4d8b77921f359b2d9285248edc5cee2dffd2 SHA256 2faa248234cec3b41e17f9321fba84b172aaedbd2a08f445295f57b1eef923dd
-EBUILD google-talkplugin-2.3.2.0.ebuild 3056 RMD160 7faded2427079e00bf1af3ce21c5ad1bf1459071 SHA1 4e087595e39f22f347ce10d17c7c6d5003823f85 SHA256 28f29fb2afd9749aa813c6cfabb2c14a9366b78009a4dc045180b72352ff42fc
-MISC ChangeLog 2460 RMD160 35d7aab96ec69841f263345e9bb492916c776370 SHA1 9824db98c964451081810f6a3ee135cd8e57f028 SHA256 38c97d3569566a94ebc79bc81f106dd36c3e668e358bc624f14d25fabfa38608
+EBUILD google-talkplugin-2.3.2.0.ebuild 3249 RMD160 4c53d6004880d33d373b1064c6c4e67301b36406 SHA1 60e2d54648e5300b09848c9ef2aaf9efb0f9a66b SHA256 b0f618154f4f507afc1f728b6c1297154c5e69dcf174049c7e377d93c233c81b
+EBUILD google-talkplugin-2.4.5.0.ebuild 3009 RMD160 5ac2d139b1ed61adfe0650f812e275854f22f98c SHA1 3f83d18284e245431636cea82195b4bdefca67cf SHA256 f9cea5a10f394fab361238d9acf369fec3fe93bce8491ee5bd8745f39b1e52a4
+MISC ChangeLog 2643 RMD160 6683fd2254590c36c6162703454b0e4765f1881d SHA1 47a656b927976b583320d97a65d04dc02a369561 SHA256 d50a7a49b272ec6ee3da687411508b4df7c580babe5b20d1d045b4cb490cd4f2
 MISC metadata.xml 354 RMD160 996efb09eaf3af50035bac0fcf12768640f0c0c9 SHA1 ff3d2e6ce2eae43016888c2cd548b2a6962ddab1 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOcOQwAAoJEOeBhlrCAAWGnJsH/irwMM/dB55+owYC80lrapXz
-eW+X8YCeQoSFr7oqbcvCfOWZL5KBKIJ5YHVwu8QT0wVizEPypOuQiN/evo15ubQ9
-2hS7QXMRQf/i/kaeSYP436UjwJJbABW/xopY0cDx6yM3Ta4YIO3vgCInL6yQS+y5
-D4h0kYU1EbXbeAeJtM7n5LQBEMKMpc6LdVqesJ9svDijvcDVwzz3jAcwwvQZkJIV
-jfoUNxSo0cfx1IK9vQxJxytqO2ueDAPWinpBcPPp+zf5fsuaIdDFpZ0jB94/wW9q
-FNpAXOb6+IAQ2d30wddwTqCKN7GrZM9nla8u/r/j83phYxkQ/XoYdYEnO7FspIw=
-=B8xJ
+iQEcBAEBAgAGBQJOwyMCAAoJEOeBhlrCAAWGUTwH/ilPehL6LFziZeVhxOEEINlH
+vQzU5IKVYcm7Mf7s6+1mVN9WabM4iH47vKAgOEhYkLMreUwXyPFRKDa9t9XaBXqh
+z+Et6K8rvhui9C/cCQsdRfdCP1NkSSB3EtyZ8Z7hLCNvbylt5BSvRlvPoyoWmQQ+
+ZC0u7YspS4DxwTQj5mdNZ1RjpzQyT9vPivCW+KmlihbRYuGl+ePxJ3adoS17kjjn
+ofv0b95P8ndmcWAuBLbqi7r0JHHHNrqmxcmNhYMh28jcWH2LCJqbRH278GRP/4od
+8vBHzAskz2e6DsXwMRLGP2iqjpzPUEqMLO/twpRmHfss6n6KemX6lfBO7HgjiQM=
+=/5TK
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-2.3.2.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.3.2.0.ebuild
index 5340d08cd985..eb008d252e10 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-2.3.2.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.3.2.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.3.2.0.ebuild,v 1.1 2011/09/14 17:28:09 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.3.2.0.ebuild,v 1.2 2011/11/16 02:42:04 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)
@@ -79,9 +79,12 @@ 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.4.5.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.4.5.0.ebuild
new file mode 100644
index 000000000000..b18b42cdc579
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.4.5.0.ebuild
@@ -0,0 +1,114 @@
+# 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.4.5.0.ebuild,v 1.1 2011/11/16 02:42:04 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"
+	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"
+
+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() {
+	if [ "${PV}" != "9999" ]; then
+		unpack ${A}
+	else
+		local pkg="${MY_PKG}"
+		use amd64 && pkg="${pkg/i386/amd64}"
+		einfo "Fetching ${pkg}"
+		wget "${MY_URL}/${pkg}" || die
+		unpack ./"${pkg}"
+	fi
+	unpack ./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
+}