diff options
author | Karol Wojtaszek <sekretarz@gentoo.org> | 2006-01-03 21:21:40 +0000 |
---|---|---|
committer | Karol Wojtaszek <sekretarz@gentoo.org> | 2006-01-03 21:21:40 +0000 |
commit | bc55e3b119302b7beb25176ffa7fba198e11aeb2 (patch) | |
tree | 6f29cd5ffcfcef2d57decd44f5285cf5be17cab5 /x11-terms | |
parent | New poppler-bindings with gtk/qt bindings for poppler (diff) | |
download | gentoo-2-bc55e3b119302b7beb25176ffa7fba198e11aeb2.tar.gz gentoo-2-bc55e3b119302b7beb25176ffa7fba198e11aeb2.tar.bz2 gentoo-2-bc55e3b119302b7beb25176ffa7fba198e11aeb2.zip |
Add modular X dependencies, bug #115160 by Ben Skeggs
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-terms')
-rw-r--r-- | x11-terms/aterm/ChangeLog | 7 | ||||
-rw-r--r-- | x11-terms/aterm/aterm-1.0.0.ebuild | 20 |
2 files changed, 21 insertions, 6 deletions
diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog index 0cdf25787d61..3be9e77ac157 100644 --- a/x11-terms/aterm/ChangeLog +++ b/x11-terms/aterm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-terms/aterm -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.79 2005/12/28 22:26:12 grobian Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.80 2006/01/03 21:21:40 sekretarz Exp $ + + 03 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org> aterm-1.0.0.ebuild: + Add modular X dependencies, bug #115160 by Ben Skeggs 28 Dec 2005; Fabian Groffen <grobian@gentoo.org> aterm-0.4.2-r7.ebuild, aterm-0.4.2-r9.ebuild, aterm-0.4.2-r11.ebuild, aterm-0.4.2-r12.ebuild, diff --git a/x11-terms/aterm/aterm-1.0.0.ebuild b/x11-terms/aterm/aterm-1.0.0.ebuild index 5faa984040d5..4af2c73bdf85 100644 --- a/x11-terms/aterm/aterm-1.0.0.ebuild +++ b/x11-terms/aterm/aterm-1.0.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-terms/aterm/aterm-1.0.0.ebuild,v 1.3 2005/12/25 15:41:31 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.0.0.ebuild,v 1.4 2006/01/03 21:21:40 sekretarz Exp $ inherit flag-o-matic @@ -13,9 +13,21 @@ SLOT="0" KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="cjk xgetdefault" -DEPEND="media-libs/jpeg +RDEPEND="media-libs/jpeg media-libs/libpng - virtual/x11" + || ( ( x11-libs/libX11 + x11-libs/libXext + x11-libs/libICE + ) + virtual/x11 + )" + +DEPEND="${RDEPEND} + || ( ( x11-libs/libXt + x11-proto/xproto + ) + virtual/x11 + )" src_compile() { local myconf |