diff options
author | Donnie Berkholz <spyderous@gentoo.org> | 2005-12-12 05:10:05 +0000 |
---|---|---|
committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-12-12 05:10:05 +0000 |
commit | f64d5d721555a2f9a03314a2bf505e475deaccdc (patch) | |
tree | 5d8134ba6b83627d386f92e05e2ee37462140fce | |
parent | Version bump. (diff) | |
download | gentoo-2-f64d5d721555a2f9a03314a2bf505e475deaccdc.tar.gz gentoo-2-f64d5d721555a2f9a03314a2bf505e475deaccdc.tar.bz2 gentoo-2-f64d5d721555a2f9a03314a2bf505e475deaccdc.zip |
Add modular X dependencies.
(Portage version: 2.0.53)
-rw-r--r-- | media-video/mjpegtools/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild | 9 | ||||
-rw-r--r-- | x11-misc/xrestop/ChangeLog | 5 | ||||
-rw-r--r-- | x11-misc/xrestop/xrestop-0.3.ebuild | 8 |
4 files changed, 22 insertions, 6 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index be33f3f34e71..c1f6a74ef197 100644 --- a/media-video/mjpegtools/ChangeLog +++ b/media-video/mjpegtools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mjpegtools # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.100 2005/11/13 21:06:08 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.101 2005/12/12 05:06:17 spyderous Exp $ + + 12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; + mjpegtools-1.8.0-r1.ebuild: + Add modular X dependencies. 13 Nov 2005; Luca Barbato <lu_zero@gentoo.org> mjpegtools-1.6.2-r4.ebuild, mjpegtools-1.8.0-r1.ebuild: diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild index 412cba4c40a3..e664c4956c36 100644 --- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild +++ b/media-video/mjpegtools/mjpegtools-1.8.0-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/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.3 2005/11/13 21:06:08 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.4 2005/12/12 05:06:17 spyderous Exp $ inherit flag-o-matic toolchain-funcs eutils @@ -24,7 +24,12 @@ RDEPEND="media-libs/jpeg dv? ( >=media-libs/libdv-0.99 ) quicktime? ( virtual/quicktime ) sdl? ( >=media-libs/libsdl-1.2.7-r3 ) - X? ( virtual/x11 )" + X? ( || ( ( x11-libs/libX11 + x11-libs/libXt + ) + virtual/x11 + ) + )" DEPEND="${RDEPEND} x86? ( mmx? ( dev-lang/nasm ) diff --git a/x11-misc/xrestop/ChangeLog b/x11-misc/xrestop/ChangeLog index 6f0fc5758e52..336d91c87794 100644 --- a/x11-misc/xrestop/ChangeLog +++ b/x11-misc/xrestop/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-misc/xrestop # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/ChangeLog,v 1.16 2005/11/10 18:40:48 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/ChangeLog,v 1.17 2005/12/12 05:10:05 spyderous Exp $ + + 12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; xrestop-0.3.ebuild: + Add modular X dependencies. 10 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> xrestop-0.3.ebuild: Stable on sparc wrt #111068 diff --git a/x11-misc/xrestop/xrestop-0.3.ebuild b/x11-misc/xrestop/xrestop-0.3.ebuild index 35ebd71564d3..e3f663a077c6 100644 --- a/x11-misc/xrestop/xrestop-0.3.ebuild +++ b/x11-misc/xrestop/xrestop-0.3.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-misc/xrestop/xrestop-0.3.ebuild,v 1.10 2005/11/10 18:40:48 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.3.ebuild,v 1.11 2005/12/12 05:10:05 spyderous Exp $ IUSE="" @@ -12,7 +12,11 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 ppc sparc x86" -DEPEND="virtual/x11" +DEPEND="|| ( ( x11-libs/libXres + x11-libs/libXt + ) + virtual/x11 + )" src_install () { make DESTDIR="${D}" install || die |