diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2005-12-14 21:21:53 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2005-12-14 21:21:53 +0000 |
| commit | 0ecf75b29c9ce173d9bfa05dd96f167c82d6ce3e (patch) | |
| tree | a0f512d128d1f143625e54d112a8551791f27b49 /x11-wm/metacity | |
| parent | Fix modular X deps to not dup gtk+ ones (diff) | |
| download | gentoo-2-0ecf75b29c9ce173d9bfa05dd96f167c82d6ce3e.tar.gz gentoo-2-0ecf75b29c9ce173d9bfa05dd96f167c82d6ce3e.tar.bz2 gentoo-2-0ecf75b29c9ce173d9bfa05dd96f167c82d6ce3e.zip | |
Don't need explicit X deps, only uses what gtk+ requires
(Portage version: 2.0.53)
Diffstat (limited to 'x11-wm/metacity')
| -rw-r--r-- | x11-wm/metacity/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-wm/metacity/Manifest | 12 | ||||
| -rw-r--r-- | x11-wm/metacity/metacity-2.12.2.ebuild | 10 |
3 files changed, 7 insertions, 20 deletions
diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog index 60675c29e0bc..51f88c2416e3 100644 --- a/x11-wm/metacity/ChangeLog +++ b/x11-wm/metacity/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-wm/metacity # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.137 2005/12/13 22:45:02 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.138 2005/12/14 21:21:53 dang Exp $ + + 14 Dec 2005; <dang@gentoo.org> metacity-2.12.2.ebuild: + Don't need explicit X deps, only uses what gtk+ requires 13 Dec 2005; <dang@gentoo.org> metacity-2.12.2.ebuild: Modular X deps. Bug #115272 diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest index 9e229347fd44..522019a26d54 100644 --- a/x11-wm/metacity/Manifest +++ b/x11-wm/metacity/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 1ab9384984f3a6fe34fc1c7bfa154253 ChangeLog 14843 MD5 8085853ac850bbbd443d6f4c030f39bf files/digest-metacity-2.10.3 69 MD5 16961ede777e7728d18f802db072e251 files/digest-metacity-2.12.1 69 @@ -8,12 +5,5 @@ MD5 52d6f3845641e5004a00cb8fffc1d8a8 files/digest-metacity-2.12.2 69 MD5 98f6fd8a6545a37a2ddf9b0e11ce54f7 files/metacity-2-logout.patch 7363 MD5 32bfb0fc7521103b5b5a4f5c6f32ce3a metacity-2.10.3.ebuild 1257 MD5 7c3acd3b4aaeab17a989e45166252589 metacity-2.12.1.ebuild 1282 -MD5 201338338f4a7a7cc0622079cefdbc4a metacity-2.12.2.ebuild 1500 +MD5 583523fae14d412697178d87b4a5922c metacity-2.12.2.ebuild 1342 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux) - -iD8DBQFDn07comPajV0RnrERAuA6AJwKKblnc752QnFgkkfpSlJ3Wm/kUwCfeFdt -9BxS8rQC/3Pc6BdB+AszqTQ= -=1q63 ------END PGP SIGNATURE----- diff --git a/x11-wm/metacity/metacity-2.12.2.ebuild b/x11-wm/metacity/metacity-2.12.2.ebuild index c4d4e56f8dad..c543d17915ea 100644 --- a/x11-wm/metacity/metacity-2.12.2.ebuild +++ b/x11-wm/metacity/metacity-2.12.2.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/x11-wm/metacity/metacity-2.12.2.ebuild,v 1.2 2005/12/13 22:45:02 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.12.2.ebuild,v 1.3 2005/12/14 21:21:53 dang Exp $ inherit eutils gnome2 @@ -15,12 +15,7 @@ IUSE="xinerama" # not parallel-safe; see bug #14405 MAKEOPTS="${MAKEOPTS} -j1" -RDEPEND="|| ( ( - x11-libs/libICE - x11-libs/libSM - xinerama? ( x11-libs/libXinerama ) ) - virtual/x11 ) - >=x11-libs/gtk+-2.6 +RDEPEND=" >=x11-libs/gtk+-2.6 >=x11-libs/pango-1.2 >=gnome-base/gconf-2 >=dev-libs/glib-2.6 @@ -31,7 +26,6 @@ RDEPEND="|| ( ( # x11-libs/libXdamage # x11-libs/libXcomposite DEPEND="${RDEPEND} - xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) ) sys-devel/gettext >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.28" |