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

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 10 insertions, 124 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/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() {