Version bumped. Added prelink USE flag.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 36 insertions, 196 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/Manifest b/app-forensics/aide/Manifest
index 70e2b9ce6fff..96d183ec0850 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -11,12 +11,12 @@ AUX aide.conf 2713 RMD160 4f1de8580deb49af8bf93fb2df19f411f2990841 SHA1 0970af5c
 AUX aide.cron 5997 RMD160 07a10b1bae5373eb186d72ec9b0e9c0987dd1cee SHA1 09f8f66eaec409bc7e2cd77bb74da48fc6136d66 SHA256 f4874c85d808c9f1726421c5f1146c4aa6a6bf831f61962c8265d5e7272f4558
 AUX aideinit 2949 RMD160 a2cb2f5bd69e560e2d76b61b2173608435b50857 SHA1 8fcbb4d6c136cf1b2cbac3de91b3963974a6b826 SHA256 1b4a01b8f50eb0b9217df55686ccd103ea92fca3892fe3a6a0364f83cae3548f
 DIST aide-0.13.1.tar.gz 285400 RMD160 802ac5bd817032bf3a696db7f547bef322b2487a SHA1 0112ee0a974020b99f09d1f2a9fb05433a7b9681 SHA256 b55065413bad3c24af51a551e6ab7cd4a9ecd9f449929261a45fc2f53e040021
+DIST aide-0.14.2.tar.gz 418098 RMD160 f1d17bcbd56b542bbea08f6268e28cac3d86c2c1 SHA1 4ef8c0c14d5900d9ea17e6eb156c12a18954a95b SHA256 bf4cd417b0f4778b4f9a618d23e0b0b7db10349ba6a0129394dc82fbc2fa8b9b
 DIST aide-0.14.tar.gz 467226 RMD160 f76809db02f24ecd3cc5a1186b4531c85edffe65 SHA1 805a4a6b8f94503f410759a0df59c8320352294e SHA256 f53f4c2d734a5e91bed07405ed315495f5847bd2747496ff7fd057b8e5d292b6
 EBUILD aide-0.13.1-r3.ebuild 3782 RMD160 23b0cac2e572fe8239083b8acc591ca01416a103 SHA1 37570b174c09da59c2230296e58a5d86fd2ac632 SHA256 98a438de343ec4c4a1ed1634b95872e6f92b564c434bcf0f771d85ce55ea59b9
-EBUILD aide-0.13.1-r4.ebuild 3864 RMD160 3adc0dacde450b2b6393e020f8421a1baf93374f SHA1 5cbbd1a034a1d5e513598f32ff96540fbd66c213 SHA256 4dea2792ea3eaa9aeebb8ffe9f4e9358b0c8b9651b4e2bac8504b063e1e89275
 EBUILD aide-0.13.1-r5.ebuild 3934 RMD160 57754b2f20818fc6d8dc71f309069b5ba665d73e SHA1 69f318c949b65eacf4a95aa66a9a3528f3f2d2ff SHA256 12390d5ea79fdadc7b81b0be099d96765831416dd98008247dce90364bb32e28
 EBUILD aide-0.13.1.ebuild 3908 RMD160 04b4916c1f0147a6b27fd18240e445b6a5991157 SHA1 f1ae1ea965fda081763180971ed3e34c5c44031f SHA256 97e388c272ff73e88a9f465dc50dadb9fd95b36190d328fc4629f59efdc00862
 EBUILD aide-0.14-r1.ebuild 3582 RMD160 3a1547cd44beae40c5ffb572d4b65cb0d9b2cc97 SHA1 dc0a3519847f87ad5f29b4ec29dcd20e24145d98 SHA256 efc25822b05f75d2f4e37b9a2191bf2979184932da4883ae7bc833f608632c74
-EBUILD aide-0.14.ebuild 3498 RMD160 a25f7f957d230b4f508bffadd1cac432c5bd9b0a SHA1 c2870f0b992a96fe73d631c07daf228ae99d9969 SHA256 abbf21ad7c192d57830ada9ff283f198450313f5d9d97d12a5fe55f038f2d0f8
-MISC ChangeLog 9743 RMD160 8bdc404b47c0c3ff799928895fec7c1f269bf01f SHA1 651c9723d82551d1540a27acdeeecafe240fde7d SHA256 058de80c0f2aa6cd7a95553066c1c81ebc442aab46561eee148b24f23430cec1
-MISC metadata.xml 315 RMD160 ff14c4624bc34a438a32d65f76a9566fb0858492 SHA1 e758d3b334374a8b132cf4b85356d0849bf0a054 SHA256 bb903a00cbb8c48c014f3955cdad744e4d9e1e4c6bf14055d0f2c2bc856c7111
+EBUILD aide-0.14.2.ebuild 3071 RMD160 0e2d20e3a356b86ebab8cf8bb91eaf66e65635e8 SHA1 97f62d67445d267336e0f444c648e5266a9b335c SHA256 730aac36c79cec15783f9fd313266cb465d0fe0fde01273d76e4b9077dfbe8e9
+MISC ChangeLog 9963 RMD160 4b394643efb2c41f76fd4786ea5e65b377c9dc31 SHA1 103b9b40e9aab3599374387d6291f326d823b938 SHA256 3037ea33773a6b36103260cf92dc80ff262c42f9201125b32998e10a495fc824
+MISC metadata.xml 392 RMD160 89fb2e6fa79d4bda6b05ebdfbe781995d3261de1 SHA1 67cb4d1f740e7fa9cd5ef12a61c622919b07efa0 SHA256 7a9cb489828c96f33b110d48f3ddeb2afba044b75fa1f13fa63ce04fec721ea2
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>