diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2007-04-01 11:54:06 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2007-04-01 11:54:06 +0000 |
| commit | a5de35b1751efd0af3e4f78911f05dd456438209 (patch) | |
| tree | 2f21c68e13fc5e4013ff9dd59aefa271107c2a5d /gnome-base | |
| parent | Version bump, includes cleanups and fixed tests. (diff) | |
| download | gentoo-2-a5de35b1751efd0af3e4f78911f05dd456438209.tar.gz gentoo-2-a5de35b1751efd0af3e4f78911f05dd456438209.tar.bz2 gentoo-2-a5de35b1751efd0af3e4f78911f05dd456438209.zip | |
fix collision
(Portage version: 2.1.2.3)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/control-center/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-base/control-center/control-center-2.18.0.ebuild | 118 |
2 files changed, 64 insertions, 59 deletions
diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog index 1a79d833c0d2..68e856453cad 100644 --- a/gnome-base/control-center/ChangeLog +++ b/gnome-base/control-center/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-base/control-center # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.223 2007/03/24 03:22:53 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.224 2007/04/01 11:54:06 foser Exp $ + + 01 Apr 2007; Marinus Schraal <foser@gentoo.org> control-center-2.18.0.ebuild : + Disable mimedb update during configure 24 Mar 2007; Daniel Gryniewicz <dang@gentoo.org> +control-center-2.18.0.ebuild: diff --git a/gnome-base/control-center/control-center-2.18.0.ebuild b/gnome-base/control-center/control-center-2.18.0.ebuild index 5c6b10f0e156..ffca09767a9f 100644 --- a/gnome-base/control-center/control-center-2.18.0.ebuild +++ b/gnome-base/control-center/control-center-2.18.0.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.18.0.ebuild,v 1.1 2007/03/24 03:22:53 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.18.0.ebuild,v 1.2 2007/04/01 11:54:06 foser Exp $ inherit eutils gnome2 autotools @@ -13,69 +13,71 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="alsa eds esd gstreamer hal" RDEPEND=">=gnome-base/gnome-vfs-2.2 - >=media-libs/fontconfig-1 - >=virtual/xft-2.1.2 - x11-apps/xmodmap - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXdmcp - x11-libs/libICE - x11-libs/libSM - x11-libs/libXxf86misc - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/pango - >=dev-libs/glib-2.8 - >=x11-libs/gtk+-2.10 - >=gnome-base/libbonobo-2 - >=gnome-base/libgnomeui-2.2 - >=gnome-base/nautilus-2.6 - >=gnome-base/gconf-2 - >=gnome-base/libglade-2 - >=gnome-base/libbonoboui-2.2 - >=gnome-base/gnome-desktop-2.2 - >=gnome-base/librsvg-2 - >=gnome-base/gnome-menus-2.11.1 - >=gnome-base/gnome-panel-2 - gnome-base/libgnomekbd - esd? ( media-sound/esound ) - hal? ( >=sys-apps/hal-0.5.6 ) - dev-libs/libxml2 - >=x11-wm/metacity-2.8.6-r1 - >=x11-libs/libxklavier-2.91 - >=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 ) - !arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) ) - gstreamer? ( - >=media-libs/gst-plugins-base-0.10.2 - >=media-libs/gstreamer-0.10.2 - )" + >=media-libs/fontconfig-1 + >=virtual/xft-2.1.2 + x11-apps/xmodmap + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXdmcp + x11-libs/libICE + x11-libs/libSM + x11-libs/libXxf86misc + x11-libs/libXau + x11-libs/libXcursor + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/pango + >=dev-libs/glib-2.8 + >=x11-libs/gtk+-2.10 + >=gnome-base/libbonobo-2 + >=gnome-base/libgnomeui-2.2 + >=gnome-base/nautilus-2.6 + >=gnome-base/gconf-2 + >=gnome-base/libglade-2 + >=gnome-base/libbonoboui-2.2 + >=gnome-base/gnome-desktop-2.2 + >=gnome-base/librsvg-2 + >=gnome-base/gnome-menus-2.11.1 + >=gnome-base/gnome-panel-2 + gnome-base/libgnomekbd + esd? ( media-sound/esound ) + hal? ( >=sys-apps/hal-0.5.6 ) + dev-libs/libxml2 + >=x11-wm/metacity-2.8.6-r1 + >=x11-libs/libxklavier-2.91 + >=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 ) + !arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) ) + gstreamer? ( + >=media-libs/gst-plugins-base-0.10.2 + >=media-libs/gstreamer-0.10.2 + )" + DEPEND="${RDEPEND} - x11-proto/kbproto - x11-proto/xextproto - x11-libs/libxkbfile - x11-proto/xf86miscproto - x11-proto/scrnsaverproto - sys-devel/gettext - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.35 - >=app-text/gnome-doc-utils-0.3.2 - app-text/scrollkeeper - gnome-base/gnome-common - dev-util/desktop-file-utils" + x11-proto/kbproto + x11-proto/xextproto + x11-libs/libxkbfile + x11-proto/xf86miscproto + x11-proto/scrnsaverproto + sys-devel/gettext + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35 + >=app-text/gnome-doc-utils-0.3.2 + app-text/scrollkeeper + gnome-base/gnome-common + dev-util/desktop-file-utils" DOCS="AUTHORS ChangeLog NEWS README TODO" pkg_setup() { G2CONF="${G2CONF} --disable-schemas-install \ + --disable-update-mimedb \ --disable-scrollkeeper \ --enable-vfs-methods \ $(use_enable esd) \ |