*** empty log message ***

7 files changed, 121 insertions, 31 deletions

diff --git a/app-admin/prelude-lml/ChangeLog b/app-admin/prelude-lml/ChangeLog
index c8f3b0efd0db..3bbf76175020 100644
--- a/app-admin/prelude-lml/ChangeLog
+++ b/app-admin/prelude-lml/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for app-admin/prelude-lml
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/ChangeLog,v 1.1 2003/06/21 17:05:10 solar Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/ChangeLog,v 1.1.1.1 2005/11/30 10:00:14 chriswhite Exp $
+
+  25 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  prelude-lml-0.9.0.ebuild:
+  Depend on >=dev-libs/libprelude-0.9.0.
+
+*prelude-lml-0.9.0 (23 Sep 2005)
+
+  23 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -prelude-lml-0.9.0_rc5.ebuild, +prelude-lml-0.9.0.ebuild:
+  Version bump.
+
+  01 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  prelude-lml-0.8.6.ebuild:
+  Depend on <dev-libs/libprelude-0.9.0_rc1. Fixes bug 104503. Thanks to Eric
+  Ireland <Artanin@gmail.com>.
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -prelude-lml-0.9.0_rc4.ebuild:
+  Removing old version.
+
+*prelude-lml-0.9.0_rc5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +prelude-lml-0.9.0_rc5.ebuild:
+  Version bump.
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> prelude-lml-0.9.0_rc4.ebuild:
+  Added to ~ppc.
+
+*prelude-lml-0.9.0_rc4 (26 May 2005)
+
+  26 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -prelude-lml-0.9.0_rc1.ebuild, -prelude-lml-0.9.0_rc3.ebuild,
+  +prelude-lml-0.9.0_rc4.ebuild:
+  Version bump.
+
+*prelude-lml-0.9.0_rc3 (07 May 2005)
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +prelude-lml-0.9.0_rc3.ebuild:
+  Version bump.
+
+  10 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  prelude-lml-0.9.0_rc1.ebuild:
+  Fix DEPEND. Needs libprelude-0.9.0_rc1.
+
+*prelude-lml-0.9.0_rc1 (01 Apr 2005)
+
+  01 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +prelude-lml-0.9.0_rc1.ebuild:
+  Version bump, bug 87408. Thanks Carlos Silva <r3pek@gentoo.org>.
+
+  17 Apr 2004; Jason Wever <weeve@gentoo.org> prelude-lml-0.8.6.ebuild:
+  Stable on sparc.
+
+  18 Mar 2004; Jason Wever <weeve@gentoo.org> prelude-lml-0.8.6.ebuild:
+  Added ~sparc keyword.
+
+  17 Jan 2004; Michael Boman <mboman@gentoo.org> files/gentoo.init:
+  Made init script less verbose
+
+*prelude-lml-0.8.6 (17 Nov 2003)
+
+  17 Nov 2003; Michael Boman <mboman@gentoo.org> prelude-lml-0.8.6.ebuild:
+  New upstream version.
+  Added "debug" USE flag to faciliate debugging.
+
+*prelude-lml-0.8.5 (14 Oct 2003)
+
+  14 Oct 2003; <solar@gentoo.org> prelude-lml-0.8.5.ebuild:
+  prelude updates. contribution made by anonymous user
+
+  30 Jun 2003; <solar@gentoo.org> prelude-lml-0.8.3-r1.ebuild:
+  small fix for -doc option when used. No revision bump needed
+
+*prelude-lml-0.8.3-r1 (28 Jun 2003)
+
+  28 Jun 2003; Ned Ludd <solar@gentoo.org> prelude-lml-0.8.3-r1.ebuild:
+  The prelude rulesset was moved to /usr/share/prelude/lml/ with a symlink in
+  /etc/prelude-lml/ruleset pointing to it (so we don't need to re-write the
+  default config) suggested by Michael Boman Bug#: 23487
 
 *prelude-lml-0.8.3 (21 Jun 2003)
 
