commit for ppc too, tested by xart. remove old.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 4 insertions, 73 deletions

diff --git a/x11-misc/notification-daemon/ChangeLog b/x11-misc/notification-daemon/ChangeLog
index adabfec81a28..94f487a72af5 100644
--- a/x11-misc/notification-daemon/ChangeLog
+++ b/x11-misc/notification-daemon/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for x11-misc/notification-daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.78 2011/04/29 17:36:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.79 2011/04/29 17:39:25 ssuominen Exp $
 
   29 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
   notification-daemon-0.5.0.ebuild:
-  ppc64 stable wrt #361093
+  ppc/ppc64 stable wrt #361093
 
   23 Apr 2011; Raúl Porcel <armin76@gentoo.org>
   notification-daemon-0.5.0.ebuild:
diff --git a/x11-misc/notification-daemon/files/notification-daemon-0.4.0-report-sound-capability.patch b/x11-misc/notification-daemon/files/notification-daemon-0.4.0-report-sound-capability.patch
deleted file mode 100644
index 8e2c1f33f588..000000000000
--- a/x11-misc/notification-daemon/files/notification-daemon-0.4.0-report-sound-capability.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nur notification-daemon-0.4.0/src/daemon/daemon.c notification-daemon-0.4.0_patched/src/daemon/daemon.c
---- notification-daemon-0.4.0/src/daemon/daemon.c	2008-09-26 04:27:07.000000000 +0300
-+++ notification-daemon-0.4.0_patched/src/daemon/daemon.c	2009-05-02 18:50:32.000000000 +0300
-@@ -1370,14 +1370,23 @@
- gboolean
- notify_daemon_get_capabilities(NotifyDaemon *daemon, char ***caps)
- {
-+#ifdef HAVE_GSTREAMER
-+	*caps = g_new0(char *, 7);
-+#else
- 	*caps = g_new0(char *, 6);
-+#endif
- 
- 	(*caps)[0] = g_strdup("actions");
- 	(*caps)[1] = g_strdup("body");
- 	(*caps)[2] = g_strdup("body-hyperlinks");
- 	(*caps)[3] = g_strdup("body-markup");
- 	(*caps)[4] = g_strdup("icon-static");
-+#ifdef HAVE_GSTREAMER
-+	(*caps)[5] = g_strdup("sound");
-+	(*caps)[6] = NULL;
-+#else
- 	(*caps)[5] = NULL;
-+#endif
- 
- 	return TRUE;
- }
diff --git a/x11-misc/notification-daemon/notification-daemon-0.4.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-0.4.0-r1.ebuild
deleted file mode 100644
index b8f5b594358e..000000000000
--- a/x11-misc/notification-daemon/notification-daemon-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.4.0-r1.ebuild,v 1.12 2011/03/21 22:36:57 nirbheek Exp $
-
-EAPI="1"
-WANT_AUTOMAKE="1.9"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Notifications daemon"
-HOMEPAGE="http://www.galago-project.org/"
-SRC_URI="http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="gstreamer"
-
-RDEPEND=">=dev-libs/glib-2.4.0:2
-		 >=x11-libs/gtk+-2.4.0:2
-		 >=gnome-base/gconf-2.4.0:2
-		 >=x11-libs/libsexy-0.1.3
-		 >=dev-libs/dbus-glib-0.71
-		 x11-libs/libwnck:1
-		 ~x11-libs/libnotify-0.4.5
-		 >=gnome-base/libglade-2:2.0
-		 gstreamer? ( >=media-libs/gstreamer-0.10:0.10 )"
-DEPEND="${RDEPEND}
-		dev-util/intltool
-		>=sys-devel/gettext-0.14
-		!xfce-extra/xfce4-notifyd"
-
-src_unpack() {
-	gnome2_src_unpack
-	cd "${S}" || die "cd failed"
-	epatch "${FILESDIR}"/${P}-report-sound-capability.patch
-}
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS"
-	G2CONF="$(use_enable gstreamer sound gstreamer)"
-}
diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
index 94d228204006..e2dabac5ac1c 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild,v 1.9 2011/04/29 17:36:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild,v 1.10 2011/04/29 17:39:25 ssuominen Exp $
 
 EAPI=3
 GCONF_DEBUG=no
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.galago-project.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.4:2