Version bump, drop old

Package-Manager: portage-2.1.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 29 insertions, 193 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/Manifest b/net-im/empathy/Manifest
index 365490d528c4..eecbb28414d4 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,26 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX empathy-2.32.2-libnotify-0.7.patch 1644 SHA256 8f7280c95fb67a2f91dc38984523f8ae4be95643e7404ea672d88d6541987ca8 SHA512 9462bc0584041460f9347eeb3e727296dc5f6ec2ea2f65867860029208096c4d795544c02426587d19a2bd4aef562b0b2bf51c3fefe439e69c65c5c6c79669a9 WHIRLPOOL 31e4192b3212d2a8f7625410df55400c36465d643a24631e486b998b6040542672b4f253189aae6a76aeb97ccc11ab3abf68483c667e08e87806ef97bad943b2
 AUX empathy-2.34.0-CVE-2011-3635.patch 2451 SHA256 7b82ba0d9e002ba78975caff45ec08eb7b176feb513ba72c0c312f0a2a8ccd54 SHA512 c15bfa0814e4d588d43b834fc6bf62109d0a121aed8735415f27b743cf8424dec4b27ab118583afc66bb7fe6980209762ebbaf6df11586c40294f936b8178d5a WHIRLPOOL b657bef90495501ab270747a5724dc8be1daa37fbbfc23aaea549e4f57016fb6d6d3d82b92939ebee79f1ed86d0b6dc7a9af0ef9156be0b5dab9b4b7211cb1fc
 AUX empathy-2.34.0-auth-dialog-crash-fix.patch 976 SHA256 cad7bc8885b94cfe777223bd167006f5fd5e57dcff87ba861260d08e961c22f3 SHA512 25b70069d60c6039ef224aeafbdbffa65a32f021231e8e33fe12b9bcaa3865051ead6adaa1f271d4b8121a60842bb51ace87b2c9204d95554e5b9d2529d5a489 WHIRLPOOL 38e879736b54b9455f26f6a7db90f02b6154c3ec483f01788036d63eea8ceb46e6879ed05abafbbebdf72757cebd291745d87756c55d4ce05fb646cd2839f390
 AUX empathy-2.34.0-missing-include.patch 379 SHA256 4e0db8f73a72c5adfd331f53d291f600f83a01832a22121a4b946306f8bc23b6 SHA512 cd1b47accd9535686e5bf0acd8330683efdc8c3acc840d8b9d41cf8d2c1fd81fac42d58168bd0188444d1d0f0be71d52774f66454f707b89d7a9598d9ea289e9 WHIRLPOOL 940a95d4483d69a30bf4824e067bc8715045b8f7b88012513d3813d3ba27777bdce09c0c5cdd741569f16e80fc7aabaffa9c6251fd8b332669ea1114e8386985
 DIST empathy-2.34.0.tar.bz2 3361496 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1 SHA512 df1f8bac59ceeeff5cef2730df1720084bb4c4d7008c5b36dec122ef83a6a4852dea84d7cf9b83cdc939f56d2b5f49bfe612d00f1f9332c48ee48bc5b17a8565 WHIRLPOOL 60e818e222519bc1f30efdc92aa1eb471869e11c11d364287d0ee65de01ccb8895d1dc7e739194eed681cb4a6eb2966529e31959696220e98f5238ce504cd337
-DIST empathy-3.6.3.tar.xz 3448720 SHA256 eaae20e8e9b8660979ed7a9a65deba61d6d795c6f698e684f21c3821f042704d SHA512 888389b76ac84651ffcc31230a2d77069741acccd231bf1f86bce5c4e9e7be42e4794d65b0bb44e8dff519c52aceaea7e37bc71fa4f4b67b6a2df24818be2e26 WHIRLPOOL 9f71224384d76c9a6684ac44548973cb4ae61053ce1ad53ddb39d493f28a81c29a96c2a4b528d3dd7248972ade08a79dd07886ec2a1f645df5b0f8b6d9a09b4d
 DIST empathy-3.6.4.tar.xz 3447912 SHA256 db3f2529111febc9ec4f0d7a772a19786abf93364b9b0207dc7424767138250c SHA512 2d0b821da9ac172a212657f62ae70702a0a56b8b5acdec13b78cb27ed374b12f6c8f5851fb5b26c6e968b67f65c0d34fcea14dd0d174f90e83f38531fdeb9e8f WHIRLPOOL 69ea4aa7ccc6f83c34d9bbb7e7e3c39c10607eff2d75cc98aea4a273183e9718a97eb23c24bab6e35700f93fac04344951428a07d75b97231ffd8c4fbe8adf8b
