summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-03-22 03:48:38 +0000
committerMike Frysinger <vapier@gentoo.org>2004-03-22 03:48:38 +0000
commitde46cff7dbaa0d338c082579ee9de9b42fa2eae1 (patch)
tree07c63babaf1786a28a06cd4eee5fbac695e66e85 /sys-apps
parentI think we all learned a little something about debug today (Manifest recommit) (diff)
downloadgentoo-2-de46cff7dbaa0d338c082579ee9de9b42fa2eae1.tar.gz
gentoo-2-de46cff7dbaa0d338c082579ee9de9b42fa2eae1.tar.bz2
gentoo-2-de46cff7dbaa0d338c082579ee9de9b42fa2eae1.zip
clean up the ebuild
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/findutils/findutils-4.1.20-r1.ebuild45
1 files changed, 20 insertions, 25 deletions
diff --git a/sys-apps/findutils/findutils-4.1.20-r1.ebuild b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
index d75a8d133113..aaee75c42e2b 100644
--- a/sys-apps/findutils/findutils-4.1.20-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
@@ -1,14 +1,13 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.10 2004/03/09 23:37:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.11 2004/03/22 03:48:38 vapier Exp $
-IUSE="nls build afs selinux"
+inherit eutils flag-o-matic
-inherit eutils
+SELINUX_PATCH="findutils-4.1.20-selinux.diff.bz2"
DESCRIPTION="GNU utilities to find files"
HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-
# Note this doesn't point to gnu.org because alpha.gnu.org has quit
# supplying the development versions. If it comes back in the future
# then we might want to redirect the link. See bug 18729
@@ -18,8 +17,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
KEYWORDS="x86 amd64 ppc sparc hppa alpha ia64 ppc64"
SLOT="0"
LICENSE="GPL-2"
-
-SELINUX_PATCH="findutils-4.1.20-selinux.diff.bz2"
+IUSE="nls build afs selinux"
DEPEND="virtual/glibc
>=sys-apps/sed-4
@@ -32,7 +30,14 @@ src_unpack() {
unpack ${A}
cd ${S}
- [ "${ARCH}" = "ppc64" ] && libtoolize -c -f
+ if [ "${ARCH}" == "ppc64" ] || [ "${ARCH}" == "sh" ] ; then
+ # need to make sure the autotool files are updated to support
+ # these architectures
+ libtoolize -c -f || die "libtool failed"
+ aclocal || die "aclocal failed"
+ automake -c -f -a || die "automake failed"
+ autoconf || die "autoconf failed"
+ fi
# Don't build or install locate because it conflicts with slocate,
# which is a secure version of locate. See bug 18729
@@ -45,35 +50,25 @@ src_unpack() {
}
src_compile() {
- local myconf=
-
- use nls || myconf="${myconf} --disable-nls"
-
- if use afs; then
- export CPPFLAGS=-I/usr/afsws/include
- export LDFLAGS=-lpam
+ if use afs ; then
+ append-flags -I/usr/afsws/include
+ append-ldflags -lpam
export LIBS=/usr/afsws/lib/pam_afs.so.1
fi
+ export CPPFLAGS="${CXXFLAGS}"
- ./configure \
- --host=${CHOST} \
- --prefix=/usr \
- ${myconf} || die
-
+ econf `use_enable nls` || die
emake libexecdir=/usr/lib/find || die
}
src_install() {
einstall libexecdir=${D}/usr/lib/find || die
-
prepallman
rm -rf ${D}/usr/var
- if ! use build; then
- dodoc COPYING NEWS README TODO ChangeLog
- else
- rm -rf ${D}/usr/share
- fi
+ use build \
+ && rm -rf ${D}/usr/share \
+ || dodoc NEWS README TODO ChangeLog
}
pkg_postinst() {