tidy

10 files changed, 8 insertions, 209 deletions

diff --git a/net-analyzer/prelude-nids/ChangeLog b/net-analyzer/prelude-nids/ChangeLog
index 925e6bab5705..115a16759955 100644
--- a/net-analyzer/prelude-nids/ChangeLog
+++ b/net-analyzer/prelude-nids/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/prelude-nids
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/ChangeLog,v 1.14 2004/07/01 20:14:52 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/ChangeLog,v 1.15 2004/07/14 08:31:36 eldad Exp $
+
+  14 Jul 2004; Eldad Zack <eldad@gentoo.org> -prelude-nids-0.8.1-r1.ebuild,
+  -prelude-nids-0.8.1.ebuild, -prelude-nids-0.8.4.ebuild,
+  -prelude-nids-0.8.5.ebuild, prelude-nids-0.8.6.ebuild:
+  Replaced MAKEOPTS override with emake -j1, Purged old unstable ebuilds
 
   01 Jul 2004; Jon Hood <squinky86@gentoo.org> prelude-nids-0.8.4.ebuild,
   prelude-nids-0.8.5.ebuild, prelude-nids-0.8.6.ebuild:
diff --git a/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.1 b/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.1
deleted file mode 100644
index 8c402c395ac6..000000000000
--- a/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ffaa17e6694f12b8d5ede91c1fbdf22d prelude-nids-0.8.1.tar.gz 658730
diff --git a/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.1-r1 b/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.1-r1
deleted file mode 100644
index 8c402c395ac6..000000000000
--- a/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ffaa17e6694f12b8d5ede91c1fbdf22d prelude-nids-0.8.1.tar.gz 658730
diff --git a/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.4 b/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.4
deleted file mode 100644
index a40d914392d9..000000000000
--- a/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6b2a49793c0db5d309a769de2706888 prelude-nids-0.8.4.tar.gz 829701
diff --git a/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.5 b/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.5
deleted file mode 100644
index eb523055dfe9..000000000000
--- a/net-analyzer/prelude-nids/files/digest-prelude-nids-0.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 02c6d7cbbbd57df4a16b3a3e1b80f20d prelude-nids-0.8.5.tar.gz 830077
diff --git a/net-analyzer/prelude-nids/prelude-nids-0.8.1-r1.ebuild b/net-analyzer/prelude-nids/prelude-nids-0.8.1-r1.ebuild
deleted file mode 100644
index d283e2052345..000000000000
--- a/net-analyzer/prelude-nids/prelude-nids-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/prelude-nids-0.8.1-r1.ebuild,v 1.8 2004/06/24 22:16:17 agriffis Exp $
-
-DESCRIPTION="Prelude-IDS NIDS"
-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 ~sparc"
-IUSE="doc"
-RDEPEND="!dev-libs/libprelude-cvs
-	!net-analyzer/prelude-nids-cvs
-	dev-libs/libprelude
-	doc? ( dev-util/gtk-doc )"
-
-DEPEND="${RDEPEND} >=sys-devel/autoconf-2.58"
-
-src_compile() {
-	local myconf
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.6
-	export MAKEOPTS=""	# Doesn't compile if you using make -j
-
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --enable-gtk-doc=no"
-
-	aclocal -I /usr/share/aclocal
-	autoconf
-	autoheader
-	libtoolize -c --force --ltdl --automake
-	automake --gnu -a -c
-	cd libltdl
-	mv configure.in configure.in.tmp
-	echo "AC_PREREQ(2.50)" > configure.in
-	cat configure.in.tmp >> configure.in
-	rm -f configure.in.tmp
-	aclocal -I /usr/share/aclocal
-	autoconf
-	autoheader
-	libtoolize -c --force --ltdl --automake
-	automake --gnu -a -c
-	cd ..
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	insinto /etc/init.d
-	insopts -m 755
-	newins ${FILESDIR}/gentoo.init prelude-nids
-	insinto /etc/conf.d
-	insopts -m 644
-	newins ${FILESDIR}/gentoo.conf prelude-nids
-	into /usr/libexec/prelude
-	insopts -m 755
-	doins plugins/detects/snortrules/ruleset/convert_ruleset
-	into /usr/share/prelude/ruleset
-	mv ${D}/etc/prelude-nids/ruleset ${D}/usr/share/prelude/ruleset/nids
-	dosym /usr/share/prelude/ruleset/nids /etc/prelude-nids/ruleset
-}
diff --git a/net-analyzer/prelude-nids/prelude-nids-0.8.1.ebuild b/net-analyzer/prelude-nids/prelude-nids-0.8.1.ebuild
deleted file mode 100644
index 476425893ccb..000000000000
--- a/net-analyzer/prelude-nids/prelude-nids-0.8.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/prelude-nids-0.8.1.ebuild,v 1.6 2004/06/24 22:16:17 agriffis Exp $
-
-DESCRIPTION="Prelude-IDS NIDS"
-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"
-RDEPEND="!dev-libs/libprelude-cvs
-	!net-analyzer/prelude-nids-cvs
-	dev-libs/libprelude
-	doc? ( dev-util/gtk-doc )"
-
-DEPEND="${RDEPEND} >=sys-devel/autoconf-2.58"
-
-src_compile() {
-	local myconf
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.6
-	export MAKEOPTS=""	# Doesn't compile if you using make -j
-
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-
-	aclocal -I /usr/share/aclocal
-	autoconf
-	autoheader
-	libtoolize -c --force --ltdl --automake
-	automake --gnu -a -c
-	cd libltdl
-	mv configure.in configure.in.tmp
-	echo "AC_PREREQ(2.50)" > configure.in
-	cat configure.in.tmp >> configure.in
-	rm -f configure.in.tmp
-	aclocal -I /usr/share/aclocal
-	autoconf
-	autoheader
-	libtoolize -c --force --ltdl --automake
-	automake --gnu -a -c
-	cd ..
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	insinto /etc/init.d
-	insopts -m 755
-	newins ${FILESDIR}/gentoo.init prelude-nids
-	insinto /etc/conf.d
-	insopts -m 644
-	newins ${FILESDIR}/gentoo.conf prelude-nids
-}
diff --git a/net-analyzer/prelude-nids/prelude-nids-0.8.4.ebuild b/net-analyzer/prelude-nids/prelude-nids-0.8.4.ebuild
deleted file mode 100644
index 51e258b9aa60..000000000000
--- a/net-analyzer/prelude-nids/prelude-nids-0.8.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/prelude-nids-0.8.4.ebuild,v 1.5 2004/07/01 20:14:52 squinky86 Exp $
-
-DESCRIPTION="Prelude-IDS NIDS"
-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 ~sparc"
-IUSE="doc"
-DEPEND="virtual/libc
-	!dev-libs/libprelude-cvs
-	!net-analyzer/prelude-nids-cvs
-	dev-libs/libprelude
-	doc? ( dev-util/gtk-doc )"
-
-src_compile() {
-	local myconf
-	export MAKEOPTS=""	# Doesn't compile if you using make -j
-
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --enable-gtk-doc=no"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	insinto /etc/init.d
-	insopts -m 755
-	newins ${FILESDIR}/gentoo.init prelude-nids
-	insinto /etc/conf.d
-	insopts -m 644
-	newins ${FILESDIR}/gentoo.conf prelude-nids
-	into /usr/libexec/prelude
-	insopts -m 755
-	doins plugins/detects/snortrules/ruleset/convert_ruleset
-	into /usr/share/prelude/ruleset
-	mv ${D}/etc/prelude-nids/ruleset ${D}/usr/share/prelude/ruleset/nids
-	dosym /usr/share/prelude/ruleset/nids /etc/prelude-nids/ruleset
-}
diff --git a/net-analyzer/prelude-nids/prelude-nids-0.8.5.ebuild b/net-analyzer/prelude-nids/prelude-nids-0.8.5.ebuild
deleted file mode 100644
index c67bf9b5ef86..000000000000
--- a/net-analyzer/prelude-nids/prelude-nids-0.8.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/prelude-nids-0.8.5.ebuild,v 1.5 2004/07/01 20:14:52 squinky86 Exp $
-
-DESCRIPTION="Prelude-IDS NIDS"
-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 ~sparc"
-IUSE="doc debug"
-DEPEND="virtual/libc
-	!dev-libs/libprelude-cvs
-	!net-analyzer/prelude-nids-cvs
-	dev-libs/libprelude
-	doc? ( dev-util/gtk-doc )"
-
-src_compile() {
-	local myconf
-	export MAKEOPTS=""	# Doesn't compile if you using make -j
-
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --enable-gtk-doc=no"
-	use debug && CFLAGS="$CFLAGS -O0 -ggdb"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	insinto /etc/init.d
-	insopts -m 755
-	newins ${FILESDIR}/gentoo.init prelude-nids
-	insinto /etc/conf.d
-	insopts -m 644
-	newins ${FILESDIR}/gentoo.conf prelude-nids
-	into /usr/libexec/prelude
-	insopts -m 755
-	doins plugins/detects/snortrules/ruleset/convert_ruleset
-	into /usr/share/prelude/ruleset
-	mv ${D}/etc/prelude-nids/ruleset ${D}/usr/share/prelude/ruleset/nids
-	dosym /usr/share/prelude/ruleset/nids /etc/prelude-nids/ruleset
-}
diff --git a/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild b/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild
index 711e58c8c005..e0513da57104 100644
--- a/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild
+++ b/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild,v 1.6 2004/07/01 20:14:52 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild,v 1.7 2004/07/14 08:31:36 eldad Exp $
 
 inherit flag-o-matic
 
@@ -21,13 +21,12 @@ DEPEND="virtual/libc
 
 src_compile() {
 	local myconf
-	export MAKEOPTS=""	# Doesn't compile if you using make -j
 
 	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"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {