version bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 154 insertions, 19 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index 0673bfd082ba..c94aa04dec1f 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.85 2014/12/01 16:25:07 ottxor Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.86 2015/03/01 21:25:49 ottxor Exp $
+
+*google-talkplugin-5.40.2.0 (01 Mar 2015)
+
+  01 Mar 2015; Christoph Junghans <ottxor@gentoo.org>
+  +google-talkplugin-5.40.2.0.ebuild, google-talkplugin-5.38.6.0.ebuild,
+  google-talkplugin-9999.ebuild:
+  version bump
 
 *google-talkplugin-5.38.6.0 (01 Dec 2014)
 
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 37591cde72c0..cb17b49e965e 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -5,19 +5,22 @@ DIST google-talkplugin_5.38.6.0-1_amd64.deb 7301206 SHA256 516c68c9f3bd0786e0d8e
 DIST google-talkplugin_5.38.6.0-1_i386.deb 7175006 SHA256 c1752d2c76a1a93a0cc21783b5721a76b41da3cc92c9ba497f66a5e5175b5d84 SHA512 e06e987dbb48daadf18dd394e18e0203cefa787c17429079d0c448ca5a77517b79b2603078defbb52edaccb46a0dfeb56141d50a659ddb3511e83e3ca002de56 WHIRLPOOL cc85caa837e82e376d77d26735f213429c5abe46f4cded4d83164771df8eb200d03cea18a107ce0358fee17cbd6fc565794b125e0036794f87eb50423b69ae74
 DIST google-talkplugin_5.4.2.0-1_amd64.deb 8012042 SHA256 e5921ac2a1117358663d0603601d95770055de78cb2cc3a362bc50b04fa1bb93 SHA512 b6fa75d9e5d7dadc7d4bf5c732fe5587f3a5e2312a6ad0675f3b44f593b449e612aa0f9c72ab89afce9907363c4bbd48e19917ef3efb63e42c6dfbef71e6530f WHIRLPOOL b5b8cb2d6755da81e4fd487fa0962f96096b81b35a7633359a20a74fedb42b6148428a17f7a636d328109c4460987a344953b86bdfcd5fcf27f0829684aba3cd
 DIST google-talkplugin_5.4.2.0-1_i386.deb 7305310 SHA256 0942302742cc7f4d96a62c606765f3f4304a304987ebb44cc574fbd276fef8d9 SHA512 82cde8262d12ff9c36cbce57e5ebc55ffd30fd16e846af3433bf6cd8340b47b1c9784660468d271a5907beb50fba71917ad685d2212f92642f32dbbe170ae082 WHIRLPOOL dea482abb3b0d9c310ad7047a8951ce3589d5c247c565cb444051a22e5e38a71ffabee00dac2d5b4e76dd107c844339bbd0df6913c38674f6fa999748b4c3a2c
-EBUILD google-talkplugin-5.38.6.0.ebuild 3862 SHA256 1069f6312f4cbd2c43f771a158e78ef856ff2e02adfa015c1d212317335db93a SHA512 8187eea4acde31b714d0ad8457434c7c142bea239a79c6f00beb7bcf78750ea7bbeece1178769212e6c44955a2b5394aeda55d9e20acd58f52bd4c1892520513 WHIRLPOOL 81dfef4bab8c7866ca3e123f48579ce6dd13138c04b01592a79fad90f6592ba6e495f958ca9d6992e988b1472445b2827775f39c9920bc8f0bc868cf41d99bdc
+DIST google-talkplugin_5.40.2.0-1_amd64.deb 7723806 SHA256 598874e41c2993e2a89c7ea1b063aef1b770c0ba6b34fb019dccb412ac7cb8d4 SHA512 a76760e7cad0584fb18aab065d1beae57c6f83681498643e09955f3f14bd0b0b3de8ca57cfe3f68641154a52f5d41840d51128aa1059eb342c56f662bab54e7d WHIRLPOOL ef671d05e36fbe1360ca7bd4f900404d295e69811c791f4b2ca231b2c9548becf4c02291c5e468801f7fde91b3ce5e0dee374b4eca78eb436fbbd80dbce9cc13
+DIST google-talkplugin_5.40.2.0-1_i386.deb 7621704 SHA256 7d0a0a0e7e7f375442b31d70feea96d0fbd573ce505ef6f32b8bb5d640e22486 SHA512 cb593a89de2129b5205f08382d5fe39f47351ed5c821e379bcbb0bdc2d62174e7c609c779ff5103795c8177862a9e8d017f2a7d711f5633f50a5b5fa2d251775 WHIRLPOOL 0e042dd1b9469cb7fce543cba2653602f8307d385dcdabb3405ff5591827eaed815812b994fe5b0c0c8a87a2e77da02b38d86fbb5f45a5b518a77f05d3515f38
+EBUILD google-talkplugin-5.38.6.0.ebuild 3863 SHA256 97df2c013941ae51f7e92de8bd78e8d4fcf770a5c895ad130a1d06af0cfc7e47 SHA512 57be0ba72456aeaac8e37c538718f0dee103e4b3e21c678a419a14de36e44767a9a4cfb19638d76364d981740aa06521a2be2b04bb4de7f32dec330d9e9c9127 WHIRLPOOL cb9180b97f495b3094f293450cc2e321feb8fa048a853962be6636ee019848787026fda5bbd69575ee197897cf214c4b477ee232221a127f65415b1d77f96968
 EBUILD google-talkplugin-5.4.2.0.ebuild 3796 SHA256 3ace520dfdba23a229583a6c344cbec4192f23260c04c5c5628861d8038eb33f SHA512 1c15c7c4fe6061e72ab2b4930edce5514ea21cb66ffc76cd7c3708a32194ea828083cd4e28dbd1a73110b20330d53847a63b5db897c46ad0c4eb370ce6e8294a WHIRLPOOL 986befa1cb5a57d73054472c753f90e7095ec356d69bf467df0fb3d83a282a73b17b793757c1e21890d9ff80726f34fa110369220291a02d13f5de23f3139f40
