diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2005-12-30 10:22:02 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2005-12-30 10:22:02 +0000 |
| commit | 9ac21e7455d6c407014d85ad86f1af6ad8f30029 (patch) | |
| tree | 54b26443e56a6f3ee05e7bd4e9ec336f0a5ac18a /x11-libs/Xaw3d | |
| parent | Version bump (diff) | |
| download | gentoo-2-9ac21e7455d6c407014d85ad86f1af6ad8f30029.tar.gz gentoo-2-9ac21e7455d6c407014d85ad86f1af6ad8f30029.tar.bz2 gentoo-2-9ac21e7455d6c407014d85ad86f1af6ad8f30029.zip | |
Fixing modular X depends as per requested. Bug #117166
(Portage version: 2.1_pre2)
Diffstat (limited to 'x11-libs/Xaw3d')
| -rw-r--r-- | x11-libs/Xaw3d/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild | 26 |
2 files changed, 16 insertions, 15 deletions
diff --git a/x11-libs/Xaw3d/ChangeLog b/x11-libs/Xaw3d/ChangeLog index 6c6d39d8c811..856eca970122 100644 --- a/x11-libs/Xaw3d/ChangeLog +++ b/x11-libs/Xaw3d/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/Xaw3d # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/Xaw3d/ChangeLog,v 1.21 2005/12/18 17:33:01 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/Xaw3d/ChangeLog,v 1.22 2005/12/30 10:22:02 cardoe Exp $ + + 30 Dec 2005; Doug Goldstein <cardoe@gentoo.org> Xaw3d-1.5-r1.ebuild: + Fixing modular X depends as per requested. Bug #117166 18 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; Xaw3d-1.5-r1.ebuild: (#115920) Add gccmakedep to DEPEND. diff --git a/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild b/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild index 0656187d741c..e147508f9aec 100644 --- a/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild +++ b/x11-libs/Xaw3d/Xaw3d-1.5-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/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild,v 1.29 2005/12/18 17:33:01 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild,v 1.30 2005/12/30 10:22:02 cardoe Exp $ # Ok, hopefully this will resolv the problem with the version of libXaw3d that # gets created. @@ -31,20 +31,18 @@ IUSE="" # There _might_ be something else, but I doubt it. RDEPEND="|| ( ( x11-libs/libXt - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXp - ) - virtual/x11 - )" + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXp ) + virtual/x11 )" + DEPEND="${RDEPEND} >=sys-apps/sed-4 - || ( ( x11-proto/xextproto - x11-misc/gccmakedep - ) - virtual/x11 - )" + || ( ( x11-proto/xextproto + x11-misc/imake + x11-misc/gccmakedep ) + virtual/x11 )" src_unpack() { unpack ${P}.tar.gz @@ -73,7 +71,7 @@ src_compile() { } src_install() { - make DESTDIR=${D} install || die + make DESTDIR="${D}" install || die dodoc README.XAW3D } |