summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-01-22 12:16:40 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-01-22 12:16:40 +0000
commit027c8e9a1867bfd3448cad5c2ad395598d3cddc8 (patch)
treee4f3dc0cde820c4ae45d94931a859ff39226ee91 /x11-plugins
parentnew upstream version. remove 0.7.1 (diff)
downloadgentoo-2-027c8e9a1867bfd3448cad5c2ad395598d3cddc8.tar.gz
gentoo-2-027c8e9a1867bfd3448cad5c2ad395598d3cddc8.tar.bz2
gentoo-2-027c8e9a1867bfd3448cad5c2ad395598d3cddc8.zip
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/wmacpiload-ac/ChangeLog8
-rw-r--r--x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild13
-rw-r--r--x11-plugins/wmacpimon/ChangeLog7
-rw-r--r--x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild15
4 files changed, 33 insertions, 10 deletions
diff --git a/x11-plugins/wmacpiload-ac/ChangeLog b/x11-plugins/wmacpiload-ac/ChangeLog
index 839a1e29b607..5de8f84d64c8 100644
--- a/x11-plugins/wmacpiload-ac/ChangeLog
+++ b/x11-plugins/wmacpiload-ac/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-plugins/wmacpiload-ac
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/ChangeLog,v 1.4 2005/10/01 23:36:11 morfic Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/ChangeLog,v 1.5 2006/01/22 12:14:11 nelchael Exp $
+
+ 22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+ wmacpiload-ac-0.1.2_p3.ebuild:
+ Fixed DEPEND for modular X.
01 Oct 2005; Daniel Goller <morfic@gentoo.org>
wmacpiload-ac-0.1.2_p3.ebuild:
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild
index 2c65dc9718a4..399b4b0c3198 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.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/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild,v 1.4 2005/10/01 23:36:11 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.1.2_p3.ebuild,v 1.5 2006/01/22 12:14:11 nelchael Exp $
MY_P="wmacpiload-0.1.2-ac3"
@@ -12,7 +12,14 @@ SRC_URI="http://perso.wanadoo.fr/acarriou/wmacpiload/${MY_P}.tar.bz2"
# it has a new homepage, but the src_uri is still from the old one. change this
# at the next version bump
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXext
+ x11-libs/libXpm )
+ virtual/x11 )"
+DEPEND="${RDEPEND}
+ || ( x11-proto/xextproto virtual/x11 )"
SLOT="0"
LICENSE="GPL-2"
diff --git a/x11-plugins/wmacpimon/ChangeLog b/x11-plugins/wmacpimon/ChangeLog
index a33a9998b8b0..5a351cd81417 100644
--- a/x11-plugins/wmacpimon/ChangeLog
+++ b/x11-plugins/wmacpimon/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-plugins/wmacpimon
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/ChangeLog,v 1.3 2005/11/07 12:51:07 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/ChangeLog,v 1.4 2006/01/22 12:16:40 nelchael Exp $
+
+ 22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmacpimon-0.2.1.ebuild:
+ Fixed DEPEND for modular X.
07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmacpimon-0.2.1.ebuild:
Wiped out INSTALL from dodoc.
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index 44118d7cebc5..27ca2521c2ce 100644
--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.2.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/wmacpimon/wmacpimon-0.2.1.ebuild,v 1.3 2005/11/07 12:51:07 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild,v 1.4 2006/01/22 12:16:40 nelchael Exp $
inherit eutils
@@ -14,7 +14,16 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86"
-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_unpack()
{