Version bump, drop old, UTF8 is needed for python stuff during building (#489774 by Mike Gilbert, tontisimo and others).

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 23 insertions, 129 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 47b6e312b0a4..6741bfd29781 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.154 2014/08/05 18:34:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.155 2014/09/02 10:16:14 pacho Exp $
+
+*empathy-3.12.5 (02 Sep 2014)
+
+  02 Sep 2014; Pacho Ramos <pacho@gentoo.org> +empathy-3.12.5.ebuild,
+  -empathy-3.10.3.ebuild, -empathy-3.12.3.ebuild:
+  Version bump, drop old, UTF8 is needed for python stuff during building
+  (#489774 by Mike Gilbert, tontisimo and others).
 
   05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> empathy-2.34.0-r2.ebuild,
   empathy-3.10.3.ebuild, empathy-3.12.3.ebuild, empathy-3.12.4.ebuild:
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 9bb76ee12318..5c0da7efff4a 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,13 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX empathy-2.34.0-CVE-2011-3635.patch 2451 SHA256 7b82ba0d9e002ba78975caff45ec08eb7b176feb513ba72c0c312f0a2a8ccd54 SHA512 c15bfa0814e4d588d43b834fc6bf62109d0a121aed8735415f27b743cf8424dec4b27ab118583afc66bb7fe6980209762ebbaf6df11586c40294f936b8178d5a WHIRLPOOL b657bef90495501ab270747a5724dc8be1daa37fbbfc23aaea549e4f57016fb6d6d3d82b92939ebee79f1ed86d0b6dc7a9af0ef9156be0b5dab9b4b7211cb1fc
 AUX empathy-2.34.0-auth-dialog-crash-fix.patch 976 SHA256 cad7bc8885b94cfe777223bd167006f5fd5e57dcff87ba861260d08e961c22f3 SHA512 25b70069d60c6039ef224aeafbdbffa65a32f021231e8e33fe12b9bcaa3865051ead6adaa1f271d4b8121a60842bb51ace87b2c9204d95554e5b9d2529d5a489 WHIRLPOOL 38e879736b54b9455f26f6a7db90f02b6154c3ec483f01788036d63eea8ceb46e6879ed05abafbbebdf72757cebd291745d87756c55d4ce05fb646cd2839f390
 AUX empathy-2.34.0-missing-include.patch 379 SHA256 4e0db8f73a72c5adfd331f53d291f600f83a01832a22121a4b946306f8bc23b6 SHA512 cd1b47accd9535686e5bf0acd8330683efdc8c3acc840d8b9d41cf8d2c1fd81fac42d58168bd0188444d1d0f0be71d52774f66454f707b89d7a9598d9ea289e9 WHIRLPOOL 940a95d4483d69a30bf4824e067bc8715045b8f7b88012513d3813d3ba27777bdce09c0c5cdd741569f16e80fc7aabaffa9c6251fd8b332669ea1114e8386985
 DIST empathy-2.34.0.tar.bz2 3361496 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1 SHA512 df1f8bac59ceeeff5cef2730df1720084bb4c4d7008c5b36dec122ef83a6a4852dea84d7cf9b83cdc939f56d2b5f49bfe612d00f1f9332c48ee48bc5b17a8565 WHIRLPOOL 60e818e222519bc1f30efdc92aa1eb471869e11c11d364287d0ee65de01ccb8895d1dc7e739194eed681cb4a6eb2966529e31959696220e98f5238ce504cd337
-DIST empathy-3.10.3.tar.xz 5297976 SHA256 49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196 SHA512 181e9cb70854f86433700842aea0d7a5d7f3245d4f891563b70f203047ca7636b68cb15a34253f6daf5b460e1dd4c4344d1dce224c114c84831e64e1b7049af2 WHIRLPOOL 3b8604c82a7d9f22dab4df2efb9e57a3126fb0bc625666aec1ceb8a6c2ca4d38b4e9d62800d8eff11fc815f58f0e6d95415de6e8da01c960618771d4985124bb
-DIST empathy-3.12.3.tar.xz 5042416 SHA256 4653d200ad91663b9487634640600e4b1c10eb495a292b638ccd37bf0560267f SHA512 11672d54174a4e6c1a0933fb3cf483931ffeb9d8cc98de2f1073c6149ef69dab47772768fa927630a32ee1199ca4682552e30025171978aae277315eee981676 WHIRLPOOL 8702f862d033611528060e253715cc59de94f8147d9623bad8e0271e6327c927ca1599ce45f6d403cc521f8ac03f7d7a69e3251f7165201abe0b743e624f6b06
 DIST empathy-3.12.4.tar.xz 5043904 SHA256 056a1fc27e9aa1f9df4d4d91353e04ca2e1b0fcc6bf082a9108f9dbb9870c978 SHA512 636fc5873702424e62b6c35ff305bf95c7eeebf2906d4b1c3303215af0fd34bdba7ab2106fb4c4021de4bd578e116f29faae2932b18205ab0afe28fa21b5ab91 WHIRLPOOL 72089e9e037645eab4b465b4ab88e9e99bbc1a6dd89de87736cc696669382e1b3eee71c4a8549a32313a72f9567cf8165d6dd24024d6e6bfcd5b0519dd9b541f
+DIST empathy-3.12.5.tar.xz 5044468 SHA256 06a97a4513f2cc3a56517ac3f478adb85b9a4a64a49d6c60ab4ea97276bc0f66 SHA512 0b91ef17e8ed961c14f4bcbead6e7ae5d343b14aea0f9de8cab6eb0dd9a62aa75471bf9c12f67830ed2d8ff4a2091a5c2b8602c64857f3aecbb484176ed4896a WHIRLPOOL 09c435c7f34e43501a61247a7ca8e43a3b3d448ae67e781a53cc41fef7765fef57881e04f30c2c41b50b83f7ed82c40d142f44ec0d3f997989075b952ef8371a
 EBUILD empathy-2.34.0-r2.ebuild 3288 SHA256 ca713aa0d466baa73c236a72fc1552f624cc23837f52dbd16d0e2ac30ce0efc2 SHA512 4cfb214aaef4703c049081f68d1c51f3ca7a78ab1f4c361546dcdda1da970cce5b5f988b9391b7f2f8a8466ab15ebf09544f1398c480b73b1ac877132d09cc52 WHIRLPOOL 8bb10a847337277ab7c7fbd5fb34dfa7bc5610d1b829384eadbc21eff0440a2cee249a714862a059b4b58b92ba240b98e8e2df20e572d6926f1a4001f007107e
-EBUILD empathy-3.10.3.ebuild 3205 SHA256 3ebf3df7a97f979b10167d3015ad6b55635bab8ee37669e71537fd2963b5dd1c SHA512 8b972763a9e3b44de974cd97484c3dea89144c2bf7f6313399b5acdcb3751f020f8bc0f0c57e19d9cb29c4727468b58f3dffdebd692bd4c5625bd1fc40a4bab7 WHIRLPOOL 4e559928630c886cfeac7f360629be50ffd5e6eeacf1c9457298f2737929ec281df62970a05431d6bc1737bb18f24953c304b3c1a2228a74c3905c320fdbce63
-EBUILD empathy-3.12.3.ebuild 3121 SHA256 bc0b13f74a66950617d5c9630c202799acde0617444b77bca970ca00696ef491 SHA512 20ab83943b51903b985b6f99ec70ff1e7386388fa3adc00d77cda66dc372dca4e056ea93f661a350d63eb614e8f9f8a01167dc812fdb354b9f0286efd675f6dd WHIRLPOOL d011584b5b86fcf7e02a4272cdd7a321b89eb9167968f858ba06146bf15474e5ba74549949ffbaccf58601c683571e2a82c7b07d7e8812241e16c9d023359354
 EBUILD empathy-3.12.4.ebuild 3119 SHA256 8a6e2be172b2fe93f9f69db0c4cb4e1f78e8800778d63648142cc5c7a8e5e4df SHA512 4ae37ab1a97f1e25fa6a78b191abab848673657cbd8521af7b47e9ef4553ef3cf659693cdc4070d77134576330e5357e627eed206566c218a546f44667878321 WHIRLPOOL 28f2f140667c2a3055183319302e1b6cd9fad3cb18bf1d1875b00eec1192d4201cab38a168d931f74d9f4067d76d338474095a7ff454bf19521df28ed9dc48b9
-MISC ChangeLog 26241 SHA256 3822eb5f60061a729a5160665907ff8ad9bae427ac214e35a5d5545b50dad9a2 SHA512 e5076b4e708a6ee60c2f96232ff26a44bed212551c76d4a2b00eff8c82ed24862400f37afad2a38ebc9fa29a371b81b103e2dacef8c12bb373b24f3752a5576a WHIRLPOOL 3b1222ef7f8378346602918341615879b70884f44feaee8ca2687e6927eff7a53466113ca5a64f2e9fe43f753179b6f36a58d6bc4e7a19e2c17de94be02f6b6f
+EBUILD empathy-3.12.5.ebuild 3171 SHA256 48e6768a1725ebcbfd87d9a72d88c7cb4fdd6039cf56fdcae58bf968f4e10a63 SHA512 c2d68e2bc354a01f3ee45749d27ca971add5d202fab0e33ee4cd0c0cdb95e08fa041a22e92653d0c125ccca102459420e01ea3f90ecf69c9dec4f4debcd41864 WHIRLPOOL d8242a21eaa9702f921d9b45b80917ba9210b2fbe2467a43158d9bffcc13d53ef51043fe96f2e05467cbad4493ad92def8baa5f711ee3f956569cf4eef2b33af
+MISC ChangeLog 26518 SHA256 688f3e03026ff71f24000df79bcb2021f7854bac033d9aebccf7effd6133ffe0 SHA512 a26a3092511ffee3079149997cc744c208e7a2e083bd9b0f0b8a2034942c27161e0acb622c64d21331d6788d244cd302c09ae65bd9ae85c7c68e22cb12a66882 WHIRLPOOL ac8fdf6df15bc8f7352a788f76369485443a2191744e513891848f14e9d6a34db429761a2f83259ccb1627ac292b5de3ac90bbe40ba0b72ff0a0265b45790f42
 MISC metadata.xml 1146 SHA256 32b6d426d2c7531319e725c936ce0729fd024c5a27266eea874f6941bf08a23e SHA512 c8f04dca441ad2235698cc8f90f2a89e26f304ebb0b68fdb53074cf139283e8fd21d47121fabb5ae81714d02ff7fd934df38801195fd064075bfa0b86c02edf1 WHIRLPOOL 35d07ffe68c22d6c869f29c36f0b9e7bf325af5573e854b8cc2e52ed7a0f44de93879a826bc97108a60289a809958cdc58ab0efc2e0a29e43b9991e93afab1c1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlQFmO8ACgkQCaWpQKGI+9R1kACfbMOW+qlYDrctcU1Mt/bVIFZz
+jLoAn0RIjb2p7O6Yf46/tC7Dj1yxYbZR
+=/MVk
+-----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-3.10.3.ebuild b/net-im/empathy/empathy-3.10.3.ebuild
deleted file mode 100644
index 4b8bc86237d6..000000000000
--- a/net-im/empathy/empathy-3.10.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.10.3.ebuild,v 1.4 2014/07/24 18:32:39 axs Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Empathy"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
-SLOT="0"
-
-# sendto: support from building nautilus sendto plugins from it was dropped in 3.7
-IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.6:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.4:3
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.9.5:=[telepathy]
-	dev-libs/libgee:0.8=
-	>=app-crypt/libsecret-0.5
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/gnutls-2.8.5:=
-	>=net-libs/webkit-gtk-1.9.1:3
-	>=x11-libs/libnotify-0.7:=
-
-	media-libs/gstreamer:1.0
-	>=media-libs/clutter-1.10.0:1.0
-	>=media-libs/clutter-gtk-1.1.2:1.0
-	media-libs/clutter-gst:2.0
-	>=media-libs/cogl-1.14:1.0=
-
-	net-libs/farstream:0.2
-	>=net-libs/telepathy-farstream-0.6.0:=
-	>=net-libs/telepathy-glib-0.19.9
-	>=net-im/telepathy-logger-0.8.0:=
-
-	app-crypt/gcr
-	dev-libs/libxml2:2
-	gnome-base/gsettings-desktop-schemas
-	media-sound/pulseaudio[glib]
-	net-libs/libsoup:2.4
-	x11-libs/libX11
-
-	geoloc? (
-		>=app-misc/geoclue-1.99.3:2.0
-		>=sci-geosciences/geocode-glib-3.10 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
-	map? (
-		>=media-libs/clutter-1.7.14:1.0
-		>=media-libs/clutter-gtk-0.90.3:1.0
-		>=media-libs/libchamplain-0.12.1:0.12[gtk] )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	v4l? (
-		media-plugins/gst-plugins-v4l2:1.0
-		>=media-video/cheese-3.4:=
-		virtual/libgudev:= )
-"
-
-# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-base:1.0
-	net-im/telepathy-connection-managers
-	!<net-voip/telepathy-rakia-0.7
-	x11-themes/gnome-icon-theme-symbolic
-	gnome? ( gnome-extra/gnome-contacts )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.0
-	virtual/pkgconfig
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.14"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-	gnome2_src_configure \
-		--disable-Werror \
-		--disable-coding-style-checks \
-		--disable-static \
-		--disable-nautilus-sendto
-		--disable-ubuntu-online-accounts \
-		--enable-gst-1.0 \
-		$(use_enable debug) \
-		$(use_enable geoloc geocode) \
-		$(use_enable geoloc location) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable map) \
-		$(use_enable spell) \
-		$(use_enable v4l gudev) \
-		$(use_with v4l cheese) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/net-im/empathy/empathy-3.12.3.ebuild b/net-im/empathy/empathy-3.12.5.ebuild
index 03f05acfc67e..3cf309c82f19 100644
--- a/net-im/empathy/empathy-3.12.3.ebuild
+++ b/net-im/empathy/empathy-3.12.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.12.3.ebuild,v 1.3 2014/07/24 18:32:39 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.12.5.ebuild,v 1.1 2014/09/02 10:16:14 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -94,6 +94,7 @@ PDEPEND=">=net-im/telepathy-mission-control-5.14"
 
 pkg_setup() {
 	python-any-r1_pkg_setup
+	export PYTHONIOENCODING=UTF-8 # See bug 489774
 }
 
 src_configure() {