remove old WANT_AUTOCONF

4 files changed, 26 insertions, 31 deletions

diff --git a/app-admin/fam/fam-2.6.10-r1.ebuild b/app-admin/fam/fam-2.6.10-r1.ebuild
index c481fc45da32..3697ef3a607d 100644
--- a/app-admin/fam/fam-2.6.10-r1.ebuild
+++ b/app-admin/fam/fam-2.6.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.6.10-r1.ebuild,v 1.1 2003/12/07 23:19:54 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.6.10-r1.ebuild,v 1.2 2004/01/25 23:34:57 vapier Exp $
 
 IUSE=""
 
@@ -38,8 +38,8 @@ src_unpack() {
 	# This one is old, and automake will install new one
 	rm -rf ${S}/missing
 
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_5=1
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.5
 	aclocal
 	autoconf
 	automake --add-missing
@@ -53,5 +53,5 @@ src_install() {
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/fam
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS TODO README*
+	dodoc AUTHORS ChangeLog INSTALL NEWS TODO README*
 }
diff --git a/app-admin/fam/fam-2.7.0.ebuild b/app-admin/fam/fam-2.7.0.ebuild
index 476b170baa3e..5a282bd8bf40 100644
--- a/app-admin/fam/fam-2.7.0.ebuild
+++ b/app-admin/fam/fam-2.7.0.ebuild
@@ -1,45 +1,37 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0.ebuild,v 1.4 2004/01/16 22:38:19 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0.ebuild,v 1.5 2004/01/25 23:34:57 vapier Exp $
 
 inherit libtool eutils
 
-
 DESCRIPTION="FAM, the File Alteration Monitor"
-SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/fam/"
+SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz"
 
-KEYWORDS="~x86 ppc ~alpha ~sparc ~hppa ~amd64 ~ia64"
-SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-IUSE=""
+SLOT="0"
+KEYWORDS="~x86 ppc ~alpha ~sparc ~hppa ~amd64 ~ia64"
 
 DEPEND=">=net-nds/portmap-5b-r6"
 
 src_unpack() {
-
 	unpack ${A}
-
 	# fix permission problems with user* in FEATURES (#35307)
 	chmod u+w ${S}/configure
-
 }
 
 src_install() {
-
 	einstall || die
 
-	dosed -i -e "s:local_only = false:local_only = true:g" conf/fam.conf
+	dosed "s:local_only = false:local_only = true:g" conf/fam.conf
 
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/famd
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS TODO README
-
 }
 
 pkg_postinst() {
-
 	einfo "To enable fam on  boot you will have to add it to the"
 	einfo "default profile, issue the following command as root to do so."
 	echo
@@ -62,5 +54,4 @@ pkg_postinst() {
 	einfo "rm /etc/init.d/fam"
 	echo
 	einfo "The last command removes the old init script."
-
 }
diff --git a/app-admin/prelude-lml/prelude-lml-0.8.6.ebuild b/app-admin/prelude-lml/prelude-lml-0.8.6.ebuild
index 7066adddb4e3..63a637083f85 100644
--- a/app-admin/prelude-lml/prelude-lml-0.8.6.ebuild
+++ b/app-admin/prelude-lml/prelude-lml-0.8.6.ebuild
@@ -1,14 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/prelude-lml-0.8.6.ebuild,v 1.2 2003/12/20 16:55:24 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/prelude-lml-0.8.6.ebuild,v 1.3 2004/01/25 23:31:15 vapier Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="Prelude-IDS Log Monitoring Lackey"
-HOMEPAGE="http://www.prelude-ids.org"
+HOMEPAGE="http://www.prelude-ids.org/"
 SRC_URI="http://www.prelude-ids.org/download/releases/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE="doc debug"
+
 DEPEND="virtual/glibc
 	!dev-libs/libprelude-cvs
 	!app-admin/prelude-lml-cvs
@@ -16,14 +20,13 @@ DEPEND="virtual/glibc
 	dev-libs/libpcre
 	doc? ( dev-util/gtk-doc )"
 
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${P}
-
 src_compile() {
 	local myconf
 
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --enable-gtk-doc=no"
-	use debug && CFLAGS="$CFLAGS -O0 -ggdb"
+	use doc \
+		&& myconf="${myconf} --enable-gtk-doc" \
+		|| myconf="${myconf} --enable-gtk-doc=no"
+	use debug && append-flags -O -ggdb
 
 	econf ${myconf} || die "econf failed"
 	emake || die "emake failed"
diff --git a/app-admin/prelude-manager/prelude-manager-0.8.10.ebuild b/app-admin/prelude-manager/prelude-manager-0.8.10.ebuild
index b3771e21a3f3..b3255d1ca79a 100644
--- a/app-admin/prelude-manager/prelude-manager-0.8.10.ebuild
+++ b/app-admin/prelude-manager/prelude-manager-0.8.10.ebuild
@@ -1,14 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/prelude-manager-0.8.10.ebuild,v 1.2 2003/12/20 16:53:38 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/prelude-manager-0.8.10.ebuild,v 1.3 2004/01/25 23:32:34 vapier Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="Prelude-IDS Manager"
-HOMEPAGE="http://www.prelude-ids.org"
+HOMEPAGE="http://www.prelude-ids.org/"
 SRC_URI="http://www.prelude-ids.org/download/releases/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE="ssl doc mysql postgres debug"
+
 DEPEND="virtual/glibc
 	!dev-libs/libprelude-cvs
 	!app-admin/prelude-manager-cvs
@@ -18,9 +22,6 @@ DEPEND="virtual/glibc
 	mysql? ( dev-db/mysql )
 	postgres? ( dev-db/postgresql )"
 
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${P}
-
 src_compile() {
 	local myconf
 
@@ -28,7 +29,7 @@ src_compile() {
 	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --enable-gtk-doc=no"
 	use mysql && myconf="${myconf} --enable-mysql" || myconf="${myconf} --enable-mysql=no"
 	use postgres && myconf="${myconf} --enable-postgresql" || myconf="${myconf} --enable-postgresql=no"
-	use debug && CFLAGS="$CFLAGS -O0 -ggdb"
+	use debug && append-flags -O -ggdb
 
 	econf ${myconf} || die "econf failed"
 	emake || die "emake failed"