summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-01-24 22:21:17 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-01-24 22:21:17 +0000
commit7664fc5214eae228fc4ab6a6b854ef792317b69f (patch)
treebcbbcef2899fc52555eb924bb8afe1c396dfcf91 /x11-plugins/wmbinclock
parentadded to ~amd64 (diff)
downloadgentoo-2-7664fc5214eae228fc4ab6a6b854ef792317b69f.tar.gz
gentoo-2-7664fc5214eae228fc4ab6a6b854ef792317b69f.tar.bz2
gentoo-2-7664fc5214eae228fc4ab6a6b854ef792317b69f.zip
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-plugins/wmbinclock')
-rw-r--r--x11-plugins/wmbinclock/ChangeLog8
-rw-r--r--x11-plugins/wmbinclock/files/digest-wmbinclock-0.11
-rw-r--r--x11-plugins/wmbinclock/wmbinclock-0.1.ebuild27
-rw-r--r--x11-plugins/wmbinclock/wmbinclock-0.3.ebuild15
4 files changed, 18 insertions, 33 deletions
diff --git a/x11-plugins/wmbinclock/ChangeLog b/x11-plugins/wmbinclock/ChangeLog
index e17fa0cca0a3..86ccd80b95ed 100644
--- a/x11-plugins/wmbinclock/ChangeLog
+++ b/x11-plugins/wmbinclock/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-plugins/wmbinclock
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/ChangeLog,v 1.8 2004/11/24 04:58:44 weeve Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/ChangeLog,v 1.9 2006/01/24 22:21:17 nelchael Exp $
+
+ 24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wmbinclock-0.1.ebuild,
+ wmbinclock-0.3.ebuild:
+ Fixed DEPEND for modular X.
23 Nov 2004; Jason Wever <weeve@gentoo.org> wmbinclock-0.3.ebuild:
Added ~sparc keyword.
diff --git a/x11-plugins/wmbinclock/files/digest-wmbinclock-0.1 b/x11-plugins/wmbinclock/files/digest-wmbinclock-0.1
deleted file mode 100644
index b8bf27201ae4..000000000000
--- a/x11-plugins/wmbinclock/files/digest-wmbinclock-0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83bc44148870b04a9d6588c7e0558058 wmbinclock-0.1.tar.gz 5698
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild
deleted file mode 100644
index ed284cc39356..000000000000
--- a/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/wmbinclock-0.1.ebuild,v 1.8 2004/07/22 00:11:43 s4t4n Exp $
-
-IUSE=""
-
-S="${WORKDIR}/wmBinClock"
-HOMEPAGE="http://www.inxsoft.net/wmbinclock"
-DESCRIPTION="wmbinclock shows the actual system time as a binary clock"
-SRC_URI="http://www.inxsoft.net/wmbinclock/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="freedist"
-KEYWORDS="x86 amd64 ppc"
-
-DEPEND="virtual/x11"
-
-src_compile() {
- myconf=""
- emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
- dodoc README
- dodir /usr/bin
- make DESTDIR=${D}/usr install || die
-}
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild
index e656fdda7da3..ba5a1667990e 100644
--- a/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.3.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/wmbinclock/wmbinclock-0.3.ebuild,v 1.5 2004/11/24 04:58:44 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbinclock/wmbinclock-0.3.ebuild,v 1.6 2006/01/24 22:21:17 nelchael Exp $
IUSE=""
@@ -12,7 +12,16 @@ SLOT="0"
LICENSE="freedist"
KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
-DEPEND="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_compile()
{