diff --git a/app-admin/prelude-lml/Manifest b/app-admin/prelude-lml/Manifest
index ccb5aaaa560a..184850e26996 100644
--- a/app-admin/prelude-lml/Manifest
+++ b/app-admin/prelude-lml/Manifest
@@ -1,4 +1,8 @@
-MD5 e95b6a569c0de20a5c0e33e34928c637 prelude-lml-0.8.3.ebuild 1388
-MD5 c53c41b222a73001dd4a2b2638997a5d files/gentoo.init 483
-MD5 061152626888d551f45f586a37e0eedc files/gentoo.conf 48
-MD5 673a9f17641555960c5df2e683149767 files/digest-prelude-lml-0.8.3 69
+MD5 7da9c62780b8528baaefb6c4dc151b7f prelude-lml-0.9.0.ebuild 1279
+MD5 f8f42bb1cf4728ad52311a2650f3dd9e prelude-lml-0.8.6.ebuild 1449
+MD5 8bb92c2f949b1ca1dd36f83e02021ec0 ChangeLog 2980
+MD5 92be665e7bf354958af6da4fc1c5dbdd metadata.xml 228
+MD5 72bb637b3c8e10303a6e27a000441f48 files/digest-prelude-lml-0.8.6 69
+MD5 f409c87e99fa637491deaa43888b8207 files/digest-prelude-lml-0.9.0 69
+MD5 8fccd3e051b7ed5e076d67fcd4011eaa files/gentoo.conf 171
+MD5 abe3205a75d6aa4ea8e088d2e4f77529 files/gentoo.init 577
diff --git a/app-admin/prelude-lml/files/gentoo.conf b/app-admin/prelude-lml/files/gentoo.conf
index 63313fc0203d..87b1b19395d3 100644
--- a/app-admin/prelude-lml/files/gentoo.conf
+++ b/app-admin/prelude-lml/files/gentoo.conf
@@ -1,4 +1,4 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Additional Configuration Options for prelude-lml
diff --git a/app-admin/prelude-lml/files/gentoo.init b/app-admin/prelude-lml/files/gentoo.init
index e7101938bb5c..d2c9e61f6d44 100644
--- a/app-admin/prelude-lml/files/gentoo.init
+++ b/app-admin/prelude-lml/files/gentoo.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/files/gentoo.init,v 1.1 2003/06/21 17:05:10 solar Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/files/gentoo.init,v 1.1.1.1 2005/11/30 10:00:15 chriswhite Exp $
 
 PROGNAME=`basename $1`
 
@@ -12,12 +12,12 @@ depend() {
 
 start() {
 	ebegin "Starting ${PROGNAME}..."
-	start-stop-daemon --start --quiet --exec /usr/bin/${PROGNAME} -- ${OPTIONS} -d
+	start-stop-daemon --start --quiet --exec /usr/bin/${PROGNAME} -- ${OPTIONS} -d &> /dev/null
 	eend $? 
 }
 
 stop() {
 	ebegin "Stop ${PROGNAME}..."
-     	start-stop-daemon --stop --quiet --exec /usr/bin/${PROGNAME}
+		start-stop-daemon --stop --quiet --exec /usr/bin/${PROGNAME}
 	eend $? 
 }
diff --git a/app-admin/prelude-lml/metadata.xml b/app-admin/prelude-lml/metadata.xml
index 2f6481a39377..bdad292f592e 100644
--- a/app-admin/prelude-lml/metadata.xml
+++ b/app-admin/prelude-lml/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
-	<maintainer>
-		<email>solar@gentoo.org</email>
-		<description>Mediator</description>
-	</maintainer>
-	<longdescription>Prelude-IDS Log Monitoring Lackey</longdescription>
+<herd>netmon</herd>
+<longdescription>Prelude-IDS Log Monitoring Lackey</longdescription>
 </pkgmetadata>
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 d94214a3f83b..4c1ece165905 100644
--- a/app-admin/prelude-lml/prelude-lml-0.8.6.ebuild
+++ b/app-admin/prelude-lml/prelude-lml-0.8.6.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # 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.1 2003/11/18 14:25:01 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/prelude-lml-0.8.6.ebuild,v 1.1.1.1 2005/11/30 10:00:14 chriswhite 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"
+KEYWORDS="x86 sparc"
 IUSE="doc debug"
-DEPEND="virtual/glibc
+
+DEPEND="virtual/libc
 	!dev-libs/libprelude-cvs
 	!app-admin/prelude-lml-cvs
-	dev-libs/libprelude
+	<dev-libs/libprelude-0.9.0_rc1
 	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"
@@ -41,3 +44,9 @@ src_install() {
 	mv ${D}/etc/prelude-lml/ruleset ${D}/usr/share/prelude/ruleset/lml
 	dosym /usr/share/prelude/ruleset/lml /etc/prelude-lml/ruleset
 }
+
+pkg_postinst() {
+	einfo "If you want to use unstable prelude, consider using unstable"
+	einfo "app-admin/prelude-lml to avoid undesired downgrades of"
+	einfo "dev-libs/libprelude."
+}
diff --git a/app-admin/prelude-lml/prelude-lml-0.9.0.ebuild b/app-admin/prelude-lml/prelude-lml-0.9.0.ebuild
index 7e445f472531..6744969e1375 100644
--- a/app-admin/prelude-lml/prelude-lml-0.9.0.ebuild
+++ b/app-admin/prelude-lml/prelude-lml-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/prelude-lml-0.9.0.ebuild,v 1.1 2005/09/23 03:41:09 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/prelude-lml-0.9.0.ebuild,v 1.1.1.1 2005/11/30 10:00:15 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ IUSE="doc debug"
 DEPEND="virtual/libc
 	!dev-libs/libprelude-cvs
 	!app-admin/prelude-lml-cvs
-	>=dev-libs/libprelude-0.9.0_rc1
+	>=dev-libs/libprelude-0.9.0
 	dev-libs/libpcre
 	doc? ( dev-util/gtk-doc )"