modular depends

Package-Manager: portage-2.1_pre3-r1

3 files changed, 29 insertions, 14 deletions

diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index db83d880c304..cab3e7a70c04 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,12 +1,12 @@
-MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 b431e416a23bf30a428e32a1bcc37d58 ChangeLog 6802
-MD5 09060b502ee9e88b9794587d7b28c643 xosd-2.2.10.ebuild 1037
-MD5 10956efe64cdc5b4c856238685592839 xosd-2.2.8-r1.ebuild 1033
-MD5 556c8fc6e7bca931c6883bb62128d8fb xosd-2.2.14.ebuild 1554
-MD5 5cc83e3e259529faf0fd390e9d8b7d04 files/xosd-2.2.14-m4.patch 242
-MD5 7a327614154b7eb25a641f0ad4bdec90 files/xosd-2.2.14-bmp-fixes.patch 11472
-MD5 9ee14940cb0d412247cc9a15d989cd93 files/digest-xosd-2.2.14 199
-MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63
 MD5 5b6bffe8689739aff9d0eb219cc443d8 files/2.2.8-xmms-trackpos.patch 5167
-MD5 c06ab555d3db962ce6e7d8bfe88940b9 files/digest-xosd-2.2.10 64
 MD5 1132764268b2645df6a9a3ba6bf06e4d files/bmp-dlg_config.patch 403
+MD5 c06ab555d3db962ce6e7d8bfe88940b9 files/digest-xosd-2.2.10 64
+MD5 9ee14940cb0d412247cc9a15d989cd93 files/digest-xosd-2.2.14 199
+MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63
+MD5 7a327614154b7eb25a641f0ad4bdec90 files/xosd-2.2.14-bmp-fixes.patch 11472
+MD5 5cc83e3e259529faf0fd390e9d8b7d04 files/xosd-2.2.14-m4.patch 242
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 09060b502ee9e88b9794587d7b28c643 xosd-2.2.10.ebuild 1037
+MD5 d1b589cc120857e7f6160dffd81a9d6b xosd-2.2.14.ebuild 1734
+MD5 bb3a182987473e7a1274f3e7652c485c xosd-2.2.8-r1.ebuild 1144
diff --git a/x11-libs/xosd/xosd-2.2.14.ebuild b/x11-libs/xosd/xosd-2.2.14.ebuild
index feeb9d84e08e..7360eebcdbe3 100644
--- a/x11-libs/xosd/xosd-2.2.14.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14.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-libs/xosd/xosd-2.2.14.ebuild,v 1.6 2005/08/07 11:34:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14.ebuild,v 1.7 2006/01/08 01:37:59 genstef Exp $
 
 inherit eutils
 
@@ -15,7 +15,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="xinerama xmms bmp"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libXext )
+	virtual/x11 )
 	bmp? (
 		media-sound/beep-media-player
 	)
@@ -24,7 +26,14 @@ RDEPEND="virtual/x11
 		>=media-libs/gdk-pixbuf-0.22.0
 	)"
 
-DEPEND="${RDEPEND}
+DEPEND="|| ( (
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xproto )
+	virtual/x11 )
+	${RDEPEND}
 	>=sys-devel/autoconf-2.57
 	>=sys-devel/automake-1.8"
 
diff --git a/x11-libs/xosd/xosd-2.2.8-r1.ebuild b/x11-libs/xosd/xosd-2.2.8-r1.ebuild
index 3262351bcb45..efd118687579 100644
--- a/x11-libs/xosd/xosd-2.2.8-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.8-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/x11-libs/xosd/xosd-2.2.8-r1.ebuild,v 1.8 2005/05/22 19:07:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.8-r1.ebuild,v 1.9 2006/01/08 01:37:59 genstef Exp $
 
 inherit eutils
 
@@ -14,7 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
 
-DEPEND="virtual/x11
+DEPEND="|| ( (
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto )
+	virtual/x11 )
 	xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )"
 
 src_unpack() {