Drop old (#508854)

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

7 files changed, 7 insertions, 347 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index a54435f60018..7ec6d21f92df 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.157 2014/10/14 10:14:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.158 2014/11/13 12:28:02 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -empathy-2.34.0-r2.ebuild,
+  -empathy-3.12.6.ebuild, -files/empathy-2.34.0-CVE-2011-3635.patch,
+  -files/empathy-2.34.0-auth-dialog-crash-fix.patch,
+  -files/empathy-2.34.0-missing-include.patch, metadata.xml:
+  Drop old (#508854)
 
 *empathy-3.12.7 (14 Oct 2014)
 
diff --git a/net-im/empathy/empathy-2.34.0-r2.ebuild b/net-im/empathy/empathy-2.34.0-r2.ebuild
deleted file mode 100644
index 7dcd35a719c1..000000000000
--- a/net-im/empathy/empathy-2.34.0-r2.ebuild
+++ /dev/null
@@ -1,118 +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-2.34.0-r2.ebuild,v 1.12 2014/08/05 18:34:07 mrueg Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils gnome2 multilib python
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc ~sparc x86 ~x86-linux"
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="eds nautilus networkmanager spell test webkit"
-
-# FIXME: libnotify & libcanberra hard deps
-# gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-RDEPEND=">=dev-libs/glib-2.27.2:2
-	>=x11-libs/gtk+-2.22:2
-	>=dev-libs/dbus-glib-0.51
-	>=net-libs/telepathy-glib-0.14.1
-	>=media-libs/libcanberra-0.4[gtk]
-	>=x11-libs/libnotify-0.7
-	>=gnome-base/gnome-keyring-2.26
-	<gnome-base/gnome-keyring-3
-	>=net-libs/gnutls-2.8.5
-	>=dev-libs/folks-0.4
-
-	>=dev-libs/libunique-1.1.6:1
-	net-libs/farsight2
-	>=media-libs/gstreamer-0.10.32:0.10
-	>=media-libs/gst-plugins-base-0.10.32:0.10
-	media-libs/gst-plugins-bad:0.10
-	media-plugins/gst-plugins-gconf:0.10
-	>=net-libs/telepathy-farsight-0.0.14
-	dev-libs/libxml2
-	x11-libs/libX11
-	net-im/telepathy-connection-managers
-	>=net-im/telepathy-logger-0.2.0
-
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	webkit? ( >=net-libs/webkit-gtk-1.1.15:2 )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-	dev-libs/libxslt
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
-
-pkg_setup() {
-	# Build time python tools needs python2
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
-	# call support needs unreleased telepathy-farstream
-	# map disabled due to clutter-gtk-0.10 removal, bug #435164
-	G2CONF="${G2CONF}
-		--enable-silent-rules
-		--disable-coding-style-checks
-		--disable-schemas-compile
-		--disable-static
-		--disable-call
-		--disable-location
-		--disable-control-center-embedding
-		--disable-Werror
-		$(use_enable debug)
-		$(use_with eds)
-		--disable-map
-		$(use_enable nautilus nautilus-sendto)
-		$(use_with networkmanager connectivity nm)
-		$(use_enable spell)
-		$(use_enable webkit)"
-
-	epatch "${FILESDIR}"/${P}-auth-dialog-crash-fix.patch
-
-	# Fix script injection vulnerability (CVE-2011-3635), bug #388051
-	epatch "${FILESDIR}"/${P}-CVE-2011-3635.patch
-
-	# Fix compilation error due missing header, bug #388203
-	epatch "${FILESDIR}"/${P}-missing-include.patch
-
-	python_convert_shebangs -r 2 .
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-im/telepathy-connection-managers"
-	elog "to install them."
-}
diff --git a/net-im/empathy/empathy-3.12.6.ebuild b/net-im/empathy/empathy-3.12.6.ebuild
deleted file mode 100644
index 0caed0cd8c45..000000000000
--- a/net-im/empathy/empathy-3.12.6.ebuild
+++ /dev/null
@@ -1,121 +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.12.6.ebuild,v 1.1 2014/09/30 10:29:57 pacho 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/Apps/Empathy"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
-SLOT="0"
-
-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.23.2
-	>=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
-	export PYTHONIOENCODING=UTF-8 # See bug 489774
-}
-
-src_configure() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-	gnome2_src_configure \
-		--disable-Werror \
-		--disable-coding-style-checks \
-		--disable-static \
-		--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() {
-	dbus-launch Xemake check #504516
-}
diff --git a/net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch b/net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch
deleted file mode 100644
index 6040778e73d5..000000000000
--- a/net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 192ce4dacc108f1b62e8ef752eeb5a2bee3d337f Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-Date: Tue, 18 Oct 2011 18:32:52 +0200
-Subject: [PATCH] theme_adium_append_message: escape alias before displaying
- it
-
-Not doing so can lead to nasty HTML injection from hostile users.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=662035
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.32, and for
- good measure, escape alias on /me-type events too]
----
- libempathy-gtk/empathy-theme-adium.c |    9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
-index 8c6301e..08f79b4 100644
---- a/libempathy-gtk/empathy-theme-adium.c
-+++ b/libempathy-gtk/empathy-theme-adium.c
-@@ -436,7 +436,7 @@ theme_adium_append_message (EmpathyChatView *view,
- 	EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
- 	EmpathyContact        *sender;
- 	TpAccount             *account;
--	gchar                 *body_escaped;
-+	gchar                 *body_escaped, *name_escaped;
- 	const gchar           *body;
- 	const gchar           *name;
- 	const gchar           *contact_id;
-@@ -468,17 +468,19 @@ theme_adium_append_message (EmpathyChatView *view,
- 	body = empathy_message_get_body (msg);
- 	body_escaped = theme_adium_parse_body (body);
- 	name = empathy_contact_get_alias (sender);
-+	name_escaped = g_markup_escape_text (name, -1);
- 	contact_id = empathy_contact_get_id (sender);
- 
- 	/* If this is a /me, append an event */
- 	if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
- 		gchar *str;
- 
--		str = g_strdup_printf ("%s %s", name, body_escaped);
-+		str = g_strdup_printf ("%s %s", name_escaped, body_escaped);
- 		theme_adium_append_event_escaped (view, str);
- 
- 		g_free (str);
- 		g_free (body_escaped);
-+		g_free (name_escaped);
- 		return;
- 	}
- 
-@@ -600,7 +602,7 @@ theme_adium_append_message (EmpathyChatView *view,
- 
- 	if (html != NULL) {
- 		theme_adium_append_html (theme, func, html, len, body_escaped,
--					 avatar_filename, name, contact_id,
-+					 avatar_filename, name_escaped, contact_id,
- 					 service_name, message_classes->str,
- 					 timestamp, is_backlog);
- 	} else {
-@@ -616,6 +618,7 @@ theme_adium_append_message (EmpathyChatView *view,
- 	priv->last_is_backlog = is_backlog;
- 
- 	g_free (body_escaped);
-+	g_free (name_escaped);
- 	g_string_free (message_classes, TRUE);
- }
- 
--- 
-1.7.7
-
diff --git a/net-im/empathy/files/empathy-2.34.0-auth-dialog-crash-fix.patch b/net-im/empathy/files/empathy-2.34.0-auth-dialog-crash-fix.patch
deleted file mode 100644
index 3770b36a79d4..000000000000
--- a/net-im/empathy/files/empathy-2.34.0-auth-dialog-crash-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 73d8a18c6def748d78e91f0dda1145771c620b53 Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-Date: Mon, 04 Apr 2011 08:23:53 +0000
-Subject: event_manager_add: don't crash if approval is NULL (#646555)
-
-When adding a "subscription request" event there is no EventManagerApproval
-associated with the event.
----
-diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
-index 5b2174a..041d22a 100644
---- a/src/empathy-event-manager.c
-+++ b/src/empathy-event-manager.c
-@@ -233,7 +233,8 @@ event_manager_add (EmpathyEventManager *manager,
-   event->public.header = g_strdup (header);
-   event->public.message = g_strdup (message);
-   event->public.must_ack = (func != NULL);
--  event->public.handler_instance = approval->handler_instance;
-+  if (approval != NULL)
-+    event->public.handler_instance = approval->handler_instance;
-   event->inhibit = FALSE;
-   event->func = func;
-   event->user_data = user_data;
---
-cgit v0.9
diff --git a/net-im/empathy/files/empathy-2.34.0-missing-include.patch b/net-im/empathy/files/empathy-2.34.0-missing-include.patch
deleted file mode 100644
index e8d3a8d3c8ec..000000000000
--- a/net-im/empathy/files/empathy-2.34.0-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libempathy/empathy-auth-factory.c	2011-10-22 00:53:39.480665258 +0300
-+++ libempathy/empathy-auth-factory.c	2011-10-22 00:55:22.726535188 +0300
-@@ -20,6 +20,7 @@
- 
- #include "empathy-auth-factory.h"
- 
-+#include <telepathy-glib/channel-dispatch-operation.h>
- #include <telepathy-glib/interfaces.h>
- #include <telepathy-glib/simple-handler.h>
- #include <telepathy-glib/util.h>
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 7990e0ee037d..0968098fd22f 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -10,9 +10,6 @@
 			for Google Talk)</flag>
 		<flag name="map">Enable world map support through
 			<pkg>media-libs/libchamplain</pkg></flag>
-		<flag name="nautilus">Enable nautilus-sendto support</flag>
-		<flag name="webkit">Build support for Adium-style HTML-based conversation
-			window themes using <pkg>net-libs/webkit-gtk</pkg></flag>
 	</use>
 	<longdescription>
 		Empathy consists of a rich set of reusable instant messaging widgets,