Support pulseaudio[zeroconf] too, drop old

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

4 files changed, 13 insertions, 55 deletions

diff --git a/media-sound/pasystray/ChangeLog b/media-sound/pasystray/ChangeLog
index 1051ff95c946..03af9ee91d87 100644
--- a/media-sound/pasystray/ChangeLog
+++ b/media-sound/pasystray/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/pasystray
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pasystray/ChangeLog,v 1.3 2012/09/06 14:22:17 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pasystray/ChangeLog,v 1.4 2014/10/12 17:28:06 pacho Exp $
+
+  12 Oct 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/pasystray-0.1.2-desktop-file-validate.patch, -pasystray-0.1.2.ebuild,
+  pasystray-0.2.1.ebuild:
+  Support pulseaudio[zeroconf] too, drop old
 
 *pasystray-0.2.1 (06 Sep 2012)
 
@@ -15,4 +20,3 @@
   30 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> +pasystray-0.1.2.ebuild,
   +files/pasystray-0.1.2-desktop-file-validate.patch:
   Initial commit wrt #406965 by Henning Schild
-
diff --git a/media-sound/pasystray/files/pasystray-0.1.2-desktop-file-validate.patch b/media-sound/pasystray/files/pasystray-0.1.2-desktop-file-validate.patch
deleted file mode 100644
index 5a562193e53d..000000000000
--- a/media-sound/pasystray/files/pasystray-0.1.2-desktop-file-validate.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://github.com/christophgysin/pasystray/issues/3
-
---- data/pasystray.desktop
-+++ data/pasystray.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=PulseAudio System Tray
- GenericName=
- Comment=An Applet for PulseAudio
-@@ -8,4 +7,4 @@
- Icon=pasystray
- StartupNotify=true
- Type=Application
--Categories=Application;AudioVideo;Audio;
-+Categories=AudioVideo;Audio;
diff --git a/media-sound/pasystray/pasystray-0.1.2.ebuild b/media-sound/pasystray/pasystray-0.1.2.ebuild
deleted file mode 100644
index c6730c116760..000000000000
--- a/media-sound/pasystray/pasystray-0.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pasystray/pasystray-0.1.2.ebuild,v 1.3 2012/05/05 08:45:03 mgorny Exp $
-
-EAPI=4
-inherit eutils gnome2-utils
-
-DESCRIPTION="PulseAudio notification area (replacement for the padevchooser)"
-HOMEPAGE="http://github.com/christophgysin/pasystray"
-SRC_URI="mirror://github/christophgysin/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-sound/pulseaudio-1.0[glib,avahi]
-	>=net-dns/avahi-0.6
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS README TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop-file-validate.patch
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/pasystray/pasystray-0.2.1.ebuild b/media-sound/pasystray/pasystray-0.2.1.ebuild
index 1d7c33e99e0c..5c4bd268c72d 100644
--- a/media-sound/pasystray/pasystray-0.2.1.ebuild
+++ b/media-sound/pasystray/pasystray-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pasystray/pasystray-0.2.1.ebuild,v 1.1 2012/09/06 14:22:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pasystray/pasystray-0.2.1.ebuild,v 1.2 2014/10/12 17:28:06 pacho Exp $
 
 EAPI=4
 inherit gnome2-utils
@@ -14,11 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="libnotify"
 
-RDEPEND=">=media-sound/pulseaudio-1.0[glib,avahi]
+RDEPEND="
+	|| ( >=media-sound/pulseaudio-1.0[glib,avahi] >=media-sound/pulseaudio-5.0-r3[glib,zeroconf] )
 	>=net-dns/avahi-0.6
 	x11-libs/gtk+:3
 	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"