Fixed USE flags conflicts, bug #343221.

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

8 files changed, 24 insertions, 174 deletions

diff --git a/app-forensics/aide/ChangeLog b/app-forensics/aide/ChangeLog
index 3fb03112a77d..87ad6734f623 100644
--- a/app-forensics/aide/ChangeLog
+++ b/app-forensics/aide/ChangeLog
@@ -1,6 +1,11 @@
 # 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.52 2010/10/27 16:45:29 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.53 2010/11/03 02:30:28 matsuu Exp $
+
+  03 Nov 2010; MATSUU Takuto <matsuu@gentoo.org> aide-0.13.1.ebuild,
+  aide-0.13.1-r3.ebuild, aide-0.13.1-r5.ebuild, -aide-0.14-r1.ebuild,
+  aide-0.14.2.ebuild, aide-0.15.1.ebuild:
+  Fixed USE flags conflicts, bug #343221.
 
 *aide-0.15.1 (27 Oct 2010)
 
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index f4208a685f53..f1b3d9299289 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX aide-0.13.1-as-needed.patch 1332 RMD160 94864a43a04b29396979e1c2d53e9302f17ec83c SHA1 156491dfaed31fa06fc71c4e2d30e913c984e3c3 SHA256 778892968020b0a420372fedde4949cc58fff8fa6851473a507944d4d6b9f3c5
 AUX aide-0.13.1-configure.patch 2201 RMD160 46f6cf31c0446ce238733d0434c4e3b1126b87fc SHA1 68bb2ced2ebd17ab1f5c5a940e0804f71cd903af SHA256 aa1b35d3d692d6844b3fc1b39e9ae3ed1779d7699f111bd6852a01dde228457d
 AUX aide-0.13.1-equ-matching.patch 2451 RMD160 515a0762483224fdfdca4197ee318f1048a7573a SHA1 e4606aaf4935955d0c4f144b415485ad5871248e SHA256 1eddf47fe7f1fb5a7868b22e2af00c2ab7b89b807c4e696621a6e74443d1e323
@@ -16,30 +13,11 @@ AUX aide.cron 5997 RMD160 07a10b1bae5373eb186d72ec9b0e9c0987dd1cee SHA1 09f8f66e
 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
 DIST aide-0.15.1.tar.gz 424970 RMD160 80ea88b1c1496bcca57d2d1cdeecdcdfca0fa5cf SHA1 c5998c04a223416142323fa1bd18db0936099827 SHA256 303e5c186257df8c86e418193199f4ea2183fc37d3d4a9098a614f61346059ef
