bug 87408

Package-Manager: portage-2.0.51.19

5 files changed, 15 insertions, 66 deletions

diff --git a/app-admin/prelude-manager/ChangeLog b/app-admin/prelude-manager/ChangeLog
index 14e8b4f49df2..1347888c98ac 100644
--- a/app-admin/prelude-manager/ChangeLog
+++ b/app-admin/prelude-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/prelude-manager
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/ChangeLog,v 1.15 2005/05/14 17:57:32 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/ChangeLog,v 1.16 2005/05/17 21:53:10 vanquirius Exp $
+
+  17 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -prelude-manager-0.9.0_rc3.ebuild, prelude-manager-0.9.0_rc4.ebuild:
+  Drop ssl, mysql and postgresql use flags, add dbx use flag for libpreludedb
+  and xml use flag. Thanks to Yoann Vandoorselaere <yoann@prelude-ids.org>. See
+  bug 87408.
 
 *prelude-manager-0.9.0_rc4 (14 May 2005)
 
diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
index 0987cd49a032..2cd1f79e89b0 100644
--- a/app-admin/prelude-manager/Manifest
+++ b/app-admin/prelude-manager/Manifest
@@ -1,10 +1,8 @@
-MD5 b38fbae33ab8d496eefcfa9341ae5e17 prelude-manager-0.9.0_rc4.ebuild 1586
+MD5 d98cefadb47e3fc7db02281cf1ff9b6c prelude-manager-0.9.0_rc4.ebuild 1337
 MD5 abcbad71bd50bb198800aa54b1cddcfb prelude-manager-0.8.10.ebuild 1587
-MD5 915a193e99adcb8241798f9cc7646e86 prelude-manager-0.9.0_rc3.ebuild 1586
-MD5 6f175777bb065e8890ad332aa0e3330e ChangeLog 2152
+MD5 b587fd48c2bcaabf06dc7273c26d158c ChangeLog 2447
 MD5 ee733e3e3fd25b8baf496cf157ceec87 metadata.xml 214
 MD5 0058897bc2efe34eeed45b5cf5a2bcd6 files/gentoo.conf 174
 MD5 3222b66939d63807ff3edf15d89a33ca files/gentoo.init 571
 MD5 0f09014053460960e939fb9331994e5c files/digest-prelude-manager-0.8.10 74
-MD5 2ef16215850fff0e687c473affa0608e files/digest-prelude-manager-0.9.0_rc3 77
 MD5 343406f282371b5f3e555c6a7e4c5fc3 files/digest-prelude-manager-0.9.0_rc4 77
diff --git a/app-admin/prelude-manager/files/digest-prelude-manager-0.9.0_rc3 b/app-admin/prelude-manager/files/digest-prelude-manager-0.9.0_rc3
deleted file mode 100644
index 1cd2e25d1ae1..000000000000
--- a/app-admin/prelude-manager/files/digest-prelude-manager-0.9.0_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 088c13173cd11515427e8f5e8249bfe3 prelude-manager-0.9.0-rc3.tar.gz 520146
diff --git a/app-admin/prelude-manager/prelude-manager-0.9.0_rc3.ebuild b/app-admin/prelude-manager/prelude-manager-0.9.0_rc3.ebuild
deleted file mode 100644
index 8fa77b864d16..000000000000
--- a/app-admin/prelude-manager/prelude-manager-0.9.0_rc3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/prelude-manager-0.9.0_rc3.ebuild,v 1.1 2005/05/07 20:05:10 vanquirius Exp $
-
-inherit flag-o-matic versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-DESCRIPTION="Prelude-IDS Manager"
-HOMEPAGE="http://www.prelude-ids.org/"
-SRC_URI="http://www.prelude-ids.org/download/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="ssl doc mysql postgres debug"
-
-RDEPEND="virtual/libc
-	!dev-libs/libprelude-cvs
-	!app-admin/prelude-manager-cvs
-	dev-libs/libprelude
-	ssl? ( dev-libs/openssl )
-	doc? ( dev-util/gtk-doc )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	local myconf
-
-	use ssl && myconf="${myconf} --enable-openssl" || myconf="${myconf} --enable-openssl=no"
-	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 && append-flags -O -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-manager
-	insinto /etc/conf.d
-	insopts -m 644
-	newins ${FILESDIR}/gentoo.conf prelude-manager
-}
diff --git a/app-admin/prelude-manager/prelude-manager-0.9.0_rc4.ebuild b/app-admin/prelude-manager/prelude-manager-0.9.0_rc4.ebuild
index 3546014e3b3d..4a74bca33177 100644
--- a/app-admin/prelude-manager/prelude-manager-0.9.0_rc4.ebuild
+++ b/app-admin/prelude-manager/prelude-manager-0.9.0_rc4.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-manager/prelude-manager-0.9.0_rc4.ebuild,v 1.1 2005/05/14 17:57:32 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/prelude-manager-0.9.0_rc4.ebuild,v 1.2 2005/05/17 21:53:10 vanquirius Exp $
 
 inherit flag-o-matic versionator
 
@@ -12,16 +12,16 @@ SRC_URI="http://www.prelude-ids.org/download/releases/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc"
-IUSE="ssl doc mysql postgres debug"
+IUSE="doc debug xml dbx"
 
 RDEPEND="virtual/libc
 	!dev-libs/libprelude-cvs
 	!app-admin/prelude-manager-cvs
 	dev-libs/libprelude
-	ssl? ( dev-libs/openssl )
+	dev-libs/openssl
 	doc? ( dev-util/gtk-doc )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )"
+	xml? ( dev-libs/libxml )
+	dbx? ( dev-libs/libpreludedb )"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
@@ -31,11 +31,9 @@ S="${WORKDIR}/${MY_P}"
 src_compile() {
 	local myconf
 
-	use ssl && myconf="${myconf} --enable-openssl" || myconf="${myconf} --enable-openssl=no"
 	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 && append-flags -O -ggdb
+	use !xml && myconf="${myconf} --disable-xmltest"
 
 	econf ${myconf} || die "econf failed"
 	emake || die "emake failed"