diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2005-12-14 20:29:03 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2005-12-14 20:29:03 +0000 |
| commit | 7306bdbac94e70e9e46f2f99af756a3a9ab2699f (patch) | |
| tree | 3dc5d11b06e2cfc5d9f7a11e1bb0a6e525d34a5b /gnome-base | |
| parent | Fixed file collisions with "dev-libs/libpcre" (bug #115463) (diff) | |
| download | gentoo-2-7306bdbac94e70e9e46f2f99af756a3a9ab2699f.tar.gz gentoo-2-7306bdbac94e70e9e46f2f99af756a3a9ab2699f.tar.bz2 gentoo-2-7306bdbac94e70e9e46f2f99af756a3a9ab2699f.zip | |
Fix modular X deps to not dup gtk+ ones
(Portage version: 2.0.53)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/control-center/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-base/control-center/Manifest | 24 | ||||
| -rw-r--r-- | gnome-base/control-center/control-center-2.12.2-r1.ebuild | 11 |
3 files changed, 18 insertions, 22 deletions
diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog index 162b6dcdcee5..6045546c3baf 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-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.144 2005/12/06 07:41:21 zaheerm Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.145 2005/12/14 20:29:03 dang Exp $ + + 14 Dec 2005; <dang@gentoo.org> control-center-2.12.2-r1.ebuild: + Fix modular X deps to not dup gtk+ ones 06 Dec 2005; Zaheer Abbas Merali <zaheerm@gentoo.org> control-center-2.10.2.ebuild: diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest index aa1aa628d9f5..c6fb618db996 100644 --- a/gnome-base/control-center/Manifest +++ b/gnome-base/control-center/Manifest @@ -1,20 +1,20 @@ -MD5 c2f9837fa0e285c242254804a8980bc4 control-center-1.4.0.5-r2.ebuild 1411 -MD5 fb5ca50373f5813456ab01b99119916c control-center-2.12.1.ebuild 2523 +MD5 6ece9344f152d9ddb1f3b7ca3b30dfe1 ChangeLog 18950 MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333 -MD5 b981de1d3e97acba3ffd733321930257 control-center-2.12.2-r1.ebuild 2643 +MD5 c2f9837fa0e285c242254804a8980bc4 control-center-1.4.0.5-r2.ebuild 1411 MD5 f591b4d2e1987a08027ebfa25c396f36 control-center-2.10.2.ebuild 2013 -MD5 6ece9344f152d9ddb1f3b7ca3b30dfe1 ChangeLog 18950 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75 -MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75 -MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083 -MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997 -MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210 -MD5 ffaf30fdb4e8f79169e8a8c8bbe22283 files/control-center-2.12.2-gcc-Wextra.patch 359 -MD5 dac847149ae0099bb34f493727bed270 files/control-center-2.12.2-pathfix.patch 6758 +MD5 fb5ca50373f5813456ab01b99119916c control-center-2.12.1.ebuild 2523 +MD5 0c60016347d572689fbcea3eeb21ec77 control-center-2.12.2-r1.ebuild 2543 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744 MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670 MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527 +MD5 ffaf30fdb4e8f79169e8a8c8bbe22283 files/control-center-2.12.2-gcc-Wextra.patch 359 +MD5 dac847149ae0099bb34f493727bed270 files/control-center-2.12.2-pathfix.patch 6758 +MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997 +MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210 +MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r2 76 +MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75 +MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75 MD5 ee57d7f95478cf42c392dd7c457d4fe7 files/digest-control-center-2.12.2-r1 75 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 diff --git a/gnome-base/control-center/control-center-2.12.2-r1.ebuild b/gnome-base/control-center/control-center-2.12.2-r1.ebuild index 6ac5d2a19a2e..a5d64c62b294 100644 --- a/gnome-base/control-center/control-center-2.12.2-r1.ebuild +++ b/gnome-base/control-center/control-center-2.12.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.12.2-r1.ebuild,v 1.1 2005/12/06 04:15:04 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.2-r1.ebuild,v 1.2 2005/12/14 20:29:03 dang Exp $ inherit eutils gnome2 autotools @@ -15,13 +15,7 @@ IUSE="alsa eds gstreamer" RDEPEND=">=gnome-base/gnome-vfs-2.2 >=media-libs/fontconfig-1 virtual/xft - || ( ( - x11-libs/libXdmcp - x11-libs/libICE - x11-libs/libSM - x11-libs/libXxf86misc - x11-libs/libXau ) - virtual/x11 ) + || ( x11-libs/libXxf86misc virtual/x11 ) >=x11-libs/gtk+-2.6 >=gnome-base/libbonobo-2 >=gnome-base/libgnomeui-2.2 @@ -45,7 +39,6 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2 DEPEND="${RDEPEND} || ( ( x11-libs/libxkbfile - x11-proto/kbproto x11-proto/xf86miscproto x11-proto/scrnsaverproto ) virtual/x11 ) |