Fix depends for bug 163244. Fix meta builds.

Package-Manager: portage-2.1.2-r1

4 files changed, 19 insertions, 43 deletions

diff --git a/xfce-extra/xfmedia/ChangeLog b/xfce-extra/xfmedia/ChangeLog
index dc5c9f3c1572..9a645ec84f42 100644
--- a/xfce-extra/xfmedia/ChangeLog
+++ b/xfce-extra/xfmedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfmedia
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/ChangeLog,v 1.14 2006/12/11 02:13:44 nichoj Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/ChangeLog,v 1.15 2007/01/23 21:42:27 welp Exp $
+
+  23 Jan 2007; Peter Weller <welp@gentoo.org>
+  -files/xfmedia-dbus-0.6-support.patch, xfmedia-0.9.2-r1.ebuild:
+  Fix depends for bug 163244. Fix meta builds. Removed obselete patch.
 
 *xfmedia-0.9.2-r1 (11 Dec 2006)
 
diff --git a/xfce-extra/xfmedia/Manifest b/xfce-extra/xfmedia/Manifest
index 1019333abb5e..586eb4d62dbe 100644
--- a/xfce-extra/xfmedia/Manifest
+++ b/xfce-extra/xfmedia/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX xfmedia-dbus-0.6-support.patch 513 RMD160 2defa7019f9d8f70531c6480ab26dca23d7f4a48 SHA1 7e068b6714bcbf58e4d9ac2610bb27fc448bccce SHA256 2dff284c6a36523150169c0eaa7661aa54288ed76e991dbd7be6f468e9528d31
-MD5 8f2aa12eea584de65d8ed28179e56b51 files/xfmedia-dbus-0.6-support.patch 513
-RMD160 2defa7019f9d8f70531c6480ab26dca23d7f4a48 files/xfmedia-dbus-0.6-support.patch 513
-SHA256 2dff284c6a36523150169c0eaa7661aa54288ed76e991dbd7be6f468e9528d31 files/xfmedia-dbus-0.6-support.patch 513
 DIST xfmedia-0.9.2.tar.bz2 893228 RMD160 e1d16fe50609475f916594f2b6a885cfed6251e0 SHA1 cb8d39f2a4ee6a6164f722162fa45004770a7605 SHA256 451b67541527cde7f96693fa1ef7776eb03ac40edcef3023bfb2c1ebcf3e7e0c
