diff options
author | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-03-10 23:07:03 +0000 |
---|---|---|
committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-03-10 23:07:03 +0000 |
commit | 08db79dee4255a5bd395aa11d3bf74cff7567c42 (patch) | |
tree | c72cc70403fe79f17ec670d0d98a89082ad25410 /x11-terms | |
parent | Mark 3.3-r1 stable on ia64. #115177 (diff) | |
download | gentoo-2-08db79dee4255a5bd395aa11d3bf74cff7567c42.tar.gz gentoo-2-08db79dee4255a5bd395aa11d3bf74cff7567c42.tar.bz2 gentoo-2-08db79dee4255a5bd395aa11d3bf74cff7567c42.zip |
Fix dependencies for modular X (bug #124461).
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'x11-terms')
-rw-r--r-- | x11-terms/multi-aterm/ChangeLog | 8 | ||||
-rw-r--r-- | x11-terms/multi-aterm/multi-aterm-0.1.ebuild | 6 | ||||
-rw-r--r-- | x11-terms/multi-aterm/multi-aterm-0.2.1.ebuild | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/x11-terms/multi-aterm/ChangeLog b/x11-terms/multi-aterm/ChangeLog index 07baaf92bfa4..b4f357d8fbe7 100644 --- a/x11-terms/multi-aterm/ChangeLog +++ b/x11-terms/multi-aterm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-terms/multi-aterm -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/ChangeLog,v 1.18 2005/09/17 10:11:43 agriffis Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/ChangeLog,v 1.19 2006/03/10 23:07:02 joshuabaergen Exp $ + + 10 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org> + multi-aterm-0.1.ebuild, multi-aterm-0.2.1.ebuild: + Fix dependencies for modular X (bug #124461). 17 Sep 2005; Aron Griffis <agriffis@gentoo.org> multi-aterm-0.2.1.ebuild: Mark 0.2.1 stable on alpha diff --git a/x11-terms/multi-aterm/multi-aterm-0.1.ebuild b/x11-terms/multi-aterm/multi-aterm-0.1.ebuild index 9e0fc2d6f456..05f32f41cd2b 100644 --- a/x11-terms/multi-aterm/multi-aterm-0.1.ebuild +++ b/x11-terms/multi-aterm/multi-aterm-0.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-terms/multi-aterm/multi-aterm-0.1.ebuild,v 1.13 2005/02/05 11:16:52 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/multi-aterm-0.1.ebuild,v 1.14 2006/03/10 23:07:03 joshuabaergen Exp $ DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility like aterm, with tab support" HOMEPAGE="http://www.nongnu.org/materm/materm.html" @@ -13,7 +13,7 @@ KEYWORDS="x86 amd64 ppc sparc ~alpha hppa ~mips" DEPEND="media-libs/jpeg media-libs/libpng - virtual/x11 + || ( x11-libs/Xpm virtual/x11 ) >=sys-apps/sed-4" src_compile() { diff --git a/x11-terms/multi-aterm/multi-aterm-0.2.1.ebuild b/x11-terms/multi-aterm/multi-aterm-0.2.1.ebuild index 327ba9fe9c4d..968387f87fc9 100644 --- a/x11-terms/multi-aterm/multi-aterm-0.2.1.ebuild +++ b/x11-terms/multi-aterm/multi-aterm-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-terms/multi-aterm/multi-aterm-0.2.1.ebuild,v 1.7 2005/09/17 10:11:43 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/multi-aterm-0.2.1.ebuild,v 1.8 2006/03/10 23:07:03 joshuabaergen Exp $ inherit eutils @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86" -RDEPEND="virtual/x11 +RDEPEND="|| ( x11-libs/Xpm virtual/x11 ) jpeg? ( media-libs/jpeg ) png? ( media-libs/libpng )" DEPEND="${RDEPEND} |