Clean up old versions and patch for >=dbus-0.60 api.

Package-Manager: portage-2.1_pre7-r4

13 files changed, 83 insertions, 76 deletions

diff --git a/xfce-extra/xfmedia/ChangeLog b/xfce-extra/xfmedia/ChangeLog
index ede8b93255be..48bb960a752d 100644
--- a/xfce-extra/xfmedia/ChangeLog
+++ b/xfce-extra/xfmedia/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for xfce-extra/xfmedia
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/ChangeLog,v 1.9 2005/10/06 07:58:35 bcowan Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/ChangeLog,v 1.10 2006/04/08 21:22:31 dostrow Exp $
+
+  08 Apr 2006; Daniel Ostrow <dostrow@gentoo.org>
+  -xfmedia-0.6.0-r1.ebuild, -xfmedia-0.7.0.ebuild, 
+  -xfmedia-0.8.0.ebuild, -xfmedia-0.9.1.ebuild:
+  Clean up old versions.
+
+*xfmedia-0.9.1-r2 (08 Apr 2006)
+
+  08 Apr 2006; Daniel Ostrow <dostrow@gentoo.org>
+  +files/xfmedia-dbus-0.6-support.patch, +xfmedia-0.9.1-r2.ebuild:
+  Patch xfmedia for >=dbus-0.60 api.
 
 *xfmedia-0.9.1-r1 (06 Oct 2005)
 
diff --git a/xfce-extra/xfmedia/Manifest b/xfce-extra/xfmedia/Manifest
index fb5582f6131c..8a975d7f1b6d 100644
--- a/xfce-extra/xfmedia/Manifest
+++ b/xfce-extra/xfmedia/Manifest
@@ -1,12 +1,21 @@
-MD5 4d66b629cdf2a46222d8429edd08e939 xfmedia-0.6.0-r1.ebuild 526
-MD5 640ba8693bd8f5a244a5543b5ca83744 xfmedia-0.7.0.ebuild 528
-MD5 dcd9acdcff40799269735e5a40ab939b xfmedia-0.9.1-r1.ebuild 786
-MD5 0ae70bd17a911cc5389d91b67bf6542e xfmedia-0.9.1.ebuild 584
-MD5 338370882a698729325183fe51de3ad1 xfmedia-0.8.0.ebuild 543
-MD5 23cc53a018fceece1761dcfd3db37b73 ChangeLog 1396
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 2c3b6e5cf0c76523cb35734e64448845 files/digest-xfmedia-0.7.0 66
-MD5 a23e85c3ffd7b97e397de04e29706d90 files/digest-xfmedia-0.8.0 66
-MD5 b311e3fa2bec544a97d3600745e8cff7 files/digest-xfmedia-0.9.1 66
-MD5 d00487379a40693e44d9bc6d7d014eb6 files/digest-xfmedia-0.6.0-r1 66
+MD5 d6046bdc77d06a3c6f05ccf8522ee07b ChangeLog 1762
+RMD160 73e7a9a3fc50c2fc0b5c3a871e5fb38f8a2c89a3 ChangeLog 1762
+SHA256 0c46f6cb838d2593b6c2af2ce27e1a997ccde7e27e1650803bff6783766a4b18 ChangeLog 1762
 MD5 b311e3fa2bec544a97d3600745e8cff7 files/digest-xfmedia-0.9.1-r1 66
