version bump

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

4 files changed, 159 insertions, 15 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 604686454d2d..86600474864e 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.21 2012/01/07 04:50:06 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.22 2012/01/21 19:01:17 ottxor Exp $
+
+*google-talkplugin-2.6.1.0 (21 Jan 2012)
+
+  21 Jan 2012; Christoph Junghans <ottxor@gentoo.org>
+  google-talkplugin-2.5.6.0-r1.ebuild, +google-talkplugin-2.6.1.0.ebuild:
+  version bump
 
   07 Jan 2012; Christoph Junghans <ottxor@gentoo.org>
   google-talkplugin-9999.ebuild:
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 8a9391276149..e4107ab6b2a9 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -5,19 +5,22 @@ DIST google-talkplugin_2.3.2.0-1_amd64.deb 7728830 RMD160 6e6304f8b9f46655286ee9
 DIST google-talkplugin_2.3.2.0-1_i386.deb 6738522 RMD160 ec95ed1d31e42b3b08539a7fdbd0bc9af12382ef SHA1 fc77263ff5dd62264b82ef77acdc679d7d3977a7 SHA256 0cf9d284fae27642c47e6c9104c31b282a36eab9b3be3c118a04716ae9f6e1b1
 DIST google-talkplugin_2.5.6.0-1_amd64.deb 11341592 RMD160 845691c6aa43d40c6048bc2d2d3c59a154a7b067 SHA1 484151f690ca6eee21cabe8eaeda24a7ab7a1b8b SHA256 bd1ade08d3ca4d89edb875214026c16fd3e66adbf52812095c267378cfd7aada
 DIST google-talkplugin_2.5.6.0-1_i386.deb 10371766 RMD160 2d80e799dcea89760bd0a9a68ad8deca84c60b71 SHA1 c382cfee89b5a33d15ea19762d10dc6bee77a9b9 SHA256 57834794d05dd03062bd5c2fa70cee40185a09ceb7480782a4d4473eaf0d7324
+DIST google-talkplugin_2.6.1.0-1_amd64.deb 12409558 RMD160 c081845e31139924225946ce96ef2c6ab3313283 SHA1 78616ce8ed3451d5129898c6c6b3884a66bbd71a SHA256 a72401b1a28506b03eb018d319e33be7715d51834b562679e555cac588f762cf
+DIST google-talkplugin_2.6.1.0-1_i386.deb 10818770 RMD160 5684cf9b8e083bed50e713fa025098ac84c31565 SHA1 730d05c325d9d36b861e3fbc7167b7388c351aa1 SHA256 e53c685d002a203236b1e0f3f58a9a58ee541f0f1cedbb8347278177284a5892
 EBUILD google-talkplugin-2.3.2.0.ebuild 3249 RMD160 4c53d6004880d33d373b1064c6c4e67301b36406 SHA1 60e2d54648e5300b09848c9ef2aaf9efb0f9a66b SHA256 b0f618154f4f507afc1f728b6c1297154c5e69dcf174049c7e377d93c233c81b
-EBUILD google-talkplugin-2.5.6.0-r1.ebuild 3521 RMD160 cdbf463379a5076590bc906bf1f98ba8e77816c6 SHA1 1317edae0ee25f32a57aad81d6af099124f8e54a SHA256 638d9a88af50b839271ac08593031ed6ec88280103ee7ce0e266d0f338119302
+EBUILD google-talkplugin-2.5.6.0-r1.ebuild 3714 RMD160 1f2cb028a58e06980fd3e17279a19e8ea2d2c11c SHA1 63e8fb42141ec66fcd3c86b701acd84946271cca SHA256 41c20ab1c9b35efd7f66e49027ddea7f5a7a62f3e6af8d87f349b08227fe0862
+EBUILD google-talkplugin-2.6.1.0.ebuild 3518 RMD160 46c475858756cc0f7349ea76a909245a6824f06b SHA1 127f2a0022336dafe5e2460a0ef0327e0d686263 SHA256 6f25ad35016938b7bd8e2d475e449feb8d0960770b4b9023f368c24bb29356ea
 EBUILD google-talkplugin-9999.ebuild 3515 RMD160 f65edcbc459e8712fe3d152e5ce07a6449a6dfe8 SHA1 e0c06ab8d34e15f9eb9ca9b021eeb216187ff25a SHA256 0274bf8ae7e51b75833d7fff5a0396bb7d0b5d8b0790d3f4f5a16a52f1b0e066
