Use the "tools" USE flag. Remove version from twpol-GENERIC patch. Thanks to Chuck Seyboldt

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key D628E536)

5 files changed, 18 insertions, 10 deletions

diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index ac1572185703..78f1eccb4a3f 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/tripwire
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.52 2013/09/25 08:45:54 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.53 2013/09/26 10:46:50 nimiux Exp $
+
+  26 Sep 2013; Chema Alonso <nimiux@gentoo.org> tripwire-2.4.2.2-r2.ebuild,
+  -files/tripwire-2.4.2.2-twpol-GENERIC.patch,
+  +files/tripwire-twpol-GENERIC.patch, files/tripwire, metadata.xml:
+  Use the "tools" USE flag rather than "setup". Remove version from
+  twpol-GENERIC patch. Thanks to Chuck Seyboldt
 
 *tripwire-2.4.2.2-r2 (25 Sep 2013)
 
diff --git a/app-admin/tripwire/files/tripwire b/app-admin/tripwire/files/tripwire
index 26b5cdb8d6ca..8f0f23f3e2d5 100644
--- a/app-admin/tripwire/files/tripwire
+++ b/app-admin/tripwire/files/tripwire
@@ -3,7 +3,7 @@ HOST_NAME=`uname -n`
 if [ ! -e /var/lib/tripwire/${HOST_NAME}.twd ] ; then
 	echo "****    Error: Tripwire database for ${HOST_NAME} not found.  ****"
 	echo "**** Check tripwire.txt file for instructions or install      ****"
-	echo "**** app-admin/mktwpol package (if you used the \"setup\"  ****"
+	echo "**** app-admin/mktwpol package (if you used the \"tools\"  ****"
 	echo "**** USE flag, this has been done for you already.            ****"
 else
         test -f /etc/tripwire/tw.cfg &&  /usr/sbin/tripwire --check --quiet
diff --git a/app-admin/tripwire/files/tripwire-2.4.2.2-twpol-GENERIC.patch b/app-admin/tripwire/files/tripwire-twpol-GENERIC.patch
index 12b2419c5e71..12b2419c5e71 100644
--- a/app-admin/tripwire/files/tripwire-2.4.2.2-twpol-GENERIC.patch
+++ b/app-admin/tripwire/files/tripwire-twpol-GENERIC.patch
diff --git a/app-admin/tripwire/metadata.xml b/app-admin/tripwire/metadata.xml
index be62dd957018..9f0e27256fa6 100644
--- a/app-admin/tripwire/metadata.xml
+++ b/app-admin/tripwire/metadata.xml
@@ -22,8 +22,9 @@
 		que se pueden adoptar medidas de control de forma periódica.
 	</longdescription>
 	<use>
-		<flag name="setup">Installs mktwpol package including scripts for
-		tripwire installation/setup and tripwire database maintenance</flag>
+		<flag name="tools">Installs app-admin/mktwpol, providing scripts
+		for the installation/setup of tripwire, including generating the
+		tripwire policy file and maintenance of the tripwire database</flag>
 		<flag name="ssl">Adds support for Secure Socket Layer connections</flag>
 		<flag name="static">Builds the package statically</flag>
 	</use>
diff --git a/app-admin/tripwire/tripwire-2.4.2.2-r2.ebuild b/app-admin/tripwire/tripwire-2.4.2.2-r2.ebuild
index 3e6c7eca469a..7e107bfca89f 100644
--- a/app-admin/tripwire/tripwire-2.4.2.2-r2.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2-r2.ebuild,v 1.1 2013/09/25 08:45:54 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2-r2.ebuild,v 1.2 2013/09/26 10:46:50 nimiux Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tripwire/tripwire-${PV}-src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="ssl static setup"
+IUSE="ssl static +tools"
 
 DEPEND="sys-devel/automake
 	sys-devel/autoconf
@@ -21,7 +21,7 @@ DEPEND="sys-devel/automake
 RDEPEND="virtual/cron
 	virtual/mta
 	ssl? ( dev-libs/openssl )"
-PDEPEND="setup? ( app-admin/mktwpol )"
+PDEPEND="tools? ( app-admin/mktwpol )"
 
 S="${WORKDIR}"/tripwire-"${PV}"-src
 
@@ -29,7 +29,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/"${P}"-fix-configure.patch
 	epatch "${FILESDIR}"/"${P}"-buildnum.patch
 	epatch "${FILESDIR}"/"${P}"-gcc-4.7.patch
-	epatch "${FILESDIR}"/"${P}"-twpol-GENERIC.patch
+	epatch "${FILESDIR}"/"${PN}"-twpol-GENERIC.patch
 
 	eautoreconf
 }
@@ -69,11 +69,12 @@ pkg_postinst() {
 		elog "in tripwire.txt file to help you with this."
 		elog "To configure tripwire automatically, you can use the twsetup.sh"
 		elog "script provided by the app-admin/mktwpol package. This package is"
-		elog "installed for you if you append \"setup\" to your USE flags."
+		elog "installed for you by the \"tools\" USE flag (which is enabled by"
+		elog "default."
 else
 		elog "Maintenance of tripwire policy files as packages are added"
 		elog "and deleted from your system can be automated by the mktwpol.sh"
 		elog "script provided by the app-admin/mktwpol package. This package"
-		elog "is installed for you if you append \"setup\" to your USE flags"
+		elog "is installed for you if you append \"tools\" to your USE flags"
 	fi
 }