diff options
| -rw-r--r-- | x11-wm/integrity/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/integrity/integrity-1.0.ebuild | 7 | ||||
| -rw-r--r-- | x11-wm/jwm/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-wm/jwm/jwm-0.21.ebuild | 16 | ||||
| -rw-r--r-- | x11-wm/jwm/jwm-0.22.ebuild | 16 | ||||
| -rw-r--r-- | x11-wm/jwm/jwm-0.23.ebuild | 16 |
6 files changed, 53 insertions, 17 deletions
diff --git a/x11-wm/integrity/ChangeLog b/x11-wm/integrity/ChangeLog index 85ab56f4cf4c..f77c8c1d7bcb 100644 --- a/x11-wm/integrity/ChangeLog +++ b/x11-wm/integrity/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-wm/integrity -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/integrity/ChangeLog,v 1.4 2005/10/02 13:53:05 metalgod Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/integrity/ChangeLog,v 1.5 2006/02/11 11:48:38 nelchael Exp $ + + 11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> integrity-1.0.ebuild: + Fixed DEPEND for modular X. 02 Oct 2005; Luis Medinas <metalgod@gentoo.org> integrity-1.0.ebuild: Added ~amd64 keyword. diff --git a/x11-wm/integrity/integrity-1.0.ebuild b/x11-wm/integrity/integrity-1.0.ebuild index 87a738939f06..fc8a225cb2ae 100644 --- a/x11-wm/integrity/integrity-1.0.ebuild +++ b/x11-wm/integrity/integrity-1.0.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-wm/integrity/integrity-1.0.ebuild,v 1.4 2005/10/02 13:53:05 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/integrity/integrity-1.0.ebuild,v 1.5 2006/02/11 11:48:38 nelchael Exp $ IUSE="" @@ -14,8 +14,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -DEPEND="virtual/x11 - =x11-libs/qt-3*" +DEPEND="=x11-libs/qt-3*" src_compile() { emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die diff --git a/x11-wm/jwm/ChangeLog b/x11-wm/jwm/ChangeLog index 14f895275aa6..e6bdd7c029b4 100644 --- a/x11-wm/jwm/ChangeLog +++ b/x11-wm/jwm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/jwm -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.5 2005/07/01 21:57:27 josejx Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.6 2006/02/11 11:53:34 nelchael Exp $ + + 11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> jwm-0.21.ebuild, + jwm-0.22.ebuild, jwm-0.23.ebuild: + Fixed DEPEND for modular X. 01 Jul 2005; Joseph Jezak <josejx@gentoo.org> jwm-0.21.ebuild: Marked ppc stable for bug #96737. diff --git a/x11-wm/jwm/jwm-0.21.ebuild b/x11-wm/jwm/jwm-0.21.ebuild index 3ccdb9859b42..37476fd32b22 100644 --- a/x11-wm/jwm/jwm-0.21.ebuild +++ b/x11-wm/jwm/jwm-0.21.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-wm/jwm/jwm-0.21.ebuild,v 1.4 2005/07/01 21:57:27 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.21.ebuild,v 1.5 2006/02/11 11:53:34 nelchael Exp $ IUSE="" @@ -12,7 +12,17 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="ppc x86" -DEPEND="virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( ( + x11-proto/xextproto + x11-proto/xproto ) + virtual/x11 )" src_install() { dodir /usr/bin diff --git a/x11-wm/jwm/jwm-0.22.ebuild b/x11-wm/jwm/jwm-0.22.ebuild index e10dc2be12f5..8b4bf0424ac3 100644 --- a/x11-wm/jwm/jwm-0.22.ebuild +++ b/x11-wm/jwm/jwm-0.22.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-wm/jwm/jwm-0.22.ebuild,v 1.1 2005/05/20 04:23:59 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.22.ebuild,v 1.2 2006/02/11 11:53:34 nelchael Exp $ IUSE="" @@ -12,7 +12,17 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~ppc" -DEPEND="virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( ( + x11-proto/xextproto + x11-proto/xproto ) + virtual/x11 )" src_install() { dodir /usr/bin diff --git a/x11-wm/jwm/jwm-0.23.ebuild b/x11-wm/jwm/jwm-0.23.ebuild index 9a6d3e94591b..34fb1904bf7a 100644 --- a/x11-wm/jwm/jwm-0.23.ebuild +++ b/x11-wm/jwm/jwm-0.23.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-wm/jwm/jwm-0.23.ebuild,v 1.1 2005/05/28 18:46:25 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.23.ebuild,v 1.2 2006/02/11 11:53:34 nelchael Exp $ IUSE="" @@ -12,7 +12,17 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~ppc" -DEPEND="virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( ( + x11-proto/xextproto + x11-proto/xproto ) + virtual/x11 )" src_install() { dodir /usr/bin |