summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Weller <welp@gentoo.org>2007-01-23 21:42:27 +0000
committerPeter Weller <welp@gentoo.org>2007-01-23 21:42:27 +0000
commitf7144154793ee1bbc4191f61fc6a82ac22c76bf9 (patch)
tree0e8514859b17ee32ad5dea381309d9d1da9ef2a1 /xfce-extra
parentStable on Alpha + IA64. (diff)
downloadgentoo-2-f7144154793ee1bbc4191f61fc6a82ac22c76bf9.tar.gz
gentoo-2-f7144154793ee1bbc4191f61fc6a82ac22c76bf9.tar.bz2
gentoo-2-f7144154793ee1bbc4191f61fc6a82ac22c76bf9.zip
Fix depends for bug 163244. Fix meta builds.
(Portage version: 2.1.2-r1)
Diffstat (limited to 'xfce-extra')
-rw-r--r--xfce-extra/xfmedia/ChangeLog8
-rw-r--r--xfce-extra/xfmedia/files/xfmedia-dbus-0.6-support.patch14
-rw-r--r--xfce-extra/xfmedia/xfmedia-0.9.2-r1.ebuild10
3 files changed, 11 insertions, 21 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/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) \