+RMD160 4fd69d6c08f4d1b0ef8e088fd7992036bac81158 files/digest-xfmedia-0.9.1-r1 66
+SHA256 3213dd2b5ab6a8d315f8971853b90f09b883faa8999924ca0e45ffbad70b3819 files/digest-xfmedia-0.9.1-r1 66
+MD5 c10c977de190963fcedee17f2f18226b files/digest-xfmedia-0.9.1-r2 244
+RMD160 9e1d6110901510d521e1a29a3b61b79836a4458c files/digest-xfmedia-0.9.1-r2 244
+SHA256 3af7eff5afd74dee7b922b3da9b19258bd40ec8e0133be3c17e626233b346f99 files/digest-xfmedia-0.9.1-r2 244
+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
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
+SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata.xml 157
+MD5 dcd9acdcff40799269735e5a40ab939b xfmedia-0.9.1-r1.ebuild 786
+RMD160 325949055e3008c64fd24d4b3ccaf6a348069c8a xfmedia-0.9.1-r1.ebuild 786
+SHA256 a2331527361a2692c826de33a431dd7caf83e069c501e9c6c0b715933be249fb xfmedia-0.9.1-r1.ebuild 786
+MD5 4067f7984908acbd4b9b48209be50267 xfmedia-0.9.1-r2.ebuild 886
+RMD160 4857db7524dcbc44a393ba003638873afd730370 xfmedia-0.9.1-r2.ebuild 886
+SHA256 4dba7dee33077cdc95d390202d08e7c468861b97f640ed1d076930b938aab19b xfmedia-0.9.1-r2.ebuild 886
diff --git a/xfce-extra/xfmedia/files/digest-xfmedia-0.6.0-r1 b/xfce-extra/xfmedia/files/digest-xfmedia-0.6.0-r1
deleted file mode 100644
index e3bce4635e7b..000000000000
--- a/xfce-extra/xfmedia/files/digest-xfmedia-0.6.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da83e30744b47fc034731fb160197470 xfmedia-0.6.0.tar.bz2 384553
diff --git a/xfce-extra/xfmedia/files/digest-xfmedia-0.7.0 b/xfce-extra/xfmedia/files/digest-xfmedia-0.7.0
deleted file mode 100644
index 04ba56320444..000000000000
--- a/xfce-extra/xfmedia/files/digest-xfmedia-0.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e82cc94adb467b15684f142be610cc4 xfmedia-0.7.0.tar.bz2 757219
diff --git a/xfce-extra/xfmedia/files/digest-xfmedia-0.8.0 b/xfce-extra/xfmedia/files/digest-xfmedia-0.8.0
deleted file mode 100644
index 163bcc101293..000000000000
--- a/xfce-extra/xfmedia/files/digest-xfmedia-0.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed74adeeb58b3598726cbbcc58dba491 xfmedia-0.8.0.tar.bz2 815068
diff --git a/xfce-extra/xfmedia/files/digest-xfmedia-0.9.1 b/xfce-extra/xfmedia/files/digest-xfmedia-0.9.1
deleted file mode 100644
index f1c7c67e847b..000000000000
--- a/xfce-extra/xfmedia/files/digest-xfmedia-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ab3d25703d16ab4074dc63e677d0367 xfmedia-0.9.1.tar.bz2 806692
diff --git a/xfce-extra/xfmedia/files/digest-xfmedia-0.9.1-r2 b/xfce-extra/xfmedia/files/digest-xfmedia-0.9.1-r2
new file mode 100644
index 000000000000..effea4f2aee1
--- /dev/null
+++ b/xfce-extra/xfmedia/files/digest-xfmedia-0.9.1-r2
@@ -0,0 +1,3 @@
+MD5 5ab3d25703d16ab4074dc63e677d0367 xfmedia-0.9.1.tar.bz2 806692
+RMD160 71576ca7b58eb32bffb2fdaa8bcc75c4fb78f794 xfmedia-0.9.1.tar.bz2 806692
+SHA256 f396989b891dc676bec67a777ef217c9b0e7ccf212373a74984c0153aea0b8fa xfmedia-0.9.1.tar.bz2 806692
diff --git a/xfce-extra/xfmedia/files/xfmedia-dbus-0.6-support.patch b/xfce-extra/xfmedia/files/xfmedia-dbus-0.6-support.patch
new file mode 100644
index 000000000000..9b1eb367884e
--- /dev/null
+++ b/xfce-extra/xfmedia/files/xfmedia-dbus-0.6-support.patch
@@ -0,0 +1,14 @@
+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.6.0-r1.ebuild b/xfce-extra/xfmedia/xfmedia-0.6.0-r1.ebuild
deleted file mode 100644
index 7b3b120a2734..000000000000
--- a/xfce-extra/xfmedia/xfmedia-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.6.0-r1.ebuild,v 1.3 2005/02/04 04:22:04 bcowan Exp $
-
-DESCRIPTION="Xfce4 media player"
-HOMEPAGE="http://spuriousinterrupt.org/projects/xfmedia"
-SRC_URI="http://spuriousinterrupt.org/projects/xfmedia/files/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=xfce-base/libxfce4mcs-4.2.0
-	media-libs/xine-lib"
-
-inherit xfce4
diff --git a/xfce-extra/xfmedia/xfmedia-0.7.0.ebuild b/xfce-extra/xfmedia/xfmedia-0.7.0.ebuild
deleted file mode 100644
index aa0d4564b0ac..000000000000
--- a/xfce-extra/xfmedia/xfmedia-0.7.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.7.0.ebuild,v 1.1 2005/03/17 18:26:35 bcowan Exp $
-
-DESCRIPTION="Xfce4 media player"
-HOMEPAGE="http://spuriousinterrupt.org/projects/xfmedia"
-SRC_URI="http://spuriousinterrupt.org/projects/xfmedia/files/${P}.tar.bz2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=xfce-base/libxfce4mcs-4.2.0
-	xfce-extra/exo
-	media-libs/xine-lib"
-
-inherit xfce4
diff --git a/xfce-extra/xfmedia/xfmedia-0.8.0.ebuild b/xfce-extra/xfmedia/xfmedia-0.8.0.ebuild
deleted file mode 100644
index ff816bd01c1b..000000000000
--- a/xfce-extra/xfmedia/xfmedia-0.8.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.8.0.ebuild,v 1.2 2005/09/07 18:43:18 bcowan Exp $
-
-DESCRIPTION="Xfce4 media player"
-HOMEPAGE="http://spuriousinterrupt.org/projects/xfmedia"
-SRC_URI="http://spuriousinterrupt.org/projects/xfmedia/files/${P}.tar.bz2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=xfce-base/libxfce4mcs-4.2.0
-	xfce-extra/exo
-	sys-apps/dbus
-	media-libs/xine-lib"
-
-inherit xfce4
diff --git a/xfce-extra/xfmedia/xfmedia-0.9.1-r2.ebuild b/xfce-extra/xfmedia/xfmedia-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..3d2a92f174c7
--- /dev/null
+++ b/xfce-extra/xfmedia/xfmedia-0.9.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.9.1-r2.ebuild,v 1.1 2006/04/08 21:22:31 dostrow Exp $
+
+inherit eutils xfce42
+
+DESCRIPTION="Xfce4 media player"
+HOMEPAGE="http://spuriousinterrupt.org/projects/xfmedia"
+SRC_URI="http://spuriousinterrupt.org/projects/xfmedia/files/${P}.tar.bz2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXtst )
+	virtual/x11 )
+	>=xfce-base/libxfce4mcs-4.2.2-r1
+	xfce-extra/exo
+	dbus? ( sys-apps/dbus )
+	media-libs/xine-lib
+	media-libs/taglib"
+DEPEND="${RDEPEND}
+	|| ( ( x11-libs/libX11
+	x11-libs/libXt
+	x11-proto/xextproto
+	x11-proto/xproto )
+	virtual/x11 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/xfmedia-dbus-0.6-support.patch
+}
diff --git a/xfce-extra/xfmedia/xfmedia-0.9.1.ebuild b/xfce-extra/xfmedia/xfmedia-0.9.1.ebuild
deleted file mode 100644
index 29044497a8e8..000000000000
--- a/xfce-extra/xfmedia/xfmedia-0.9.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfmedia/xfmedia-0.9.1.ebuild,v 1.1 2005/10/06 05:24:11 bcowan Exp $
-
-DESCRIPTION="Xfce4 media player"
-HOMEPAGE="http://spuriousinterrupt.org/projects/xfmedia"
-SRC_URI="http://spuriousinterrupt.org/projects/xfmedia/files/${P}.tar.bz2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus"
-
-RDEPEND=">=xfce-base/libxfce4mcs-4.2.0
-	xfce-extra/exo
-	dbus? ( sys-apps/dbus )
-	media-libs/xine-lib
-	media-libs/taglib"
-
-inherit xfce4