-DIST empathy-3.8.0.tar.xz 4712020 SHA256 3b2fe5fd41ceadeeda08735ecbccfc344b5d6c7009e40e289d175bc7cac69069 SHA512 f6de67705878a225103726051b90691a5e53e5aa5e684d5f5c69ce528b57b315669f716c63a054223297b764f122b6a38fb6b2cdad788a748ef6d72853b0e9ee WHIRLPOOL 2eac64f5517f0866c581a92278c31a92f9fe7788f3adcb31638a3e2456696e4c65d3bb8e949fe1053a66177465c6344e0657a00a92b32563e443b66276021f25
 DIST empathy-3.8.1.tar.xz 4714784 SHA256 45accc06e9c1711741b0f1476971c7e705b57ea0718a2b10ee66c5dd0397b917 SHA512 37a11796e1714bf969c562f03d5c3470bfef5d90e4f4be0d53457077a943042b4b1b7aaac8981695227ab5db374639acbe3ce37751e1ad96c3c7d6ea67f8fd4d WHIRLPOOL 7b08e9f6c0707b797615a67f790e047d83429a5c0ed1374031dd264ab31ee21df4bdd7e4bf0ed8f985d2e1cd411307ea0b7509be645bf5b5dd0b5aa8a5c872bb
+DIST empathy-3.8.2.tar.xz 4715052 SHA256 a3e92d317a1a4e9b49988ea48a144bcd6c0257c6331aae2603a544eedf1dc45c SHA512 d5d5bc4e8e69244a5f758b62d736e6866a28ec2cec486b13f7b8ff6921dd6693987597c4854a3c244c211d2cc9762fef1ca15ad8b14eaa2fb7b4397ee58ac472 WHIRLPOOL 294c54a311ba97dcbb016ee1cbe7dc5fe095e5b82cccbfd6dd6b5471719338ddbffdb5dd510398f2c28f936014c7db3ac2ad8102a27f8b6d663f577165a0aec6
 EBUILD empathy-2.34.0-r2.ebuild 3263 SHA256 4a37586f24b19bede46e2983de0a0647c9b9fc42da6e52a0c193b1af41448805 SHA512 a90faa742b02b8de4125f7bc0998e76d90394aea73f99b0b61e261a13d19efc18405f2a6518e43e60b29c24cb3c5721fed44db279a53c2007695d7e94a1f82c6 WHIRLPOOL 9d96b2f8e51d4bcd8e27230d038d3ed2849d7bc305e943e22d6582b5b17b24e6026621eba7a69b69ffc4fac85d714898811037b747c9f67cc7574fcfbb3d23ef
-EBUILD empathy-3.6.3.ebuild 3336 SHA256 0a3eda02262d5145ee3231d9f120bc00073361addd880bac8bed749a817518f0 SHA512 e905826015ab0d345058cae3f7b1cbbb33f69a9c83ca090d61d289f03d652b67b67bf65b79a1372c04a2e3f50911cffeadc7d09408d438e0c95aca1f222f4259 WHIRLPOOL 36955563d96936a414610c7fe9ab52ea831d69c8e1d6d3e4522237ac60d1ce60545d8eaaef84f0a2d76fe2f0633d708e92aebd6c1560ecb6a9acfade76db6fdc
 EBUILD empathy-3.6.4.ebuild 3254 SHA256 312034ad793dcb589137e4468535c3672e08c440396d5db070eb23a4c89c5790 SHA512 20b779bc97c8bcd55898c5eb26e5cb39e24d38d460860a92c618de9653ec2a7201507c5a157fa51140e5ce1ba2c33f0549fedfc3ae77693b05b385fe449e2266 WHIRLPOOL 35fba7d6161204c49f996e85f0e4aedec172a04dcae5bfeb943f3a542cf2e16ed68bb94a3b9659a11919e7fe0aa278390fa79bff5c4871baf2ef00de468dacb9
