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

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

5 files changed, 9 insertions, 81 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/Manifest b/x11-misc/notification-daemon/Manifest
index ed34c462ae08..f0dac485f8f5 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX notification-daemon-0.4.0-report-sound-capability.patch 820 RMD160 f76bb8e8e495077216576b69d38d6714c9757298 SHA1 a55d4296987d4e0da052de65be01976002ed034d SHA256 ead94f505f0eda55964d1004477840ea16a5a586e6d1da29f93f48d071067269
 AUX notification-daemon-0.5.0-libnotify-0.7.patch 948 RMD160 bd532b6358e79ba29d84d76ae36140268f886a5a SHA1 e36c96f5ba72de187be52f5883fcf7983d2df4f1 SHA256 b946ffadaebac45d845618853d73afbae68636de0c791b7f962fc46413b59e30
-DIST notification-daemon-0.4.0.tar.gz 404178 RMD160 349ea655b4fd0a2b5987b59a5d1241158f20f9d5 SHA1 c978d780588f31f4e5b75487ad1f1b7498e51a07 SHA256 0c0c90ec7f2fc7fc5cbefba2e04df6ae311abc7ace23dd34f21dc063e119d808
 DIST notification-daemon-0.5.0.tar.bz2 330034 RMD160 835bd1704797852d810f1812f4564e38d4def621 SHA1 1dfea9c637717f993099cfca564e700776083854 SHA256 aa1d3546fd1d5c51087317f4921c419927b644c12c39b557c959c9b45deb1475
-EBUILD notification-daemon-0.4.0-r1.ebuild 1239 RMD160 fb9e3b95de83bce302efc45e42cfb38d144223bc SHA1 b30ccc068c97f105e95f7ef42344a193eee1df4e SHA256 ec694ac12c523cdd692a5eddcdb627f4fefbbe54ba1c29e53f1fc4e7fc277299
-EBUILD notification-daemon-0.5.0.ebuild 1073 RMD160 ea83f0f1e9968d373823e19da678e0b627e7745e SHA1 1f4e25b605d31f1761d8a243ba660d0380b7a897 SHA256 0f21bac97a7d8d918b2b8fc3ac36f56f7de24f5d42682217b952cdbc37272502
-MISC ChangeLog 11684 RMD160 c941d665d61fccd4863cf355efef1af5e9ea1835 SHA1 af10a15f6398de7fc821d997720de53720eb2b92 SHA256 8833cfe03c5c586b919bc488aedbc653df0b06cf01d4a40546cc78bd8530c917
+EBUILD notification-daemon-0.5.0.ebuild 1073 RMD160 ae1156a95a253063c0434053d35ed39eb745b5c2 SHA1 105f89a228559c8bfacb2358232c332c7d229f28 SHA256 62d9664a257c3df709f87c65e48a4fe1ce11853f2f50a545ec2daf12c033b5c7
+MISC ChangeLog 11688 RMD160 d8642ced32a2808369e02b6a5628127f57921c8f SHA1 fcef2c109ed9c76533d588bcd97064d910d070db SHA256 9d43ea3ab596b07e3a26ea3cb9f4989c4cb8dec87483d408de4b5a4f7e0e3c0d
 MISC metadata.xml 165 RMD160 f8f7dd761c5475651b8e04512e4f3dd043c41984 SHA1 47939c027699c5810cd3f25b4698719e9bd183d2 SHA256 dc2ad50713441100082e32ba283e9dd807b8fc46f69a5b9221fb9b89064deb31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk26950ACgkQXkR9YqOcLPHFKwD/fYVVhehQNIoVLWBh5dkzsTtl
-XH9f+gMnQpNf+SUqkQkBAKh5Vxye0m/rMJ6ShuiVQjyUqt5VvnDrwhnYpFMyZ/zF
-=/3hm
+iF4EAREIAAYFAk26+DkACgkQXkR9YqOcLPHGzAD8ChV+cdbs8iXhFqf3shoDZToC
+puRFvAkIXVKENY9DRrMA/RJDJ9YqKSSpSgAZ1Ic6Rga0PMObhaV+Jd28ViMOYKQ9
+=Qifx
 -----END PGP SIGNATURE-----
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