-MISC ChangeLog 3574 RMD160 1a9f415f981e1e53cc7d81bd5d1dfc5401e18803 SHA1 625c5b797bd4a0c23d51e43f06ad9ba2d16141aa SHA256 f1b66eb0df0bf07068454bee8e8c30967350f238f8f7af339b4749d85a9850db
+MISC ChangeLog 3760 RMD160 6a7e4fda8908b1a932f6bd1f7b5c921e6c909e88 SHA1 6217462c2209196f094e566ba0963ad98c5d4741 SHA256 7ce5856e7b87aa274d7b93b3f98c1e8bd21675bd6a8c3b92f7f3e777744d909f
 MISC metadata.xml 354 RMD160 996efb09eaf3af50035bac0fcf12768640f0c0c9 SHA1 ff3d2e6ce2eae43016888c2cd548b2a6962ddab1 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPB88EAAoJEOeBhlrCAAWGKY8H/jL6nq8QtGFfXt0jWin/b9bD
-6eQH5R4v3HMZi8IAC9gorYnTwafCiiCjWfhgcLc9vWrKTx3X0AA50nI0uHNmQHt7
-/fjwaKzqIIuLnVIhGm2tuvluKo94iruUNP4GMZ3aan4bPxzB2eYJXZCnfhgCFzZ4
-Txg+YDz7Ob0gjvxiBlyoTecRL8Uu16315akWL/JeIJLhvINamR/s8iNJIEmfh1H7
-BEOfsCc3HQq9LJwJU/+iTShRQX8zVrEw5G3RQg3MAM/SnaVLzvhM00prW77QnaKN
-2yywRj0osBh8gJES49r/+GaxZsxBTq4AP2aNCquJG2HQiw4jXPNuFrxDRSl0O5g=
-=Gaym
+iQEcBAEBAgAGBQJPGwuEAAoJEOeBhlrCAAWG8soIAKDcH7uMdFdwvZ3Pd8qJSNSl
+4J08v3S1aDXrfUqTtF+yJvzD1D0diAUOIKvwMK6uCc2pxm1NBrIciPZdxusIqJpm
+2vFM4ZpMmNHdVz58itSdOEhb8YXcnuLDueBJ0eXBX5uO5LQESzMRu3NjzGoftXZO
+L0f3HWw93UJW85OLrxKWKL8MlY24i09OrryPSmC6QpFz1PNJb1re4ZrsOhkDOGp5
+RouoNtnFwmTZE/9H/p9XdoeXMZSb6pgeH06U43cKivWSIdHIDJC1Xqi76ThJ0FTi
+H5Z56lyX/eEzWB0GiyRLaQN61uTKKecpYLd5h5HHPvemxWBBOdfz+4oyqi9IL9M=
+=n11+
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0-r1.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0-r1.ebuild
index 2f974764fe1d..b4452336d571 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0-r1.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0-r1.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.5.6.0-r1.ebuild,v 1.1 2012/01/04 05:25:42 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.5.6.0-r1.ebuild,v 1.2 2012/01/21 19:01:17 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.6.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.6.1.0.ebuild
new file mode 100644
index 000000000000..debe3be2d18a
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.6.1.0.ebuild
@@ -0,0 +1,132 @@
+# 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 $
+
+EAPI=4
+
+inherit eutils 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}"
+
+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() {
+	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 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
+}