diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2005-12-13 22:45:02 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2005-12-13 22:45:02 +0000 |
| commit | 1f943bfb5075e3a2af219ac3704e38deb57bc78d (patch) | |
| tree | 77dbad303108c7e78154d10cb83992b1e8cd9358 /x11-wm | |
| parent | New upstream. (diff) | |
| download | gentoo-2-1f943bfb5075e3a2af219ac3704e38deb57bc78d.tar.gz gentoo-2-1f943bfb5075e3a2af219ac3704e38deb57bc78d.tar.bz2 gentoo-2-1f943bfb5075e3a2af219ac3704e38deb57bc78d.zip | |
Modular X deps. Bug #115272
(Portage version: 2.0.53)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/metacity/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-wm/metacity/Manifest | 2 | ||||
| -rw-r--r-- | x11-wm/metacity/metacity-2.12.2.ebuild | 12 |
3 files changed, 15 insertions, 4 deletions
diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog index 1aa257d2c717..60675c29e0bc 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.136 2005/11/29 07:23:49 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.137 2005/12/13 22:45:02 dang Exp $ + + 13 Dec 2005; <dang@gentoo.org> metacity-2.12.2.ebuild: + Modular X deps. Bug #115272 *metacity-2.12.2 (29 Nov 2005) diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest index 71b17e88cf6a..133ba28a11c4 100644 --- a/x11-wm/metacity/Manifest +++ b/x11-wm/metacity/Manifest @@ -5,5 +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 d169214716cd8bd7f80caf504373e1b9 metacity-2.12.2.ebuild 1284 +MD5 dca8d7a49fff48a499f4905fe12821fa metacity-2.12.2.ebuild 1505 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 diff --git a/x11-wm/metacity/metacity-2.12.2.ebuild b/x11-wm/metacity/metacity-2.12.2.ebuild index 1931a688108c..c4d4e56f8dad 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.1 2005/11/29 07:23:49 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.12.2.ebuild,v 1.2 2005/12/13 22:45:02 dang Exp $ inherit eutils gnome2 @@ -15,7 +15,11 @@ IUSE="xinerama" # not parallel-safe; see bug #14405 MAKEOPTS="${MAKEOPTS} -j1" -RDEPEND="virtual/x11 +RDEPEND="|| ( ( + x11-libs/libICE + x11-libs/libSM + xinerama? ( x11-libs/libXinerama ) ) + virtual/x11 ) >=x11-libs/gtk+-2.6 >=x11-libs/pango-1.2 >=gnome-base/gconf-2 @@ -23,7 +27,11 @@ RDEPEND="virtual/x11 >=x11-libs/startup-notification-0.7 !x11-misc/expocity" +# Needed for compositor +# 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" |