fix collision

Package-Manager: portage-2.1.2.3

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 1a79d833c0d213b7a6927ebd5f95f6a9e9f5805d..68e856453cadad10e03fb7ea10559f62c3a1e9d7 100644 (file)
--- 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/Manifest b/gnome-base/control-center/Manifest
index cc71a7b85552f1468144ceaea437d85b2c825c32..3670d38bee1760d2e0185ed5d45bc8caf84a2c39 100644 (file)
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX control-center-2.11-gentoo_xcursor.patch 527 RMD160 bf455b0cf0c98c303c0885d5bcc7a72005b63108 SHA1 dc3e5afcb696034069d2ddc4d87c2905532e914c SHA256 682ed264c5ac0ed848b5cf3e856ee4440201be94f81b3dad4066233aaec48d9a
 MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
 RMD160 bf455b0cf0c98c303c0885d5bcc7a72005b63108 files/control-center-2.11-gentoo_xcursor.patch 527
@@ -33,14 +30,14 @@ EBUILD control-center-2.16.3.ebuild 2371 RMD160 d79dbf19a54f8dcce3f700e58305d17f
 MD5 fbdbada99c8140a134d7fe57e41422e3 control-center-2.16.3.ebuild 2371
 RMD160 d79dbf19a54f8dcce3f700e58305d17f932f298a control-center-2.16.3.ebuild 2371
 SHA256 e5ff6646c61792812d3d867ff60bb66f98d13f9f6d2d5f00c3b91c381f419e5c control-center-2.16.3.ebuild 2371
-EBUILD control-center-2.18.0.ebuild 2728 RMD160 35c514676f4c2a7f598b3c8a0b0f691eb337f189 SHA1 ea7bdb0228d8680c606f9e43f09a1d721a63fa83 SHA256 b6cc7324a431cd6723a4a184aaaef2fdca124235a85d0b1b7e7c1385cc37137f
-MD5 450125f45aecbe091e9970f6444b1925 control-center-2.18.0.ebuild 2728
-RMD160 35c514676f4c2a7f598b3c8a0b0f691eb337f189 control-center-2.18.0.ebuild 2728
-SHA256 b6cc7324a431cd6723a4a184aaaef2fdca124235a85d0b1b7e7c1385cc37137f control-center-2.18.0.ebuild 2728
-MISC ChangeLog 30094 RMD160 b5a8b10fdcaff9f4d9b126635259c03c5d0c0720 SHA1 86a07409a363c8973dfc1cb871088175e33e6bf2 SHA256 a5966c1617efddfbcc0a45e6021218279f377c2c37b7f7e891894a251b7db32e
-MD5 b194e62c1a24715c065bd37c8443d282 ChangeLog 30094
-RMD160 b5a8b10fdcaff9f4d9b126635259c03c5d0c0720 ChangeLog 30094
-SHA256 a5966c1617efddfbcc0a45e6021218279f377c2c37b7f7e891894a251b7db32e ChangeLog 30094
+EBUILD control-center-2.18.0.ebuild 2689 RMD160 bfe1f126c42ae9c4b0ffcffb2f16111602e371d0 SHA1 cc686e4ba9ebb241a0c946d7469430a8f2345f59 SHA256 5819505572225f236f4d2d5edc9db740093ed0882fdf43a17ed3887b28724034
+MD5 9353d981b21565d9e4d2bf55b4d699b8 control-center-2.18.0.ebuild 2689
+RMD160 bfe1f126c42ae9c4b0ffcffb2f16111602e371d0 control-center-2.18.0.ebuild 2689
+SHA256 5819505572225f236f4d2d5edc9db740093ed0882fdf43a17ed3887b28724034 control-center-2.18.0.ebuild 2689
+MISC ChangeLog 30218 RMD160 8d951cd94af4aa4df7183bbc22176959ec084bef SHA1 e1993d1265426431a50a8cae8f25fb6897bd1055 SHA256 b8206f6669005d6c366b6240ebd3ff354275b8e18a9f4d7e1e93498dc94e8703
+MD5 945cee94bc0b6679236151f7d2fdbeec ChangeLog 30218
+RMD160 8d951cd94af4aa4df7183bbc22176959ec084bef ChangeLog 30218
+SHA256 b8206f6669005d6c366b6240ebd3ff354275b8e18a9f4d7e1e93498dc94e8703 ChangeLog 30218
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -57,10 +54,3 @@ SHA256 2d035f34396a84d2f2512f57da2479f6a756f7353e5921434ae620e13b2031b9 files/di
 MD5 cafcb29e0f6dcd3288de07d906124ee0 files/digest-control-center-2.18.0 271
 RMD160 513aeab713c9cb4dad57d0672cbd9048af6ab2c5 files/digest-control-center-2.18.0 271
 SHA256 f4de778088f40660791efd4cd3ad394f8e179726da7297ca20ea1269f0b7a77f files/digest-control-center-2.18.0 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGBJlaomPajV0RnrERAi2SAJ9a5sbqdhiMA4klzRKOzwipDUXwxACfbdn8
-q/C35g7WbIV8gjTEpEYNZbw=
-=gR60
------END PGP SIGNATURE-----

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 5c6b10f0e156932558b0f153ceb9a361d7d677d4..ffca09767a9fd4b484921cf840e315d48d245b98 100644 (file)
--- 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)       \