touchups

1 files changed, 25 insertions, 29 deletions

diff --git a/app-admin/aide/aide-0.9.ebuild b/app-admin/aide/aide-0.9.ebuild
index e81323d6bfcd..646462061eba 100644
--- a/app-admin/aide/aide-0.9.ebuild
+++ b/app-admin/aide/aide-0.9.ebuild
@@ -1,62 +1,58 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/aide/aide-0.9.ebuild,v 1.5 2003/02/13 05:12:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/aide/aide-0.9.ebuild,v 1.6 2003/02/21 23:49:23 vapier Exp $
 
-IUSE="nls postgres zlib crypt"
+inherit eutils
 
-S=${WORKDIR}/${P}
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a free replacement for Tripwire"
+DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
 HOMEPAGE="http://www.cs.tut.fi/~rammer/aide.html"
 SRC_URI="http://www.cs.tut.fi/~rammer/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc sparc "
+KEYWORDS="~x86 ~ppc sparc"
+IUSE="nls postgres zlib crypt"
 
-DEPEND="sys-apps/gzip 
-	sys-devel/bison 
+DEPEND="sys-apps/gzip
+	sys-devel/bison
 	sys-devel/flex
-	dev-libs/libgcrypt
 	app-crypt/mhash
 	crypt? ( dev-libs/libgcrypt )
-	postgres? ( dev-db/postgresql )"
-
+	postgres? ( dev-db/postgresql )
+	zlib? ( sys-libs/zlib )"
 RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	
 	cd ${S}
-	patch -p0 <${FILESDIR}/${PF}-gentoo.diff || die
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 }
 
 src_compile() {
-
-	local myconf
-	use postgres && myconf="${myconf} --with-psql"
-	use nls &&  myconf="${myconf} --with-locale"
-	use zlib &&  myconf="${myconf} --with-zlib"
-	use crypt &&  myconf="${myconf} --with-gcrypt"
-
+	# passing --without-psql or --with-psql causes postgres to be enabled ...
+	# it's a broken configure.in file ... so lets just work around it
+	local myconf=""
+	use postgres && myconf="--with-psql"
 
 	econf \
-		--with-zlib \
-		--sysconfdir=/etc/aide \
+		`use_with zlib` \
+		`use_with nls locale` \
+		`use_with crypt gcrypt` \
 		--with-mhash \
+		--sysconfdir=/etc/aide \
 		--with-extra-lib=/usr/lib \
-		${myconf} || die
-	
+		${myconf}
+		|| die
 	emake || die
 }
 
 src_install() {
+	einstall || die
+	use nls || rm -rf ${D}/usr/lib/locale
 
-	make prefix=${D}/usr mandir=${D}/usr/share/man  install || die
+	insinto /etc/aide
+	doins doc/aide.conf
 
-	dodir /etc/aide
-	cp doc/aide.conf ${D}/etc/aide
-
-	dodoc AUTHORS COPYING INSTALL NEWS README 
+	dodoc AUTHORS NEWS README 
 	dohtml doc/manual.html
-
 }