-EBUILD google-talkplugin-9999.ebuild 3859 SHA256 5028016b01c57ffab7c3c956956e26994c6cc0290d9491a274a0fe12b20e8e09 SHA512 1972cf39aa37fdf9638501db59ab8103885c1a85d7276fde1a10a9f1c0fbd7a8465ebf16df7ce457872e4e43cf463aef921a5637fd7a9593b619ef9753163727 WHIRLPOOL 336c04fff5d820ba548983eea8c1a63350fd0186fa5f0a6761acf30d6566e95aabfba28fcfa7f41feffad71de35520bac6c9b99d7d88b6a5a2912c527305bea1
-MISC ChangeLog 16184 SHA256 3458670e913da145306fba40e77ace5787d3caacbbbfb4ee315aa50ab964c4e1 SHA512 443104cb6de57f721477cd5718a793b73396fe2a825631b7b195a0010a5ecf442f2db301b5654d0278e206f8db6564330091cee96425c07d80a3ce5b534e0a7f WHIRLPOOL be7bf8608ea6a5bd5e15e7532f9f9b812a22b85a4cebf5ea362f4ac033a09f897902a81f1c38828073df278d1696ca6c3505babe62b33bb743ba89bbe7bdd6fc
+EBUILD google-talkplugin-5.40.2.0.ebuild 3833 SHA256 5bd7279aaae301379f48295259b0cb0b0fba3f9f30986a399f04d1ad2fc9aec1 SHA512 f70a0529c79a38f18e4fdfa8f6705e6c3f3d5735ee13a1faf422d5e3a86b85c85c421b889468ecd12315588a88490a8e2ae6d79c761bb440b201f99f5d4c22c9 WHIRLPOOL 2d3d6cca2f9804c7cf325d49f611d7d583a897a5868f79afa1619f486c43aed7b2fa340ded2c49c97057188dd4b2c3317e80b371e459ece5e29498c6fc2c6487
+EBUILD google-talkplugin-9999.ebuild 3830 SHA256 9cc0376e9bfb7ff574af249a68e34c81dd4cccd1e995a37a4bd3e862e95cb440 SHA512 14c478c285db26a49eff8d9daec0fc9ce02bd6a0edc5e016889bd65fb9e68ba7d47c6ea882b2814f9b5daa2b744f184536ab30a29a8f171568b7003ad39e1f8d WHIRLPOOL 2d4bc0ef0a2ca797cd44c464c1f592681e6aa566c0613ce83b11d239469445d886b694487893187736ccb99b2b7dd023eed803995b9b9cb8039afa0a71c9f465
+MISC ChangeLog 16403 SHA256 7d9347f486607f2106ca590bd258ab463edfc3951505b6bd78df94659d9fe2df SHA512 1ddedc1a51caa820912a987176bca2cf963b3d0bb3a59d624645c3ced8368e0610127d4598d1bda152d250db13923a8e4988a76375c5cb130b30dad4329454cc WHIRLPOOL 5cfa102aee7b58fabeeedc730dd0d9ba1ff926b0671348d1f16c09633e3d9af2c215ec124f1aa28eb45bb230f6aebb980f99b3beced6d0b74ab0e4f8a31301f7
 MISC metadata.xml 264 SHA256 5fe3e7a8710fb1278d058d168c5ce6eb6216fe2730783fa21219550124b24390 SHA512 def0d48e1654c9bc7f197bb44d30b098c11b63178fcfff0dcada33b463f960f6da35d7b06b3b701129844987e1d627f93e17f50a24dbe38189239b99036b41ca WHIRLPOOL cb22624e3de4dbaf7f56237e6993972947682fa7416cbc258a61451ea9626243630fc2932143512150fedd804062f40fd3f3329ea561c4b1e52ea27accd7a08d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUfJZpAAoJEOeBhlrCAAWGuokIAKQlVQlQCML3IXWbEEXSLlA2
