[gentoo-commits] repo/gentoo:master commit in: net-im/empathy/, net-im/empathy/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/empathy/, net-im/empathy/files/

[Mart Raudsepp]

commit:     42b7f261bd6a358bd1bc11c18fb2dd88a499c8e9
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 19:29:30 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 19:31:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b7f261

net-im/empathy: remove old

Closes: https://bugs.gentoo.org/629130
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-im/empathy/Manifest                            |   1 -
 net-im/empathy/empathy-3.12.12.ebuild              | 125 ---------------------
 ...y-3.12.7-Fix-parallel-build-in-extensions.patch |  65 -----------
 3 files changed, 191 deletions(-)

diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 5edd3a786c1..c79a8ccd4fd 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,2 +1 @@
-DIST empathy-3.12.12.tar.xz 5203996 BLAKE2B b99ee1b65024c26a0de85cd02972a7329fa51efb9400d9bd1c2bf66133777326d7c6b53e4755ec8b15d6614c47189d55999aa471ca9f17e2e58ea2e88ecb4018 SHA512 d16b6c35c58d0cf6306acfd43efff633204cee2a5eb65dc84c3d6fabe48529b9df69e51e85db5068f90b06bec643ce772bae84188dec31950f37553b13e3283f
 DIST empathy-3.12.14.tar.xz 5017776 BLAKE2B 15f4c71a4f40988afd51d0665ee24164fb7e1d14994e577c23fa29a995503e78f8b784d26edd90503f9825c64dc814f07860aa6792eec6948c566dc3ff669dad SHA512 f467277278a9e8d330e4ab656b3edb2acac6efec211baa146a5ea0a6d0da299e68cdb83ceb1a27a1aa4744c2ce1a441fa287001003c523036ada517029a40123

diff --git a/net-im/empathy/empathy-3.12.12.ebuild b/net-im/empathy/empathy-3.12.12.ebuild
deleted file mode 100644
index 7f1c071016f..00000000000
--- a/net-im/empathy/empathy-3.12.12.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit gnome2 autotools 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 +geolocation 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[dbus]
-	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[gtk]
-	dev-libs/libxml2:2
-	gnome-base/gsettings-desktop-schemas
-	media-sound/pulseaudio[glib]
-	net-libs/libsoup:2.4
-	x11-libs/libX11
-
-	geolocation? (
-		>=app-misc/geoclue-2.1: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/adwaita-icon-theme
-	gnome? ( gnome-extra/gnome-contacts )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.0
-	dev-util/itstool
-	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_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=685837
-	epatch "${FILESDIR}/${PN}-3.12.7-Fix-parallel-build-in-extensions.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-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 geolocation geocode) \
-		$(use_enable geolocation location) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable map) \
-		$(use_enable spell) \
-		$(use_enable v4l gudev) \
-		$(use_with v4l cheese)
-}
-
-src_test() {
-	dbus-launch virtx emake check #504516
-}

diff --git a/net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch b/net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch
deleted file mode 100644
index 28eef07fbb3..00000000000
--- a/net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7af14d9ca148e4d1ec2eb70d7b655bb2fc5a052f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Sun, 30 Nov 2014 22:10:59 +0100
-Subject: [PATCH] Fix parallel build in extensions/
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GNU Make manual says:
-
-    A rule with multiple targets is equivalent to writing many rules,
-    each with one target, and all identical aside from that.
-
-In other words, make may very well call glib-gtypes-generator.py twice
-(once for each generated header). And hell breaks loose because the
-python code assumes it will run once (it should be using the tempfile
-module, but that's another bug). On a fast multi-core machine, make -j4
-will easily reproduce this bug.
-
-The solution is hidden in the same manual [1] :
-
-    %.tab.c %.tab.h: %.y
-            bison -d $<
-
-    This tells make that the recipe ‘bison -d x.y’ will make both
-    x.tab.c and x.tab.h.
-
-So by using '%' to replace the 'y' in the targets, I'm telling make that
-running the recipe once will generate both files.
-
-[1] http://www.gnu.org/software/make/manual/make.html#Pattern-Examples
-
-https://bugs.gentoo.org/show_bug.cgi?id=515894
-https://bugzilla.gnome.org/show_bug.cgi?id=685837
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
----
- extensions/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/extensions/Makefile.am b/extensions/Makefile.am
-index 79622d4..9082496 100644
---- a/extensions/Makefile.am
-+++ b/extensions/Makefile.am
-@@ -66,7 +66,7 @@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
- 		$(tools_dir)/doc-generator.xsl \
- 		$< > $@
- 
--_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
-+_gen/gt%pes.h _gen/gt%pes-body.h: _gen/all.xml \
- 	$(top_srcdir)/tools/glib-gtypes-generator.py
- 	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
- 		$< _gen/gtypes Emp
-@@ -82,7 +82,7 @@ _gen/enums.h: _gen/all.xml \
- 		Emp \
- 		$< _gen/enums
- 
--_gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \
-+_gen/int%rfaces-body.h _gen/int%rfaces.h: _gen/all.xml \
- 	$(tools_dir)/glib-interfaces-gen.py
- 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
- 		Emp _gen/interfaces-body.h _gen/interfaces.h $<
--- 
-2.3.6
-