-EBUILD xfmedia-0.9.2-r1.ebuild 1017 RMD160 50561804a0ffad257d1d8c0f541dffa3aedc8aa9 SHA1 6a379044d9735aeb6e6aa5d93a731df668a902d3 SHA256 1e54c4f98089c76934e2ad62c319e602d51e3ba063d8ecc374355d4ff3f23735
-MD5 12548c6aa2083d8f3fba82cca075a792 xfmedia-0.9.2-r1.ebuild 1017
-RMD160 50561804a0ffad257d1d8c0f541dffa3aedc8aa9 xfmedia-0.9.2-r1.ebuild 1017
-SHA256 1e54c4f98089c76934e2ad62c319e602d51e3ba063d8ecc374355d4ff3f23735 xfmedia-0.9.2-r1.ebuild 1017
-MISC ChangeLog 2482 RMD160 84f2b34bd5a8688caf7ea0621a8690ed85c0d71d SHA1 4c43adbe9fbdf4450d023b2eb8191fa67080d677 SHA256 75b64ceeab4ef5c6c15b8acdd851b670e391af26a3fe32b97bad361b656c9566
-MD5 96c2d14cd4c24caf85ac68b752f9106e ChangeLog 2482
-RMD160 84f2b34bd5a8688caf7ea0621a8690ed85c0d71d ChangeLog 2482
-SHA256 75b64ceeab4ef5c6c15b8acdd851b670e391af26a3fe32b97bad361b656c9566 ChangeLog 2482
+EBUILD xfmedia-0.9.2-r1.ebuild 1008 RMD160 de40d89718fd931d54b10a934a3b863e96395c33 SHA1 d3077a34e10125e9b48c8ce5f8c415ad8a3f1fe6 SHA256 1c82161bb7edbdf97cf3568f69ddc1ba4543bc467e3de95766a2a6b9f0232324
+MD5 0085381475007ac133bebad5c0ab8704 xfmedia-0.9.2-r1.ebuild 1008
+RMD160 de40d89718fd931d54b10a934a3b863e96395c33 xfmedia-0.9.2-r1.ebuild 1008
+SHA256 1c82161bb7edbdf97cf3568f69ddc1ba4543bc467e3de95766a2a6b9f0232324 xfmedia-0.9.2-r1.ebuild 1008
+MISC ChangeLog 2664 RMD160 29c551b6ec76ab822831d853423eeda637d637f4 SHA1 4d669f4a351dbb1b37918ceec21bc03ff1ac4388 SHA256 2feeeec429e6947e30615eb9076eac749835b8de5afa3c632d6cf0cfe5955d7a
+MD5 1d139d6f43ffb7f85c5b90726d714c4b ChangeLog 2664
+RMD160 29c551b6ec76ab822831d853423eeda637d637f4 ChangeLog 2664
+SHA256 2feeeec429e6947e30615eb9076eac749835b8de5afa3c632d6cf0cfe5955d7a ChangeLog 2664
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -21,10 +14,3 @@ SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata
 MD5 38dc52e6f0521c0f26af9595327cf5d8 files/digest-xfmedia-0.9.2-r1 244
 RMD160 815900157b97f260820339c462e160c8094a64c0 files/digest-xfmedia-0.9.2-r1 244
 SHA256 7e75328231bc0fbdfcdd0064da2ad2d4db669c4e7b355b71dbb4f32c05add9b2 files/digest-xfmedia-0.9.2-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFfS8+/ejvha5XGaMRApx/AJ9XcZkTYvXcc/0AqM7qfppQsQjdQwCbB/L4
-+W7QnD29pVtchG87NgIY+cA=
-=oJAm
------END PGP SIGNATURE-----
diff --git a/xfce-extra/xfmedia/files/xfmedia-dbus-0.6-support.patch b/xfce-extra/xfmedia/files/xfmedia-dbus-0.6-support.patch
deleted file mode 100644
index 9b1eb367884e..000000000000
--- a/xfce-extra/xfmedia/files/xfmedia-dbus-0.6-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur xfmedia-0.9.1.orig/src/remote.c xfmedia-0.9.1/src/remote.c
---- xfmedia-0.9.1.orig/src/remote.c	2005-09-05 00:56:37.000000000 -0400
-+++ xfmedia-0.9.1/src/remote.c	2006-04-08 00:27:18.000000000 -0400
-@@ -55,6 +55,10 @@
- #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER
- #endif
- 
-+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
-+#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE
-+#endif
-+
- #endif  /* HAVE_DBUS */
- 
- #include <libxfce4util/libxfce4util.h>
diff --git a/xfce-extra/xfmedia/xfmedia-0.9.2-r1.ebuild b/xfce-extra/xfmedia/xfmedia-0.9.2-r1.ebuild
index 7c2a5787b810..4a5bb78054d8 100644
--- a/xfce-extra/xfmedia/xfmedia-0.9.2-r1.ebuild
+++ b/xfce-extra/xfmedia/xfmedia-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.9.2-r1.ebuild,v 1.2 2006/12/11 10:14:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.9.2-r1.ebuild,v 1.3 2007/01/23 21:42:27 welp Exp $
 
 inherit xfce44
 
@@ -11,8 +11,7 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="dbus debug startup-notification"
 
-DEPEND=">=dev-util/intltool-0.31
-	x11-libs/libX11
+RDEPEND="x11-libs/libX11
 	x11-libs/libSM
 	>=dev-libs/glib-2.6.0
 	>=x11-libs/gtk+-2.6.0
@@ -27,7 +26,8 @@ DEPEND=">=dev-util/intltool-0.31
 			>=sys-apps/dbus-0.34 )
 	) )
 	media-libs/taglib"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/intltool"
 
 XFCE_CONFIG="$(use_enable debug) \
 	$(use_enable startup-notification) \