-EBUILD empathy-3.8.0.ebuild 3236 SHA256 239fd71d9a193e8b2ca95831fa537d7ad98bf44f2c32b8d29d863acc3b6a446f SHA512 37e88e3fa85a20c4213163fc0e770ba21fb35d75e0ea89b8c3f6281b5e040840eb241e9d4e3dc1125ace2596ffd1576f810355f8a13ae4409106e167df84c40e WHIRLPOOL 3dcb2ccd02f2df448d71660d270973507ef6ab4c28f3ee3f0426176c83a4e4acebf38348963df5424d7852a7f68f4f4ac363528aac6e23ffda8e1f95a5da8678
 EBUILD empathy-3.8.1.ebuild 3255 SHA256 c8871ba946f061ba12fb5f027426f5f61392edc78251faa31eb4d99a7f52a7ad SHA512 e22234dd787f5dc07d83c42e9d9910ceecbb30fc1fcd1415dad7017560c55afa0c41c40941a554398a50770d26e46d93bcf440720b6d1cfd81cb44798422c492 WHIRLPOOL 320685bfc802206c81bddd2d96cfc4de04a4fec83e30864e54b2cbf8843f6479e55f50e39aead1cc20746673d5274b53a39eeaad35c61b1aeed3d47f1395c9d6
-MISC ChangeLog 22348 SHA256 5198f6ff503e727c1b46daa575eced23dc66550f00042773f1e97aa25f905d56 SHA512 73310d5504100a28c26000967b05365522e677835ea9905d08a9df4b39f9467d096cdb5247619fc9c817234387a8f1a5f9aa3c303ba85d88a931813d6614851a WHIRLPOOL c2302e711f547de1e694bc3bf8f98e86b637852ccb1c1a8e6d96803a0417d541fe9489794635b9b96e37b94d0f05bd4d7bc5da1048f79de36218095453f8ebef
+EBUILD empathy-3.8.2.ebuild 3336 SHA256 271aeb168d7f1db8a1e351cb6014f584bd6ba7a583079532b8fd27c6ca4a9fd7 SHA512 9eb592661b4809cf24a1573ad2ca589846cd532885fa65a703a2e492604abf078c6f67908c7522bcb3420817e943ea55a60208654093209362457217ca2230be WHIRLPOOL 9e975e3bb0a10a0d460cc92a3074182012b5b8d26b82d5f48bba1e03528271df6ae1fbc89f1f2adf6ce9ad7b599234dcd960e6c8c4ef1c4717b743efe0b9d61d
+MISC ChangeLog 22566 SHA256 0cc092d703bb4efcfffc3807145549b9252cde2cad13e0fc6f69afde970e8d97 SHA512 5209cb176ef82ad218b9d8ae6ad46fbe6ea4eb1f467afd0e854efaf087357b0e52a09d4434c87c339dc82cb4666f511674a1b3a8184973189facdb361e74b107 WHIRLPOOL c989230d344a3d434b299235309a32c2e59a6f5b0dd287e16118c958cf2d068ec417a5ebf25e9304b6527cbfa2d61563d3acddf7ee59ea0dce840e7454bde132
 MISC metadata.xml 1467 SHA256 b1fbccf18385402e0ac0ac63595f9b7b3a27fb61086e5bf503d11a858099c8ae SHA512 2a20c65b50aeee8f660277ffc57f4a223edb9989814c031e8ac7158a5133421ad393d35858e47e639b97a55c2cd6b589e0645d74e791e19967a7cba86a17521e WHIRLPOOL 50c817df40f507c5380bf4d53ef23f494c70a48032d0584210ade162fecae68d178c86e86b12412209443a0dd878c9670c934d3b2267328c9e9a8a9899781d01
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFtqfMACgkQCaWpQKGI+9TAOwCfQpA5rqMmu29835gV0mnrjAcW
-20sAn1vxKoepgeSkcK9RSrWz5Y6zCM36
-=f75w
+iEYEAREIAAYFAlGabf0ACgkQCaWpQKGI+9TsvACdGVApVtoeK0tkSk1fJzTiQbEN
+xIkAoIilQ5YlVeRNPoLMTidvUzU2Cp3i
+=zVw4
 -----END PGP SIGNATURE-----
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;