Port to modular X.

Package-Manager: portage-2.0.53_rc6

diff --git a/x11-misc/xcompmgr/ChangeLog b/x11-misc/xcompmgr/ChangeLog
index a5dbf4eaf0c4899442006f918d1b5cffc9275729..5d1475483c8b4dd5d3f947fb228bff2ac6fd1f02 100644 (file)
--- a/x11-misc/xcompmgr/ChangeLog
+++ b/x11-misc/xcompmgr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xcompmgr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcompmgr/ChangeLog,v 1.14 2005/08/07 13:15:34 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcompmgr/ChangeLog,v 1.15 2005/10/24 03:27:31 spyderous Exp $
+
+  24 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xcompmgr-1.1.2.ebuild:
+  Port to modular X.
 
   07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> xcompmgr-1.1.ebuild:
   Stable on ppc.

diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index eafce7a6ba96197f4d3eb13072bbbc67e81d29d1..964897c6edac08baddbe5a37796ca0b669aecb3f 100644 (file)
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,9 +1,9 @@
-MD5 f3967a8321ed1d9e2e1e22ba9bb8dc8f xcompmgr-1.1.ebuild 774
-MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 639d42549b3cae5031b98e402b101c44 ChangeLog 2395
-MD5 c213ee6c4fb070f148bbc520e93bd9dd xcompmgr-1.1.1.ebuild 596
-MD5 1d72e7271dc892e7d8628bd19a0bc84f xcompmgr-1.1.2.ebuild 594
-MD5 fcac96a3388e51713ee63c0c8f861c8e files/xcompmgr-fix.diff 832
-MD5 5ebc56e1119bbc9faa58495dac4d0643 files/digest-xcompmgr-1.1.1 66
+MD5 9bc35d60c8be68928f62e5c0c2d77f10 ChangeLog 2500
 MD5 07e5ec00d181e904a58ae4d14a14b7e3 files/digest-xcompmgr-1.1 63
+MD5 5ebc56e1119bbc9faa58495dac4d0643 files/digest-xcompmgr-1.1.1 66
 MD5 abb351442f7f3b3cfb8c001f852632a0 files/digest-xcompmgr-1.1.2 65
+MD5 fcac96a3388e51713ee63c0c8f861c8e files/xcompmgr-fix.diff 832
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 c213ee6c4fb070f148bbc520e93bd9dd xcompmgr-1.1.1.ebuild 596
+MD5 f4a5d00b0cc0756562ab510a285ecf4a xcompmgr-1.1.2.ebuild 720
+MD5 f3967a8321ed1d9e2e1e22ba9bb8dc8f xcompmgr-1.1.ebuild 774

diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.2.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.2.ebuild
index c13c6fdd54c119ffc2c3cc32ad7c397cf2889d72..72b312f5809c3a7e959a3562299b6d0d26f7143d 100644 (file)
--- a/x11-misc/xcompmgr/xcompmgr-1.1.2.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.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-misc/xcompmgr/xcompmgr-1.1.2.ebuild,v 1.1 2005/05/25 11:07:07 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcompmgr/xcompmgr-1.1.2.ebuild,v 1.2 2005/10/24 03:27:31 spyderous Exp $
 
 inherit eutils
 
@@ -14,10 +14,18 @@ SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~x86 ~ppc ~amd64"
 
-RDEPEND=">=x11-base/xorg-x11-6.8.0"
+RDEPEND="|| ( (
+                       x11-libs/libXrender
+                       x11-libs/libXfixes
+                       x11-libs/libXdamage
+                       x11-libs/libXcomposite
+                       )
+                       virtual/x11
+               )"
 
 DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
+       dev-util/pkgconfig
+       !<x11-base/xorg-x11-6.8.0"
 
 src_install() {
        make DESTDIR=${D} install || die