Version bump, drop old

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

4 files changed, 23 insertions, 184 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index b8fd9c807bed..ddd257522966 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.127 2013/04/16 19:43:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.128 2013/05/20 18:39:53 pacho Exp $
+
+*empathy-3.8.2 (20 May 2013)
+
+  20 May 2013; Pacho Ramos <pacho@gentoo.org> +empathy-3.8.2.ebuild,
+  -empathy-3.6.3.ebuild, -empathy-3.8.0.ebuild,
+  -files/empathy-2.32.2-libnotify-0.7.patch:
+  Version bump, drop old
 
 *empathy-3.8.1 (16 Apr 2013)
 
diff --git a/net-im/empathy/empathy-3.6.3.ebuild b/net-im/empathy/empathy-3.6.3.ebuild
deleted file mode 100644
index 04e6b82549fc..000000000000
--- a/net-im/empathy/empathy-3.6.3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.3.ebuild,v 1.3 2013/03/31 14:57:15 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5" # build only
-
-inherit gnome2 python virtualx
-
-DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
-SLOT="0"
-IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND="
-	>=dev-libs/glib-2.33.3:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.5.1:3
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.7.3:=[telepathy]
-	dev-libs/libgee:0=
-	>=app-crypt/libsecret-0.5
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/gnutls-2.8.5:=
-	>=net-libs/webkit-gtk-1.3.13: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.0=
-
-	net-libs/farstream:0.2
-	>=net-libs/telepathy-farstream-0.5:=
-	>=net-libs/telepathy-glib-0.19.9
-	>=net-im/telepathy-logger-0.2.13:=
-
-	app-crypt/gcr
-	dev-libs/libxml2:2
-	gnome-base/gsettings-desktop-schemas
-	media-sound/pulseaudio[glib]
-	net-libs/libsoup:2.4
-	x11-libs/libX11
-
-	geocode? ( sci-geosciences/geocode-glib )
-	geoloc? ( >=app-misc/geoclue-0.12 )
-	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] )
-	sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
-	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/udev[gudev] )"
-# >=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}
-	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() {
-	# Build time python tools need python2
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-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 geocode) \
-		$(use_enable geoloc location) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable map) \
-		$(use_enable sendto nautilus-sendto) \
-		$(use_enable spell) \
-		$(use_enable v4l gudev) \
-		$(use_with v4l cheese) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	Xemake 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.8.0.ebuild b/net-im/empathy/empathy-3.8.2.ebuild
index 81fa61ef34a5..7ae6ec33e7c9 100644
--- a/net-im/empathy/empathy-3.8.0.ebuild
+++ b/net-im/empathy/empathy-3.8.2.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/net-im/empathy/empathy-3.8.0.ebuild,v 1.2 2013/03/31 14:57:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.8.2.ebuild,v 1.1 2013/05/20 18:39:53 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,12 +14,17 @@ HOMEPAGE="http://live.gnome.org/Empathy"
 
 LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
 SLOT="0"
+
 # geocode needs an unreleased version
+# sendto: support from building nautilus sendto plugins from it was dropped in 3.7
 #IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
-IUSE="debug +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
+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.33.3:2
@@ -59,22 +64,24 @@ COMMON_DEPEND="
 		>=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] )
-	sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
 	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/udev[gudev] )"
-	#geocode? ( >=sci-geosciences/geocode-glib-0.99.1 )
+		virtual/udev[gudev] )
+"
+#geocode? ( >=sci-geosciences/geocode-glib-0.99.1 )
+
 # >=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 )"
+	gnome? ( gnome-extra/gnome-contacts )
+"
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 	dev-libs/libxml2:2
@@ -103,12 +110,12 @@ src_configure() {
 		$(use_enable geoloc location) \
 		$(use_enable gnome-online-accounts goa) \
 		$(use_enable map) \
-		$(use_enable sendto nautilus-sendto) \
 		$(use_enable spell) \
 		$(use_enable v4l gudev) \
 		$(use_with v4l cheese) \
 		ITSTOOL=$(type -P true) \
-		--disable-geocode
+		--disable-geocode \
+		--disable-nautilus-sendto
 		#$(use_enable geocode)
 }
 
diff --git a/net-im/empathy/files/empathy-2.32.2-libnotify-0.7.patch b/net-im/empathy/files/empathy-2.32.2-libnotify-0.7.patch
deleted file mode 100644
index b430ff269ea3..000000000000
--- a/net-im/empathy/files/empathy-2.32.2-libnotify-0.7.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/empathy-chat-window.c
-+++ src/empathy-chat-window.c
-@@ -35,6 +35,11 @@
- #include <gdk/gdkx.h>
- #include <glib/gi18n.h>
- #include <libnotify/notification.h>
-+#include <libnotify/notify.h>
-+
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- 
- #include <telepathy-glib/telepathy-glib.h>
- 
-@@ -1300,7 +1305,12 @@
- 		   to an existing notification with the same title.
- 		   In this way the previous message will not be lost: the new
- 		   message will appear below it, in the same notification */
--		notification = notify_notification_new (header, escaped, NULL, NULL);
-+		notification = notify_notification_new (header, escaped, NULL
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+		);
-+#else
-+		, NULL);
-+#endif
- 
- 		if (priv->notification == NULL) {
- 			priv->notification = notification;
---- src/empathy-status-icon.c
-+++ src/empathy-status-icon.c
-@@ -32,6 +32,10 @@
- #include <libnotify/notification.h>
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include <telepathy-glib/account-manager.h>
- #include <telepathy-glib/util.h>
- 
-@@ -206,8 +210,12 @@
- 			   to an existing notification with the same title.
- 			   In this way the previous message will not be lost: the new
- 			   message will appear below it, in the same notification */
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+			/* notify_notification_new_with_status_icon was removed */
-+#else
- 			notification = notify_notification_new_with_status_icon
- 				(priv->event->header, message_esc, NULL, priv->icon);
-+#endif
- 
- 			if (priv->notification == NULL) {
- 				priv->notification = notification;