summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2004-04-27 23:54:54 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2004-04-27 23:54:54 +0000
commit15a5e7dcc960a8a4ae3fa8904430a7eb69dc1f09 (patch)
tree5ffa2c1c73d9aa84ab1171d188a58211b6ab0002 /app-text/tree
parentmake sure we have the correct version of autoconf (Manifest recommit) (diff)
downloadgentoo-2-15a5e7dcc960a8a4ae3fa8904430a7eb69dc1f09.tar.gz
gentoo-2-15a5e7dcc960a8a4ae3fa8904430a7eb69dc1f09.tar.bz2
gentoo-2-15a5e7dcc960a8a4ae3fa8904430a7eb69dc1f09.zip
compile fix for gcc 3.4 (bug #49210); error check; tidy
Diffstat (limited to 'app-text/tree')
-rw-r--r--app-text/tree/ChangeLog5
-rw-r--r--app-text/tree/tree-1.4.ebuild31
2 files changed, 22 insertions, 14 deletions
diff --git a/app-text/tree/ChangeLog b/app-text/tree/ChangeLog
index fc47c1db2f48..cd277cb29e59 100644
--- a/app-text/tree/ChangeLog
+++ b/app-text/tree/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-text/tree
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.12 2004/03/12 08:30:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.13 2004/04/27 23:54:54 mr_bones_ Exp $
+
+ 27 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> tree-1.4.ebuild:
+ compile fix for gcc 3.4 (bug #49210); error check; tidy
12 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml,
tree-1.3.ebuild, tree-1.4.ebuild:
diff --git a/app-text/tree/tree-1.4.ebuild b/app-text/tree/tree-1.4.ebuild
index 97243b095b60..27c0b7affce9 100644
--- a/app-text/tree/tree-1.4.ebuild
+++ b/app-text/tree/tree-1.4.ebuild
@@ -1,34 +1,39 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.4.ebuild,v 1.7 2004/03/12 08:30:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.4.ebuild,v 1.8 2004/04/27 23:54:54 mr_bones_ Exp $
-NV="${PV}b3"
+MY_PV="${PV}b3"
DESCRIPTION="Lists directories recursively, and produces an indented listing of files."
HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-SRC_URI="ftp://mama.indstate.edu/linux/tree/${PN}-${NV}.tgz"
+SRC_URI="ftp://mama.indstate.edu/linux/tree/${PN}-${MY_PV}.tgz"
LICENSE="Artistic"
SLOT="0"
KEYWORDS="x86 ~ppc sparc alpha amd64"
IUSE=""
-DEPEND="virtual/glibc"
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4"
src_unpack() {
- unpack ${PN}-${NV}.tgz
- cd ${S} && \
+ unpack ${A}
+ cd ${S}
sed -i \
- -e "s/-O2 -Wall -fomit-frame-pointer/${CFLAGS}/" Makefile || \
- die "sed Makefile failed"
+ -e 's/-O2 -Wall -fomit-frame-pointer/$(E_CFLAGS)/' Makefile \
+ || die "sed Makefile failed"
+ # fix for bug #49210
+ sed -i \
+ -e '1085 s/$/;/' tree.c \
+ || die "sed tree.c failed"
}
src_compile() {
- emake || die
+ emake E_CFLAGS="${CFLAGS}" || die "emake failed"
}
-src_install () {
- insinto /usr/bin
- dobin tree
+src_install() {
+ dobin tree || die "dobin failed"
doman tree.1
- dodoc CHANGES LICENSE README*
+ dodoc CHANGES README*
}