Version bump. Update parallel fix patch to cover missing case.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 157 insertions, 23 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 158098446ad2..f5b3620497a5 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.164 2015/04/08 18:03:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.165 2015/05/01 23:15:40 eva Exp $
+
+*empathy-3.12.9 (01 May 2015)
+
+  01 May 2015; Gilles Dartiguelongue <eva@gentoo.org> +empathy-3.12.9.ebuild,
+  files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch:
+  Version bump. Update parallel fix patch to cover missing case.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> empathy-3.12.7.ebuild:
   Drop old Python implementations
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index f514f283f8f7..e3f7cd6a0b82 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,27 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX empathy-3.12.7-Fix-parallel-build-in-extensions.patch 1874 SHA256 14e5e5298200969fbf34a571ce570943f5f4c2128fb8218646930528ff28bc19 SHA512 c679c1f6cb9c5c6ea3fd147e57b5f791b992a947d39169ad139135029a334b0efef3e5f4feceeb3628450555930c8f72fbfbb7071b20df706c2fb0205178b1ca WHIRLPOOL 8f10508326926ab85872a42758ec6d97de9f8a829e3eba6ab0fdb5fb229de33bb9c13ec8299b959123cb015fdd9454544512d8f0c4681a470ca9b3a05d01482e
+AUX empathy-3.12.7-Fix-parallel-build-in-extensions.patch 2274 SHA256 e708cde80e931361858b60fe093db9641646f92f5c560f0f2a9e0590af3ae3fa SHA512 cd8390e8b1750fec8553aaab278a67fc802c53d4a91f5e9fdeff6d5ad52c1ff00beae6909762ec65bbedaa070d1e9ffc9482294542d78e77139b8e1fc4cae21a WHIRLPOOL b5447bf0cb8733b195c75e0497cfbf59f19d6bba3c15021e6b5ded000ddb449217c50e80fd698d8378554704846959a605dbe5320909fcb0349c06e7e3d7686c
 DIST empathy-3.12.7.tar.xz 5047116 SHA256 abcc6e325474d158ba21dfc864183617cf832c3570ccefe9e32f275b94452794 SHA512 4c0c6ba19fbf200c6171ccf1935ffb862d1a22ccfd705dff7bac7230ff22330d5244e8330e9a84f8aadaae726384f37b8ebc594d015cab07fdb3bc6386acbc47 WHIRLPOOL 833962c303c1518a6aa2d5327877ea5a9e99be7d26814c4692c78b978c090802765ab27a697b689757f17dd7a2fa062270fdc44f2488ce4919bdd87db2427a01
+DIST empathy-3.12.9.tar.xz 5060040 SHA256 743d3f1826afb6f1f6751983a780443da315635e1f05345370564c8cd541c422 SHA512 5aa01a6be70a708d8d7f6d7950d5f71110386a3e5633e169f6ac29ee036d73bcb3237ce80e424915decec5cfd79235cf76c067dc9f810f34dd2443cf733d9c6c WHIRLPOOL 3089843d8e8049d79b414dca43c350d568125e01ec0d468564e6d4735fbd4e50d7d59bdf7c3be51b18a0f4b356a6cd2ae7a4c7f956e297a88b26478c994f5cf3
 EBUILD empathy-3.12.7.ebuild 3303 SHA256 0b478d57f75100f8c49ba8f5f9f8fb6b9038b4a438c656c869e9861c61df86a9 SHA512 3fc6eb2c1790c62880d9a8fabc71fa77ea0cd907ed0471718565ae0d8f8b6dcf119f03cb75b4f916abe200b9287aaf2f80f4d464e423c41fc0b77fe0eb609f8d WHIRLPOOL 6403c9adf7006c39d5189d181cef596dc5e0241636e6f160f8b524fc83faa4f1d776b7dd23daf45b1d560e06798f07960b0c49189bbc8f21b2fb6fd105a2b136
