Version bumped. Added prelink USE flag.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 32 insertions, 192 deletions

diff --git a/app-forensics/aide/ChangeLog b/app-forensics/aide/ChangeLog
index fcd835767eb1..bd25126759c3 100644
--- a/app-forensics/aide/ChangeLog
+++ b/app-forensics/aide/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-forensics/aide
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.49 2010/06/17 20:05:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.50 2010/07/08 16:39:23 matsuu Exp $
+
+*aide-0.14.2 (08 Jul 2010)
+
+  08 Jul 2010; MATSUU Takuto <matsuu@gentoo.org> -aide-0.13.1-r4.ebuild,
+  -aide-0.14.ebuild, +aide-0.14.2.ebuild, metadata.xml:
+  Version bumped. Added prelink USE flag. Removed old versions
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> aide-0.13.1.ebuild,
   aide-0.13.1-r3.ebuild, aide-0.13.1-r4.ebuild, aide-0.13.1-r5.ebuild,
diff --git a/app-forensics/aide/aide-0.13.1-r4.ebuild b/app-forensics/aide/aide-0.13.1-r4.ebuild
deleted file mode 100644
index fa900e7763bc..000000000000
--- a/app-forensics/aide/aide-0.13.1-r4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.13.1-r4.ebuild,v 1.2 2010/06/17 20:05:56 patrick Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="acl curl mhash nls postgres selinux static xattr zlib"
-#IUSE="acl audit curl mhash nls postgres selinux static xattr zlib"
-
-# libsandbox:  Can't dlopen libc: (null)
-RESTRICT="test"
-
-DEPEND="acl? ( sys-apps/acl )
-	curl? ( net-misc/curl )
-	mhash? ( >=app-crypt/mhash-0.9.2 )
-	!mhash? ( dev-libs/libgcrypt )
-	nls? ( virtual/libintl )
-	postgres? ( dev-db/postgresql-base )
-	selinux? ( sys-libs/libselinux )
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )"
-#	audit? ( sys-process/audit )
-
-RDEPEND="!static? ( ${DEPEND} )"
-
-DEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_config() {
-	if use mhash && use postgres ; then
-		eerror "We cannot emerge aide with mhash and postgres USE flags at the same time."
-		eerror "Please remove mhash OR postgres USE flags."
-		die "Please remove either mhash or postgres USE flag."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	# fix configure switch
-	epatch "${FILESDIR}/${P}-configure.patch"
-
-	# fix equal match issue, bug #204217
-	epatch "${FILESDIR}/${P}-equ-matching.patch"
-
-	# fix libgcrypt issue, bug #266175
-	epatch "${FILESDIR}/${P}-libgrypt_init.patch"
-
-	# fix as-need issue, bug #271326
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	if ! use mhash ; then
-		# dev-libs/libgcrypt doesn't support whirlpool algorithm
-		sed -i -e 's/\+whirlpool//' doc/aide.conf.in || die
-	fi
-
-	if ! use selinux ; then
-		sed -i -e 's/\+selinux//' doc/aide.conf.in || die
-	fi
-
-	if ! use xattr ; then
-		sed -i -e 's/\+xattrs//' doc/aide.conf.in || die
-	fi
-
-	if ! use acl ; then
-		sed -i -e 's/\+acl//' doc/aide.conf.in || die
-	fi
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="
-		$(use_with acl posix-acl)
-		$(use_with !mhash gcrypt)
-		$(use_with mhash mhash)
-		$(use_with nls locale)
-		$(use_with postgres psql)
-		$(use_with selinux)
-		$(use_enable static)
-		$(use_with xattr)
-		$(use_with zlib)
-		--sysconfdir=/etc/aide"
-#		$(use_with audit)
-
-	# curl doesn't work with static
-	use curl && ! use static && myconf="${myconf} --with-curl"
-
-	econf ${myconf} || die "econf failed"
-	# parallel make borked
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	keepdir /var/lib/aide
-	fowners root:0 /var/lib/aide
-	fperms 0755 /var/lib/aide
-
-	keepdir /var/log/aide
-
-	insinto /etc/aide
-	doins "${FILESDIR}"/aide.conf
-
-	dosbin "${FILESDIR}"/aideinit
-
-	dodoc ChangeLog AUTHORS NEWS README "${FILESDIR}"/aide.cron
-	dohtml doc/manual.html
-}
-
-pkg_postinst() {
-	elog
-	elog "A sample configuration file has been installed as"
-	elog "/etc/aide/aide.conf.  Please edit to meet your needs."
-	elog "Read the aide.conf(5) manual page for more information."
-	elog "A helper script, aideinit, has been installed and can"
-	elog "be used to make AIDE management easier. Please run"
-	elog "aideinit --help for more information"
-	elog
-
-	if use postgres; then
-		elog "Due to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog
-		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "  where pg_class.relname='TABLE_pkey' and \ "
-		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog
-		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "your aide.conf."
-		elog
-	fi
-}
diff --git a/app-forensics/aide/aide-0.14.ebuild b/app-forensics/aide/aide-0.14.2.ebuild
index f92163f65f41..8912cbd60b46 100644
--- a/app-forensics/aide/aide-0.14.ebuild
+++ b/app-forensics/aide/aide-0.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.14.ebuild,v 1.2 2010/06/17 20:05:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.14.2.ebuild,v 1.1 2010/07/08 16:39:23 matsuu Exp $
 
 EAPI="3"
 