-EBUILD aide-0.13.1-r3.ebuild 3775 RMD160 f1ade106d18639247b15a5198b44035152d7feae SHA1 59f92ab7fbb3f81ea6a9ec0a123b7c06ad05094b SHA256 61e66800884fdada0119c2024cc94a0ae87d8193f5f29628705a78fc2fdfaef9
-EBUILD aide-0.13.1-r5.ebuild 3927 RMD160 814eecb9e5ef62f4c99fc20936919236e4a80f13 SHA1 0e6a02a8132a05bc69cadd8ff06bc6d351828e5c SHA256 13f36fc8f4a3568b83000b708aabca492617fa648b57db479cd5162b327d669d
-EBUILD aide-0.13.1.ebuild 3902 RMD160 0477bb6334969b7bb6899a1f35323042608b7b67 SHA1 cabda511ead8bc7c70ef586ada7d5d619cbd9ee1 SHA256 5bd7d4b6590d65c18988f433382c00f9eb40b65709f94102ae3c1625dd057657
-EBUILD aide-0.14-r1.ebuild 3575 RMD160 b808fa88aae8c9ff255afe6b8e8815e61b9d09a9 SHA1 02009619ac42d9d417417eb29c64f32f4ad523d6 SHA256 339cb9276faf0808d2f6c87ffaf2bc115a878bb0b0f3f5c85137ba6b8a115fb9
-EBUILD aide-0.14.2.ebuild 3065 RMD160 7550d084633439bd332475c6d2f21bd2e06c4b2c SHA1 7cf836d47a55e72ee561ba25cd7b14007c2d3576 SHA256 34bc424f681fa408041e1d76b6763d83e7028fbe7992d25e553e5802773efeb8
-EBUILD aide-0.15.1.ebuild 3093 RMD160 1390c1a7cff8f3457b286a369672c8d185e348ca SHA1 2214bf20ae2ba00e0a215801678cfe4405ca826f SHA256 db40445b423839dae8be4bf31d2af92df5eb95a5bc600aac83a70889770cf9b1
-MISC ChangeLog 10298 RMD160 9a41a7123a72de2586a4dd51e09d0a3fa868d26d SHA1 b999a0bf6536bb0c6d707868cc707dc0de22398d SHA256 11d7663c577421efffa8a088aea9609f607db817aba0ba65c8a90d9b8d3fac19
+EBUILD aide-0.13.1-r3.ebuild 3773 RMD160 5db11cdd8e237efd4b9f0fa836255bfea3130e6e SHA1 1c01fda1de17e397dd6b9f77ae31a1bf6d94d584 SHA256 f0ec7ffcc9247e3f6c7f97261c97d7aaf674d7849f4e13327f86aedb8df826e8
+EBUILD aide-0.13.1-r5.ebuild 3925 RMD160 894e29e3e078d8082d6fdd5d611613800256975a SHA1 8d22bd34aeea816ae9bd949aedd3cecc67132c1c SHA256 cb7c9e62ed023631e74d3e6506c48f46eb04f7d30c378e91369e407512636625
+EBUILD aide-0.13.1.ebuild 3900 RMD160 ff8fd5fb264bf86c5521efbc8ac29d63b49a7b57 SHA1 72c4d614a567629d768033520c52a71300782695 SHA256 c0ed03f52a0d36158c5d65c89c5e2838d3ca35c614432df460f22e9ca128b2b0
+EBUILD aide-0.14.2.ebuild 3072 RMD160 1ef207248fd37e7561d022b47757263da500c832 SHA1 9d44ee6248f5ec3fd6deaabdd56344160539b124 SHA256 ff9b224d122214426f87ed622927e11b18ce96384f0382913c53c5e519daa1f5
+EBUILD aide-0.15.1.ebuild 3101 RMD160 5fae27010875207f7adeeed869fcaefd8027226b SHA1 f45786f2dc8d51c199d3912b5c97bafc699f0093 SHA256 38de1930f66785dc56a5f1d9fa0ddcdc6261837bea98049e2b813c60c166371e
+MISC ChangeLog 10522 RMD160 066494c048c9440b89807f7208616a7336b70edb SHA1 192cd6865b76e1ed50c6e815d0ca20a0d7cf845b SHA256 aa143c52a68471974e0d4737fb7cfb699f2ed9ac464838285aefacce6171885a
 MISC metadata.xml 392 RMD160 89fb2e6fa79d4bda6b05ebdfbe781995d3261de1 SHA1 67cb4d1f740e7fa9cd5ef12a61c622919b07efa0 SHA256 7a9cb489828c96f33b110d48f3ddeb2afba044b75fa1f13fa63ce04fec721ea2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iQIcBAEBAgAGBQJMyFcvAAoJECaGw+YFKA1p2ikP+wcmUMtUvenkov63DFTCKzxP
-oglKg9bmPKeDzCzm9QBGtzfmxgit2aloicVow3XcOXuawMPEx+wH1aaHqOaL8m3L
-XU0zgGKMBNXImqar3/cyHR8CG/mzBdHmUTMtAyidGisJyeisd23HUfHphvThZp5b
-MkTcCPiOWZJDjGPiXfQNc5U4JYvBv+IgEKTn0aVbHuwF+BhStjGOHgEgKBPTo4Ej
-lqKJi/YrUO1KY66NUunGoy7sIBUlzR+yPb2ZrGeQA7n5dXZcPs7cW0M4Mcao8SqU
-r/vonSvgas63t1/PNl58jZ3t2eZYdlRg3CLQBEuUaXoS4XPt2PNiwq84/u3El+AA
-3KK1AEUCzllzqmrsWIgKg+Tyl+uKTV8QVsUxyqzO3YsW4KQEQIYyRKn62vvyzebm
-8ftVIiM0iAczAkoq4Addr//8P+jD1p3WDJdJIQbdpMgDGKHzRUCYMDaNFeJMf22W
-TpHpxw1GCVyc7o/oZNM/TtqSGJxLygB7HX4NyfRnoZoXBybgFGw7QnivrD+y8e0y
-zazut1XHgyX5COX9P5vp0+2Ns7L9y4M6q7knCpp+bEKDe6a0SyM44Hszst1cMJ5V
-cIyWyyyBMspn+edp9oKFr+pVhvANc9rNihIXCtXUrYLM0FKZ54Jdt474MtYfMVf0
-rgyGXj87Kwte09zUK/Mp
-=p9ku
------END PGP SIGNATURE-----
diff --git a/app-forensics/aide/aide-0.13.1-r3.ebuild b/app-forensics/aide/aide-0.13.1-r3.ebuild
index 02e9b992ed41..90d7b11f996e 100644
--- a/app-forensics/aide/aide-0.13.1-r3.ebuild
+++ b/app-forensics/aide/aide-0.13.1-r3.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.13.1-r3.ebuild,v 1.6 2010/07/11 11:13:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.13.1-r3.ebuild,v 1.7 2010/11/03 02:30:28 matsuu Exp $
 
 inherit autotools eutils
 