-MISC ChangeLog 27801 SHA256 7b22ba406ab40681d689fe257bb78b73e008f34dc6899a99c864fc33249d5683 SHA512 0ba06ec524c4129c52ffb3190a420b5ec07baa38c18ab7ab57fb507d922b0d4913758ca2a93c242db00cf6c2f048e93f352b0a3c09302b17321473a1a1b5e40d WHIRLPOOL c38183f0abd534de09098a8f8814856b3184652a9752d1eae615d5876693be308004166f5f561f856bd10a30647bfde371d1ec13467b85ec25fe10f3952b45dc
+EBUILD empathy-3.12.9.ebuild 3299 SHA256 d1f97819b2d7f8db4e0dfe1062111bd7e68e5dda9990a71a7ed8f293f1c63abd SHA512 da6037b32c5e3b053a35fe5a46e322581ed80500b991f5199e3dd8ccd6f60e4e7c6392e4eb29659014429636a20b4804940587ce36ace2545da78043aae609cb WHIRLPOOL ad70e02478e0858d78aed9b8545cf03d26eed1fb44c5c6e94cb1eb6e64058f50ca5831deb994740b581291fa95a3d4e057588ec295968f306e882269d8df5001
+MISC ChangeLog 28036 SHA256 b25f29bdaf6b697e5c23e56dad89d70975ba678e88fb124413133a6e1bbd7a48 SHA512 893d4a6c572ebb01e94e9a4895c3f6faf49d4c4521f230992aea591ae8273e87b3d7fc7bc4665b4f3a5bc98bbae9a0ce098870df02d47d94581a83fe28da78db WHIRLPOOL 7d8f823a84472fe9a1373ec9bad14cc21844b546ac4919704e9ccbb095e90c277ec5ad1d29abace24d1131c52b695d00551f04032d774f5723d511516cea8727
 MISC metadata.xml 947 SHA256 9095b805f74999946c2c54f603d718e6737194f2d8ab38285b2c4b17bbd414f9 SHA512 38f3380e17f8a0d733c7770b65621edf701cbf7e2afa08f209353172020b6297e635358e920567744ec32d0c4b0ea9677dba87636092c0a36a64cec2b5c513c1 WHIRLPOOL b56a1478ab9506927b30aeca81b663dbc73420bfcadd1a9cd37d1290cc77c8be735603250ef709d7302a0b1f44d49d2f8200eb7cff95720580f038efa7f9788b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJW1xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVxcQANigaMSlIDDC23uG0xnR7Pin
-87EMmxyLz2kozDwpJ2VSJJfA8X/wRqY6Pt5hYrgod3NKU5E6w8xmmJyZLjdYqBNs
-fL8yyM5/WTXgMMUR17gcK4C6IrrYdoapE3ufwUZmpLvvULyAiMW1yuSdBc71qQf8
-hfXj8c4yaZx61xUTGMxwKEKW8HbOTOWTf+boUR/2UZNSSIAxEMANidWHyNHfkvaH
-zpNVUOSLalXcf0nJfkXpG/qOibTkrrLHWvCoVmF1+IPVctDpsIdYJ0FWcl5vLwna
-yuEgLrJwmvshAuBbMtMVZaCZxoOzOQyY3JzbUH+exff5Pd6oaTfMh3H4q/CUg7GA
-CaBwoP9AJV4hMrJ3lTIVwxMcnszeX8XnmjQOoM6qneEnkYYdyLgjrf/T5jmn+blh
-bbjjdMMCf5xh5mME5btXrpcyYsG+7OTUUnkRtxoOVr0Dt2F9EHSK3cIU5h4z+mEF
-QW/3lEN3ZAiJiqvBW5laVDFwuJLBFlqhTbRONfiKlI/ahq27snYiGg5qfJIqEk0r
-ay00Q9xanFVlkBFDCHO1K7eLFmm0cjzIHo5jAccTIXKgOHtDzpYpkJgpLuxxa92e
-hGLjbkyHuUYaFLWcU9MlIAhxhBjJqIUvhkjsK4xESMjPhqCEACE5WadmdRuSARuP
-gmE1KWYLNRqUnoaXmrAP
-=mRPj
+iEYEAREIAAYFAlVECR0ACgkQ1fmVwcYIWAbPxwCePpAFP+RYyc691PRccYizhaZr
+VMkAoNlV3ImCrOggnO3IN64dWKRGGj5j
+=QP9D
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-3.12.9.ebuild b/net-im/empathy/empathy-3.12.9.ebuild
new file mode 100644
index 000000000000..42c1124b3de2
--- /dev/null
+++ b/net-im/empathy/empathy-3.12.9.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.12.9.ebuild,v 1.1 2015/05/01 23:15:40 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+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 +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-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/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_prepare() {
+	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 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-3.12.7-Fix-parallel-build-in-extensions.patch b/net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch
index 26ef5e866c51..28eef07fbb3c 100644
--- 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
@@ -1,4 +1,4 @@
-From 24e4480421483685dfc493ad38089c286a8c5f4a Mon Sep 17 00:00:00 2001
+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/
@@ -32,12 +32,14 @@ running the recipe once will generate both files.
 
 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 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ extensions/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/extensions/Makefile.am b/extensions/Makefile.am
-index 79622d4..ebe5fac 100644
+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
@@ -49,6 +51,15 @@ index 79622d4..ebe5fac 100644
  	$(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.1.3
+2.3.6