@@ -13,23 +13,19 @@ SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="acl curl mhash nls postgres selinux static xattr zlib"
-#IUSE="acl audit curl mhash nls postgres prelink selinux static xattr zlib"
+IUSE="acl audit curl mhash nls postgres prelink selinux static xattr zlib"
 
-# libsandbox:  Can't dlopen libc: (null)
-#RESTRICT="test"
-
-DEPEND="acl? ( sys-apps/acl )
+DEPEND="acl? ( virtual/acl )
+	audit? ( sys-process/audit )
 	curl? ( net-misc/curl )
 	mhash? ( >=app-crypt/mhash-0.9.2 )
 	!mhash? ( dev-libs/libgcrypt )
 	nls? ( virtual/libintl )
 	postgres? ( dev-db/postgresql-base )
+	prelink? ( sys-devel/prelink )
 	selinux? ( sys-libs/libselinux )
 	xattr? ( sys-apps/attr )
 	zlib? ( sys-libs/zlib )"
-#	audit? ( sys-process/audit )
-#	prelink? ( sys-devel/prelink )
 
 RDEPEND="!static? ( ${DEPEND} )"
 
@@ -44,49 +40,32 @@ pkg_config() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	# fix libgcrypt issue, bug #266175
-	epatch "${FILESDIR}/${PN}-0.13.1-libgrypt_init.patch"
+	epatch "${FILESDIR}/${PN}-0.14-gentoo.patch"
 
 	# fix as-need issue, bug #271326
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	# fix zlib issue, bug #316665
-	epatch "${FILESDIR}/${PN}-0.13.1-zlib.patch"
-
-	if ! use selinux ; then
-		sed -i -e 's/\+selinux//' doc/aide.conf.in || die
-	fi
-
-	if ! use xattr ; then
-		sed -i -e 's/\+xattrs//' doc/aide.conf.in || die
-	fi
+	epatch "${FILESDIR}/${PN}-0.14-as-needed.patch"
 
-	if ! use acl ; then
-		sed -i -e 's/\+acl//' doc/aide.conf.in || die
-	fi
+	# fix configure issue, bug #323187
+	epatch "${FILESDIR}/${PN}-0.14-configure.patch"
 
 	eautoreconf
 }
 
 src_configure() {
-	local myconf="
-		$(use_with acl posix-acl)
-		$(use_with curl)
-		$(use_with !mhash gcrypt)
-		$(use_with mhash mhash)
-		$(use_with nls locale)
-		$(use_with postgres psql)
-		$(use_with selinux)
-		$(use_enable static)
-		$(use_with xattr)
-		$(use_with zlib)
-		--sysconfdir=${EPREFIX}/etc/aide"
-#		$(use_with audit)
-#		$(use_with prelink)
-
-	econf ${myconf} || die "econf failed"
+	econf \
+		$(use_with acl posix-acl) \
+		$(use_with audit) \
+		$(use_with curl) \
+		$(use_with !mhash gcrypt) \
+		$(use_with mhash mhash) \
+		$(use_with nls locale) \
+		$(use_with postgres psql) \
+		$(use_with prelink) \
+		$(use_with selinux) \
+		$(use_enable static) \
+		$(use_with xattr) \
+		$(use_with zlib) \
+		--sysconfdir="${EPREFIX}/etc/aide" || die "econf failed"
 }
 
 src_install() {
@@ -103,7 +82,7 @@ src_install() {
 
 	dosbin "${FILESDIR}"/aideinit || die
 
-	dodoc ChangeLog AUTHORS NEWS README "${FILESDIR}"/aide.cron || die
+	dodoc AUTHORS ChangeLog NEWS README Todo "${FILESDIR}"/aide.cron || die
 	dohtml doc/manual.html || die
 }
 
diff --git a/app-forensics/aide/metadata.xml b/app-forensics/aide/metadata.xml
index 2a2155b4178d..57f8f1607684 100644
--- a/app-forensics/aide/metadata.xml
+++ b/app-forensics/aide/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 <use>
 	<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
+	<flag name='prelink'>Enable support for <pkg>sys-devel/prelink</pkg></flag>
 </use>
 </pkgmetadata>