summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2005-12-13 22:45:02 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2005-12-13 22:45:02 +0000
commit0bd1d92e330351e57f4b1f46982e793a790d2084 (patch)
tree150a6ebfe955eb3a4f535cd6eba47fb5ab4f867b /x11-wm
parentNew upstream. (diff)
downloadhistorical-0bd1d92e330351e57f4b1f46982e793a790d2084.tar.gz
historical-0bd1d92e330351e57f4b1f46982e793a790d2084.tar.bz2
historical-0bd1d92e330351e57f4b1f46982e793a790d2084.zip
Modular X deps. Bug #115272
Package-Manager: portage-2.0.53
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/metacity/ChangeLog5
-rw-r--r--x11-wm/metacity/Manifest14
-rw-r--r--x11-wm/metacity/metacity-2.12.2.ebuild12
3 files changed, 26 insertions, 5 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..9e229347fd44 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,9 +1,19 @@
-MD5 d3f4d206745ea3684b4365e86ef62846 ChangeLog 14759
+-----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
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 201338338f4a7a7cc0622079cefdbc4a metacity-2.12.2.ebuild 1500
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 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"