version bump (bug #480246)

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

4 files changed, 20 insertions, 145 deletions

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index ab73606afa68..87703576a9db 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.57 2013/08/03 21:45:57 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.58 2013/08/09 16:53:18 ottxor Exp $
+
+*google-talkplugin-4.4.2.0 (09 Aug 2013)
+
+  09 Aug 2013; Christoph Junghans <ottxor@gentoo.org>
+  +google-talkplugin-4.4.2.0.ebuild, -google-talkplugin-4.1.3.0.ebuild,
+  -google-talkplugin-4.2.1.0.ebuild:
+  version bump (bug #480246)
 
 *google-talkplugin-4.2.1.0 (03 Aug 2013)
 
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 97a71e8b3523..ca895ca61ce2 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -3,24 +3,21 @@ Hash: SHA256
 
 DIST google-talkplugin_3.17.0.0-1_amd64.deb 12723112 SHA256 3dd096374c279dac420359b6b54ab7157632479afa706408e5c3be0ebfe8d6aa SHA512 e51558048ba5e0a8948b9625fb9c1d1814f61df29de08a747dd10d5105abf2ff4b352d74557eb7c224b8cb5c22ffba24b81d127a93d7d2faa5fb08dd82a0801c WHIRLPOOL b0ed26fe0070ac2216c143496b59e7266f87a55ac2551f3d85ec1f84fb5b5cab2367236be7c097776079aef81cd2038d6cd37c8c821c121e162c67145680a162
 DIST google-talkplugin_3.17.0.0-1_i386.deb 11192894 SHA256 cc6720a3a318897987baed97a4e88fc3d7ca7e2d26537bc58b78bc0d4452df8d SHA512 19e2c05443a1eb0522bc06f1d758df392376c584f4eddf8ca0a8ae227832150f6f8a8f0079b28a3ba512256cdd5bfd08cdd721be748d6ab649286d06281b7540 WHIRLPOOL 0c9a6cb1e98d296cd0b6eb39d309abe70243e6a1160694f4ab86e8d0bf5c3ae6ba39c971b420e8251ed10b880b24ff468bd203a5045acf6cdc8ca72ea8f9e1ca
-DIST google-talkplugin_4.1.3.0-1_amd64.deb 12575032 SHA256 bb20b203f41097482a3e4e01e9fdb7ae0e7e4c1bed01527200b317d60dd035f1 SHA512 d2a64c19391cb95964b99aa68bd480f4e1a139495b3bac27b8fcf282ab6f475b7992d87c14d37246830e6aa7a0243710f020f1b9d7be8fe1a330338bc55dd08f WHIRLPOOL 8c152144ffad6e13a2d37ac7c22edcae482d92c47930c86387c08c00a07ec320e810f7dec77ca7d5523c1e75d3e7d47af2b92878d1c10efe782b818605542549
-DIST google-talkplugin_4.1.3.0-1_i386.deb 10967016 SHA256 53bb1d4029248e7a5f4405d630c019ab984f5f135210b6089e7751734f432d8d SHA512 b588216761ec89d9c2926167a14b3340bf5745125c83107d59f64a4ac2b85d2d437d512f02af08e3a9ba7feb915dcddbc6b6a5dd2d31b3377cbbb30604760727 WHIRLPOOL 667218a5ed229bac576657816586defecac516165c948dfbed3f0e235d4e4e03ae01bcf097cc5131553cbb25b8d94b70ffdb27c9ee20b25acfa8e8cfecdff911
-DIST google-talkplugin_4.2.1.0-1_amd64.deb 12582516 SHA256 cdf51813ee31bffc24625370c6ff339a7ac7ced571b45c627ee1ff4fc5bff3bc SHA512 22f50c128e24b578491e48fc89c6a941240ebfcd4ee15716653b5426987413228369f40d54076c1b25f91aef734ae5adc7f2a958ac313e116b3d25ed829fb5fc WHIRLPOOL ed6e6a305e302abc0c5f80724ee489106955deaceb504fd437cc0e11f5995d160b078fd59d408ee2c743483dc0e6f9425cc92826d9f6b39e84c7089675fdfc47
-DIST google-talkplugin_4.2.1.0-1_i386.deb 10973088 SHA256 191597cba8366a8348d8692140c7c5d7a94f7622d4d6eea2b7c94ffae95a1ffc SHA512 d17e9471cefde79b38b5ac885b216a013e43ace40e2e5e5ef58531801e43aa01a5614b5723ecb0cdcd9fe70480aa57674b5c1c66868314eb40bfa2b9968fbbaf WHIRLPOOL fb1ab817e04ca0eb38eb8639eafa588632ce71c686c29234ea4ff07aa7a39082fa676347ee09742560680a5c37a68705130d9118e42ce9f4cae7426a6e1154b9
+DIST google-talkplugin_4.4.2.0-1_amd64.deb 12575448 SHA256 c35fae9b5b13d4db635f489af9df86225ef7da6fe574a04043a4cdf7884e3d26 SHA512 8db94398bd04140c7d485c79de559b27f98bb728625709067223229ace90ee7fcf3d23025b071ed49378471db3d7a527ccb507d6069d632c71313a70acb4f88f WHIRLPOOL f462321ba1dd88c530f0c54c67423e3145ef1d89ebeeb091fee00be567a08bdefb40818e6b34aab41bde955818b1b46c3a37dcf5a93f869d3577f7d98eeb099c
+DIST google-talkplugin_4.4.2.0-1_i386.deb 10972844 SHA256 5da82bb9df5023cf2d48be1248ccaf16f3abe454604a5852d3c94a5fdc151852 SHA512 cb6d725b3f6d5b137583cdbb189ba014bddd2b3664ba1b5eaae1ab1842d5faf89b1dd9f810d101beaea6153ec27361a5acdf91ee5abe73525ec753655a11287e WHIRLPOOL 7bd9a87febf94f3cb9fda0a4e1e7b1b24f41353c437d71fd4f6a136b8460b6092f2383b65cd48774a0d0ffe927bbad970ba58b7c89ec552c07d426bb57735011
 EBUILD google-talkplugin-3.17.0.0.ebuild 3943 SHA256 155f10a5e860c76070f8aa9359c935890188714fb9d0f58ece09ca2bd75d94ed SHA512 e7c2eda2bba92de5eb44de61fe5009b4e069fe05e6187cdf7cbe41be08c88049821fa153f8df82f0ee25c9270957110fddaa1d1fc4c8c62f4200be2d837360d0 WHIRLPOOL 20144bfbd7544ade31732a83e5b265c10fee66bbd52ec225f10f1eb504eb322fcbc926e17b4b5b103dfd9cdb05b187f048066575f3fe0a2fcb8db3b8dba4aca9
-EBUILD google-talkplugin-4.1.3.0.ebuild 3996 SHA256 27ab4dca6238c6c7d743a71e09e1db510d671cea0264d6f61ac4b7f21bc33a7a SHA512 bb45679bf98bb423461275216cd6f7b5e672b826bc2b1792e90d4d711ef24b32435d522f6f28859393c8b3a2ebf79ef286c1bd80bed2e42ee95a6585e18eaaba WHIRLPOOL 5c602895f7d478a4123baf35f769c0a54d27086e413ca1608a520fee07e4bc97b9feafd941803c00f2b757f40f6334a28f645b813a466f3d54372b929e7e5f20
-EBUILD google-talkplugin-4.2.1.0.ebuild 3803 SHA256 384ea0a6e7c0d9aa0c72d137145083bc92db7740ac44b5f5cc4d834458bb32ca SHA512 1da975112315a06f33e8b43d48f97d2a25cfb75ffc613cf697f577a06477c84fa6b34438f758e19911b647ea1711e195218eb9e3ba6cec152b7aa9976a0a5cef WHIRLPOOL 96584a7b443febe168508d93f24b0fd184023bac250fdc3747b1645f8cc556bab4241b4aba9813833f35ab4d346dfac8b4b8edb80f0f84dc262b72d0c58b8011
+EBUILD google-talkplugin-4.4.2.0.ebuild 3803 SHA256 56e6b09a289015da643e198400e5678d98167750f26a1c6c53698d72d16f87d9 SHA512 959038fc0326fa3afce57e5273b0e503fecd5dbdafdef195233689462d39351579520044cd8f5ea3cf1b546b7d6e1770ec9431ade40bb5a057a395f3be26b435 WHIRLPOOL bc052f4bc98420657f706db7aa43ffb70578cb07e4d6abd78d5f80be71b96046beb91e0a0426846707a44073bfbd9f166503bbdfc5376812c7ff7597a7f825bb
 EBUILD google-talkplugin-9999.ebuild 3801 SHA256 5f001cd4cb564007bd44d9c70cea980dc5b08c512f5e31c0aad6a81d9d38958e SHA512 eba90babc7308058c633e7fd92ef6a568c974f05f4891b04a24c5be95a526f5ac8773159c6687f0006892195d73e15a9c1ec7be821adcf87094e8cb824e1b06e WHIRLPOOL 5048919531d442c0e1656ffba7e16e6da4a1d58751c453569cbfdadf30ce2ffa75409eb42b27f2d259c438685302791bc95d9c2fb4c5b6171b7124983f9de0fb
-MISC ChangeLog 11097 SHA256 3594915fce52661e40396f610b1703c59a0ddd2a09d185e272905342e3a32791 SHA512 1dcb3adce84c036118d71b5fd176985635b3dd34287ae8b804179b02724c4e7c74a8bfd3c96602746f8055cacca901c19bde5a86af3ca4d778bfb5ad2ebd12d6 WHIRLPOOL b352067d78399fa44cea4fb04166d269481574374ab22ea2fabf28002b35ec2b48e7c930b7df5b42c632bda5d8df681706781f1079bdaa09f0bbb7d2d1aff999
+MISC ChangeLog 11332 SHA256 edd691b8e407a6d937cb449bcfdc29e5b49f6559769cfffb783baf2b83c146ef SHA512 7595c8e3367daf202892196be50e3e3e41a0f8fcbe4dda9b5ea3eafd1c97a1314c1b1448773efae89c46063415ffe0044bc2ef7c6dad5c02765ddca88bd1646c WHIRLPOOL 1ff0337d679979ea9b32dc79727748c54025fcb2c206ca5fc72492d9a68aabfa3a454a0f45b9269619bff3db87129696ab92b940f74c07f2c37648b0f9a8ce22
 MISC metadata.xml 354 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2 SHA512 cc86eee04c852fb1e40620e481712c5fc2c175fe637fb2ec1c627b88d25bf94f257a717191488981795f49488ddf6fb918b0d1d89ec05f23ba681b293a634066 WHIRLPOOL 503502973ebe813a597a56a6d013af48101902a04782c9fbcc54512b39b2fc3ae0440b63b819090ae145d54f276eca77ebf8ba6f17e9d3e05082969e28a210cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR/XocAAoJEOeBhlrCAAWGta8IAJJ61BszH5M41+XYfDFgCajv
-8vYU5mi8FkZym/aVTSXFgRniduGFz/rZuSklQPfxh2Ppko/lGRlF/TyytmKfee5G
-5rNtEpLOYNVMqxImTEPXtpZ2QLY5Uc+vqK9VBwsRT6H8a1TEYM+rsYcOQZo/AfuH
-XC5dKJwcgpPtqRDa/mApZLoMaBjmF3l3VDeQ8tEYZQEEh0zXyW8AJm4GHO0HuPqq
-BiKdblwmBGS0FswUjl2r6OxrK7xgdHSzldtI94td15nA0YAp9qtwoK9/1w/m0dQ6
-argZRt0WwaVRjRp58/YjNvxP8EaLFbPEDAABnXFAkNv3FvLF0Wedw58P10Mb9Bs=
-=t+TZ
+iQEcBAEBCAAGBQJSBR6FAAoJEOeBhlrCAAWG7xcH/0+VzMqPzgHu1CsFMLBsQMc3
+qIEJlrrjk6cd5qxSqB6IBD9DLaB99fv2MMzK5isEJ3XudA2qdnY2YoX5LiafV46v
+LkbcW5/XDOapU62w7rZdn0whLnYmsIfQiov2ALfrmI/pdsr90iDVoXV6a2XK2gdw
+TLF6Igc6rNc+xaeWwWN/Ut/BH+lvvFE8qOv/LZBut2rZG+hs3lpcPS6Itae0Wnu2
+DFoagnj2LWJoL+L4H/JQrXLq6laA1HSCXBJEECkGp9gYobZQ4ZUDeMtToc4uA/u0
+g7GS3R22rP+oU1Kbqyw03AE8SlBHmnCdd/Sp0eLG2h0ad7yKjAHJQRc+AWMWa+Y=
+=5XqY
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/google-talkplugin/google-talkplugin-4.1.3.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-4.1.3.0.ebuild
deleted file mode 100644
index 62fcd2ece2a1..000000000000
--- a/www-plugins/google-talkplugin/google-talkplugin-4.1.3.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-4.1.3.0.ebuild,v 1.3 2013/08/03 21:45:57 ottxor Exp $
-
-EAPI=5
-
-inherit eutils 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} )"
-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 system-libCg video_cards_fglrx video_cards_radeon"
-SLOT="0"
-
-KEYWORDS="-* ~amd64 ~x86"
-#GoogleTalkPlugin binary contains openssl and celt
-LICENSE="Google-TOS openssl BSD system-libCg? ( NVIDIA-r1 )"
-RESTRICT="fetch strip"
-
-RDEPEND="|| ( 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
-	sys-libs/glibc
-	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
-	x11-libs/pango
-	sys-apps/lsb-release
-	virtual/opengl
-	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() {
-	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() {
-	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() {
-	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}"
-	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
-
-	#install bundled libCg
-	if use video_cards_radeon || use video_cards_fglrx; then
-		#hack from #402401
-		exeinto "/${INSTALL_BASE}"/lib
-		doexe "${INSTALL_BASE}"/lib/libCg*.so
-		if use system-libCg; then
-			ewarn "There seems to be a problem with ati cards and USE='-system-libCG,"
-			ewarn "so we install the bundled version of libCG anyway. (bug #402401)"
-		fi
-		echo "O3D_OVERRIDE_RENDER_MODE=2D" > "${ED}/opt/google/talkplugin/envvars"
-		ewarn "We have set O3D_OVERRIDE_RENDER_MODE=2D in ${EROOT}opt/google/talkplugin/envvars"
-		ewarn "please report your experience, good or bad, with this workaround on bug #402401"
-	elif ! use system-libCg; then
-		exeinto "/${INSTALL_BASE}"/lib
-		doexe "${INSTALL_BASE}"/lib/libCg*.so
-	fi
-}
diff --git a/www-plugins/google-talkplugin/google-talkplugin-4.2.1.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-4.4.2.0.ebuild
index 32462dea894b..d5f115acb25a 100644
--- a/www-plugins/google-talkplugin/google-talkplugin-4.2.1.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-4.4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-4.2.1.0.ebuild,v 1.1 2013/08/03 21:45:57 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-4.4.2.0.ebuild,v 1.1 2013/08/09 16:53:18 ottxor Exp $
 
 EAPI=5