-wHYvY2Tm8uZ7RRb8FIkQwbTf3wlmQncpExD/AvxAOVRSWslLPTOWW2K0HXiJNgKb
-bLV0WGsRAd2fgZ/a14RkL8WytUJmLYuyPb+PPkIQXtpdWnQ43kQ89jkIgfUfusuQ
-raxaU3yupLWTJxCD9tjSrdh2THXFwze2JKgbqehYtQKLxiGBthyn8gW7A439iQKY
-F3fP3MZhzwTlNSURXUNIKBTm3yzWYoeNbnggYrHfjAC+AJUV/0SavziqAE1ZMenn
-6NQOnxP4K9FwFH1Jrn28IljlFw666TKec+RKZW5S4jui/PFSFeUwWaD3TW7ydrM=
-=zBn/
+iQEcBAEBCAAGBQJU84PfAAoJEOeBhlrCAAWGj3EH/19GuQwPTd9THxyh3KvyMXRC
+BnJEUlMj+qYu4jjJHl82EkwPdLOnKBhByE/c7HDJy24/tPxnXjXrLgY7O6am1dxk
+XbarbfJBFLl/DUU0Y4K2xLS+3AKfGEkq9aBq/V4yfKZcnRHwW+Yrdz8lSe3B6sHm
+IMkTk89FWms1ANOYOpNgacWdxCZ5ftjR6k7Jndaq5Uhz3bbh1AsnYGLUswmh/rUD
+hTSBGtqGuqrVXtL3gvB0p9fTYIkHG3tEF++h74QA4s3F3uJu5uiGqTcGD7aBBxm8
+PyLOZ9ghohlYleIjk9hd1w1sv0wbTHkdD/1ParXJD0sYW8lNvXn6MVTz9t6vebU=
+=PT+6
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-5.38.6.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-5.38.6.0.ebuild
index 9ced0f4d594d..59fc2f2c391d 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-5.38.6.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-5.38.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.38.6.0.ebuild,v 1.1 2014/12/01 16:25:07 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.38.6.0.ebuild,v 1.2 2015/03/01 21:25:49 ottxor Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ SLOT="0"
 #GoogleTalkPlugin binary contains openssl and celt
 LICENSE="Google-TOS openssl BSD"
 
-OBSOLETE="no"
+OBSOLETE="yes"
 [[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
 
 RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
diff --git a/www-plugins/google-talkplugin/google-talkplugin-5.40.2.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-5.40.2.0.ebuild
new file mode 100644
index 000000000000..6acbee96d8a3
--- /dev/null
+++ b/www-plugins/google-talkplugin/google-talkplugin-5.40.2.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-5.40.2.0.ebuild,v 1.1 2015/03/01 21:25:49 ottxor Exp $
+
+EAPI=5
+
+inherit eutils multilib 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} )"
+	KEYWORDS="-* ~amd64 ~x86"
+else
+	inherit cvs #hack to make it part of @live-rebuild
+	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 selinux"
+SLOT="0"
+
+#GoogleTalkPlugin binary contains openssl and celt
+LICENSE="Google-TOS openssl BSD"
+
+OBSOLETE="no"
+[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
+
+RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
+	dev-libs/expat
+	dev-libs/glib:2
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pango
+	sys-apps/lsb-release
+	selinux? ( sec-policy/selinux-googletalk )
+	libnotify? ( x11-libs/libnotify )"
+
+DEPEND=""
+
+INSTALL_BASE="opt/google/talkplugin"
+
+QA_PREBUILT="${INSTALL_BASE}/*"
+
+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() {
+	if [[ ${OBSOLETE} = yes ]]; then
+		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}."
+	else
+		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!)."
+	fi
+}
+
+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() {
+	local plugindir i l
+	local ppapi_plugindirs=( /opt/google/chrome{,-beta,-unstable}/pepper
+		/usr/$(get_libdir)/chromium-browser/pepper )
+
+	unpacker usr/share/doc/google-talkplugin/changelog.Debian.gz
+	dodoc changelog.Debian
+
+	exeinto "/${INSTALL_BASE}"
+	doexe "${INSTALL_BASE}"/GoogleTalkPlugin
+	for i in "${INSTALL_BASE}"/lib*.so; do
+		doexe "${i}"
+		[[ ${i##*/} = libnp* ]] && inst_plugin "/${i}"
+		if [[ ${i##*/} = libpp* ]] ; then
+			for plugindir in "${ppapi_plugindirs[@]}"; do
+				dosym "/${i}" "${plugindir}/${i##*/}"
+			done
+		fi
+	done
+
+	#install screen-sharing stuff - bug #397463
+	insinto "/${INSTALL_BASE}"
+	doins "${INSTALL_BASE}"/windowpicker.glade
+	doins "${INSTALL_BASE}"/remoting24x24.png
+	doins -r "${INSTALL_BASE}"/data
+
+	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
+}
diff --git a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
index 75d88e264f7d..5638bcbf2b77 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.23 2014/11/08 20:22:26 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild,v 1.24 2015/03/01 21:25:49 ottxor Exp $
 
 EAPI=5
 
@@ -36,8 +36,6 @@ OBSOLETE="no"
 RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
 	dev-libs/expat
 	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
 	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf