Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

8 files changed, 42 insertions, 57 deletions

diff --git a/x11-plugins/wmdl/ChangeLog b/x11-plugins/wmdl/ChangeLog
index 6c3721f154ce..905606d89f6a 100644
--- a/x11-plugins/wmdl/ChangeLog
+++ b/x11-plugins/wmdl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmdl
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/ChangeLog,v 1.8 2005/08/07 13:00:11 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/ChangeLog,v 1.9 2006/01/24 23:05:37 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmdl-1.4.1.ebuild:
+  Fixed DEPEND for modular X.
 
   07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> wmdl-1.4.1.ebuild:
   Stable on ppc.
diff --git a/x11-plugins/wmdl/wmdl-1.4.1.ebuild b/x11-plugins/wmdl/wmdl-1.4.1.ebuild
index 7664c7476b57..0f168880d139 100644
--- a/x11-plugins/wmdl/wmdl-1.4.1.ebuild
+++ b/x11-plugins/wmdl/wmdl-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/wmdl-1.4.1.ebuild,v 1.12 2005/08/07 13:00:11 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdl/wmdl-1.4.1.ebuild,v 1.13 2006/01/24 23:05:37 nelchael Exp $
 
 inherit eutils
 
@@ -13,11 +13,20 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 
-DEPEND="virtual/libc
-	virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/makefile.diff
 
 }
diff --git a/x11-plugins/wmdots/ChangeLog b/x11-plugins/wmdots/ChangeLog
index 125ed95c961c..9560f7b3de37 100644
--- a/x11-plugins/wmdots/ChangeLog
+++ b/x11-plugins/wmdots/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmdots
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/ChangeLog,v 1.5 2004/10/02 15:46:13 swegener Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/ChangeLog,v 1.6 2006/01/24 23:07:31 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmdots-0.2_beta.ebuild:
+  Fixed DEPEND for modular X.
 
   12 Jun 2003; <msterret@gentoo.org> wmdots-0.2_beta.ebuild:
   fix Header
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
index c97e7f574011..6bdab16c2cd2 100644
--- a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
+++ b/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/wmdots-0.2_beta.ebuild,v 1.9 2004/06/24 23:08:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/wmdots-0.2_beta.ebuild,v 1.10 2006/01/24 23:07:31 nelchael Exp $
 
 MY_P=wmdots-0.2beta
 S=${WORKDIR}/${PN}
@@ -13,16 +13,15 @@ SLOT="0"
 
 IUSE=""
 
-DEPEND="virtual/x11"
-
-
-src_compile() {
-
-	emake || die
-
-}
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}"
 
 src_install () {
 
 	dobin ${S}/wmdots
+
 }
diff --git a/x11-plugins/wmdrawer/ChangeLog b/x11-plugins/wmdrawer/ChangeLog
index 0e5b2bdb0899..bc7301b75b6e 100644
--- a/x11-plugins/wmdrawer/ChangeLog
+++ b/x11-plugins/wmdrawer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmdrawer
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/ChangeLog,v 1.17 2005/11/14 14:33:47 metalgod Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/ChangeLog,v 1.18 2006/01/24 23:09:29 nelchael Exp $
+
+  24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -wmdrawer-0.10.5.ebuild, wmdrawer-0.10.5-r2.ebuild:
+  Fixed DEPEND for modular X.
 
   14 Nov 2005; Luis Medinas <metalgod@gentoo.org> wmdrawer-0.10.5-r2.ebuild:
   Marked Stable on amd64.
diff --git a/x11-plugins/wmdrawer/files/digest-wmdrawer-0.10.5 b/x11-plugins/wmdrawer/files/digest-wmdrawer-0.10.5
deleted file mode 100644
index a66feaac7bf8..000000000000
--- a/x11-plugins/wmdrawer/files/digest-wmdrawer-0.10.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b8c4a5d5abd593a29504dfe4c30c8925 wmdrawer-0.10.5.tar.gz 49413
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild
index 8eaa1cc941f3..c31819e00ea0 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild,v 1.3 2005/11/14 14:33:47 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild,v 1.4 2006/01/24 23:09:29 nelchael Exp $
 
 inherit eutils
 
@@ -13,10 +13,8 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~sparc x86"
 
-DEPEND="virtual/x11
-	gtk? (	>=x11-libs/gtk+-2 )
+DEPEND="gtk? (	>=x11-libs/gtk+-2 )
 	!gtk? ( >=media-libs/gdk-pixbuf-0.22.0 )
-	>=app-arch/gzip-1.3.3-r4
 	>=sys-apps/sed-4"
 
 src_unpack ()
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5.ebuild
deleted file mode 100644
index 2f87a6ce7dc4..000000000000
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/wmdrawer-0.10.5.ebuild,v 1.5 2005/11/07 13:14:54 s4t4n Exp $
-
-IUSE=""
-DESCRIPTION="wmDrawer is a dock application (dockapp) which provides a drawer (retractable button bar) to launch applications"
-SRC_URI="http://people.easter-eggs.org/~valos/wmdrawer/${P}.tar.gz"
-HOMEPAGE="http://people.easter-eggs.org/~valos/wmdrawer/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ~sparc ppc"
-
-DEPEND="virtual/x11
-	>=media-libs/gdk-pixbuf-0.22.0
-	>=app-arch/gzip-1.3.3-r4"
-
-src_compile()
-{
-	emake CFLAGS="${CFLAGS} -Wall `gdk-pixbuf-config --cflags`" \
-		|| die "make failed!"
-}
-
-src_install()
-{
-	dobin wmdrawer
-	dodoc README TODO AUTHORS ChangeLog wmdrawerrc.example
-	gzip -cd doc/wmdrawer.1x.gz > wmdrawer.1
-	doman wmdrawer.1
-}