diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2007-10-12 09:50:48 +0000 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2007-10-12 09:50:48 +0000 |
| commit | afe5be9ba6eb25caabf0bcaf73848a250803d37a (patch) | |
| tree | b6c5953488343f6569dd0cc0fe6b88198088f369 /gnome-base | |
| parent | a bug needs fixing and mail-filter/libsieve needs stabilizing first - see cha... (diff) | |
| download | gentoo-2-afe5be9ba6eb25caabf0bcaf73848a250803d37a.tar.gz gentoo-2-afe5be9ba6eb25caabf0bcaf73848a250803d37a.tar.bz2 gentoo-2-afe5be9ba6eb25caabf0bcaf73848a250803d37a.zip | |
Correct esound and evolution-data-server dependencies. Back out again the dbus reintroduced nonsense in RDEPEND - if moving from overlay to portage please sync back fixes done in portage tree only. Remove all the test fixes as they are not necessary by now...
(Portage version: 2.1.3.12)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/control-center/control-center-2.20.0.1.ebuild | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/gnome-base/control-center/control-center-2.20.0.1.ebuild b/gnome-base/control-center/control-center-2.20.0.1.ebuild index e918b1a17f89..4d6b4ab75a3a 100644 --- a/gnome-base/control-center/control-center-2.20.0.1.ebuild +++ b/gnome-base/control-center/control-center-2.20.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.20.0.1.ebuild,v 1.1 2007/10/04 04:25:18 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.20.0.1.ebuild,v 1.2 2007/10/12 09:50:48 leio Exp $ inherit eutils gnome2 autotools @@ -41,7 +41,7 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2 >=gnome-base/gnome-menus-2.11.1 >=gnome-base/gnome-panel-2 >=gnome-base/libgnomekbd-0.1 - esd? ( media-sound/esound ) + esd? ( >=media-sound/esound-0.2.38 ) hal? ( >=sys-apps/hal-0.5.6 ) dev-libs/libxml2 >=x11-wm/metacity-2.8.6-r1 @@ -49,11 +49,8 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2 >=gnome-base/libgnome-2.2 media-libs/freetype >=gnome-base/orbit-2.12.4 - || ( - >=dev-libs/dbus-glib-0.71 - ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 ) - ) - eds? ( >=gnome-extra/evolution-data-server-1.7 ) + >=dev-libs/dbus-glib-0.71 + eds? ( >=gnome-extra/evolution-data-server-1.7.90 ) !arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) ) >=media-libs/gst-plugins-base-0.10.2 >=media-libs/gstreamer-0.10.2" @@ -94,11 +91,5 @@ src_unpack() { epatch "${FILESDIR}/${PN}-2.19.90-no-esd.patch" - # Fix tests - echo "capplets/appearance/data/gnome-appearance-properties.desktop.in" >> "${S}/po/POTFILES.skip" - echo "capplets/appearance/data/gnome-theme-installer.desktop.in" >> "${S}/po/POTFILES.skip" - echo "capplets/appearance/data/gnome-appearance-properties.desktop.in" >> "${S}/po/POTFILES.skip" - echo "capplets/appearance/data/gnome-theme-installer.desktop.in" >> "${S}/po/POTFILES.skip" - eautoreconf } |