@@ -35,7 +35,7 @@ DEPEND="${DEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-pkg_config() {
+pkg_setup() {
 	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."
diff --git a/app-forensics/aide/aide-0.13.1-r5.ebuild b/app-forensics/aide/aide-0.13.1-r5.ebuild
index 9deb28bd3037..688e8512ecd8 100644
--- a/app-forensics/aide/aide-0.13.1-r5.ebuild
+++ b/app-forensics/aide/aide-0.13.1-r5.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.13.1-r5.ebuild,v 1.3 2010/07/11 11:13:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.13.1-r5.ebuild,v 1.4 2010/11/03 02:30:28 matsuu Exp $
 
 inherit autotools eutils
 
@@ -35,7 +35,7 @@ DEPEND="${DEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-pkg_config() {
+pkg_setup() {
 	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."
diff --git a/app-forensics/aide/aide-0.13.1.ebuild b/app-forensics/aide/aide-0.13.1.ebuild
index 679124794c44..8aa48c4764db 100644
--- a/app-forensics/aide/aide-0.13.1.ebuild
+++ b/app-forensics/aide/aide-0.13.1.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.13.1.ebuild,v 1.12 2010/07/11 11:13:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.13.1.ebuild,v 1.13 2010/11/03 02:30:28 matsuu Exp $
 WANT_AUTOCONF='latest'
 WANT_AUTOMAKE='latest'
 inherit eutils autotools
@@ -34,7 +34,7 @@ DEPEND="${DEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-pkg_config() {
+pkg_setup() {
 	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."
diff --git a/app-forensics/aide/aide-0.14-r1.ebuild b/app-forensics/aide/aide-0.14-r1.ebuild
deleted file mode 100644
index 16d373deaed7..000000000000
--- a/app-forensics/aide/aide-0.14-r1.ebuild
+++ /dev/null
@@ -1,133 +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.14-r1.ebuild,v 1.3 2010/07/11 11:13:03 armin76 Exp $
-
-EAPI="3"
-
-inherit autotools confutils 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="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl audit curl mhash nls postgres 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? ( 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 )
-	selinux? ( sys-libs/libselinux )
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )"
-#	prelink? ( sys-devel/prelink )
-
-RDEPEND="!static? ( ${DEPEND} )"
-
-DEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_config() {
-	confutils_use_conflict mhash postgres
-	confutils_use_conflict curl static
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	# fix libgcrypt issue, bug #266175
-	epatch "${FILESDIR}/${PN}-0.13.1-libgrypt_init.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"
-
-	# fix configure issue, bug #323187
-	epatch "${FILESDIR}/${P}-configure.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
-
-	if ! use acl ; then
-		sed -i -e 's/\+acl//' doc/aide.conf.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	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 selinux) \
-		$(use_enable static) \
-		$(use_with xattr) \
-		$(use_with zlib) \
-		--sysconfdir="${EPREFIX}/etc/aide" || die "econf failed"
-#		$(use_with prelink)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man || die "emake install failed"
-
-	keepdir /var/lib/aide || die
-	fowners root:0 /var/lib/aide || die
-	fperms 0755 /var/lib/aide || die
-
-	keepdir /var/log/aide || die
-
-	insinto /etc/aide
-	doins "${FILESDIR}"/aide.conf || die
-
-	dosbin "${FILESDIR}"/aideinit || die
-
-	dodoc ChangeLog AUTHORS NEWS README "${FILESDIR}"/aide.cron || die
-	dohtml doc/manual.html || die
-}
-
-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.2.ebuild b/app-forensics/aide/aide-0.14.2.ebuild
index 202dff3743d5..d5f4b0137679 100644
--- a/app-forensics/aide/aide-0.14.2.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.2.ebuild,v 1.2 2010/07/11 11:13:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.14.2.ebuild,v 1.3 2010/11/03 02:30:28 matsuu Exp $
 
 EAPI="3"
 
@@ -34,9 +34,9 @@ DEPEND="${DEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-pkg_config() {
+pkg_setup() {
 	confutils_use_conflict mhash postgres
-	confutils_use_conflict curl static
+	confutils_use_conflict static curl postgres
 }
 
 src_prepare() {
diff --git a/app-forensics/aide/aide-0.15.1.ebuild b/app-forensics/aide/aide-0.15.1.ebuild
index 3b3e8d74bd3b..1e16140a5c21 100644
--- a/app-forensics/aide/aide-0.15.1.ebuild
+++ b/app-forensics/aide/aide-0.15.1.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.15.1.ebuild,v 1.1 2010/10/27 16:45:29 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.15.1.ebuild,v 1.2 2010/11/03 02:30:28 matsuu Exp $
 
 EAPI="3"
 
@@ -34,9 +34,9 @@ DEPEND="${DEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-pkg_config() {
+pkg_setup() {
 	confutils_use_conflict mhash postgres
-	confutils_use_conflict curl static
+	confutils_use_conflict static curl postgres
 }
 
 src_prepare() {