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

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536

6 files changed, 30 insertions, 22 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/Manifest b/app-admin/tripwire/Manifest
index c366f1867d63..55c5fd4b7922 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tripwire 466 SHA256 b6eb7eeedcdf70ae9ddba2f192efde2a169abbb95fc63f5151c2475376fcc066 SHA512 82390b290e8ff88f664dc593010e98201a9fc348bd9bf354fc56ea43283b0c162a1727694fd045ca8ffcfac4f8b4b2c41106e827facbfd1228203c9be9a6c63b WHIRLPOOL 8ca09be11cfbf4a2a4d78f8a3ed4aae133a7a002d55be5117769aa04de74bbfc1ad8a6b412017d1e0adf3c27f27431d6cc5c6e122a10510e07c0150cae72e2d2
+AUX tripwire 466 SHA256 222c078588d03394c4502a884d6049f210b25d7f826e9bb29a69d68a01b40eac SHA512 1df37364a84ab26ca0a3f2637e9f4938333c394979c2ccadb69401b7e6a93d03911ce737b25bb6e76c1963e4b7eaffd35b3551aa141b51bc9b3a8a00d9c828cf WHIRLPOOL afb61e9885b1c7d0214f03e35af6f02a5dca77a68f74441d6c84091ef7a7f9ee0d5a6b70e1a0ac2cf5f75f4739185ab3c2eaf7f47b2795f1c7a7bdaf347de36d
 AUX tripwire-2.4.2.2-buildnum.patch 230 SHA256 820535353f2b0b4003929b7db4478412a4552fb69d11c46260d6d373faa98d53 SHA512 2b88c9366d2e922f8c18d128d92c2c8cdab2f8b5871d1666e27afabd0c5fc58bc218d662d9c71b64f93ce3ef238eee0a3ffb7b9bba227f2914ba72e680dbb360 WHIRLPOOL a8c7a65771840975c1bdcbe5355ef1c0200850ce6cf5189d02f2bcf2500c3ba08b5283bf17766a878f972b2d0047a0d82b3a3fca2ae386eb1c4ea57bbfca39ff
 AUX tripwire-2.4.2.2-fix-configure.patch 400 SHA256 424f2806f1dcdfdae945248127b9d699d59aed73c232a21abcde797e26337121 SHA512 d4e4964e6d61efe7181a71eef3447d1ce50cec9377c11bde52ce9a2926624e9a82821fc9426c9dbf5e6ccafb402b9494ec99a7172f75cfdf374a277b46f4a79b WHIRLPOOL 0eb027efa7029ba8dfd23afab852ee871411ad5a370e6257c2e2fbaa4192e21fff6691431e9f04d9560ccf9f8f00ed456bc74acbe017ed5244dfdbebf5de706a
 AUX tripwire-2.4.2.2-gcc-4.7.patch 790 SHA256 4d86f4db8361bec19cffef6986af68f61c4062e273ebd13f0f082bd513a2cacc SHA512 e05bbe96371e1c21a14ec72c6d2ced7a9f39da43cf8ac59c8ee6a8da58b86727d42e0311a8a924c39816cfdb8334f405543c77b423e7be47488e6a47a75c2ceb WHIRLPOOL 704099d31c20254da591dcca93591ddc262b6185a21c4945af6853cd510fb630c053379b123a713d6c550ab284f551c58553e1b1b846d34a5cde83c03dad8379
-AUX tripwire-2.4.2.2-twpol-GENERIC.patch 613 SHA256 714c235ed24704ae522e64b5aa1faf2a5bf861fd8562748c3c8d8165ac1ab080 SHA512 15551e6d9e0895e7a5c37d267e0de4b06ade55bba772ec18c4c7ebd19bc76ae6ae88d2ad62d8ab3f5dd4059c688d771253b285725159082844faee9ea4b1d53b WHIRLPOOL f7c9b019380231b26268b670ef58cc66a77367eb898ed0ca27d10820fd506db91afcefdc3d3957fc18d82bc7a458aa2226f0b90851d4015a318bfd3c62fe1a2c
+AUX tripwire-twpol-GENERIC.patch 613 SHA256 714c235ed24704ae522e64b5aa1faf2a5bf861fd8562748c3c8d8165ac1ab080 SHA512 15551e6d9e0895e7a5c37d267e0de4b06ade55bba772ec18c4c7ebd19bc76ae6ae88d2ad62d8ab3f5dd4059c688d771253b285725159082844faee9ea4b1d53b WHIRLPOOL f7c9b019380231b26268b670ef58cc66a77367eb898ed0ca27d10820fd506db91afcefdc3d3957fc18d82bc7a458aa2226f0b90851d4015a318bfd3c62fe1a2c
 AUX tripwire.cron 315 SHA256 be7a322661616b558124d7c1124f742a20d9c83119648a1e1f83156015f634d0 SHA512 a4c0046135681d4cbb899d7bc40b7747d1e903f64d6c683aa6d7205a49deacdd5ee2da572ef4d99269dbf8a60a64be2d0b8ecd7385305ac9bc4d89bdae9c7977 WHIRLPOOL 3212d1d6240ef99f1b6046804979035ea5659d9329bb2c89e3a705c06658d7b3e67e4b517aa918d39fb2e9ae1c3e8b14087e01f772de125d24b4f5b973658aec
 AUX tripwire.txt 11492 SHA256 532a53633dca25ff96b13518e13c81744c191f4ec7ec28d46d8d865f74d77ee6 SHA512 ec53b2f71fb33f227628e1160a72fecf4a1aca7ee58b750945e7c0d0ce756a37666a02fe9e8ec235055fe6d28e1d20e77a449ae229f5d5d2349eaffe07827d47 WHIRLPOOL b00973d96255889bd8084c6f8d3a1718acb3bfdf41897b2de7839972fdf41f1146a6ed49ea9b999d060f75b13ed84b68123f1523fe5de8779d2c8a465c6e8960
 AUX twcfg.txt 604 SHA256 31d7d51cf90ee95627e27732524a3ba2b90f074ceda23d0035c52d2b02d90846 SHA512 c8a568638d5a18bb9508ee6f70aea815b8bfdb9efbf7823cdad59890a617bbe941454f6f4622e38e4ac4622e1d611c9fc085d73aec5a23b5c13ae7f1d783b388 WHIRLPOOL a290ac4d1e421890b99c9b4b78088a5ae5abd52d85c0e96e2398f89a97d8f0a2b958b3a7d0f1c8a2a7df0bc8e7cf8d71fbeb3d4557619f554a787d3718b4aa6e
@@ -13,18 +13,18 @@ AUX twinstall.sh 10100 SHA256 edc9c96dee54c1564de52ca5e755bfdac42a35d5b821a97d43
 DIST tripwire-2.4.2.2-src.tar.bz2 716616 SHA256 e09a7bdca9302e704cc62067399e0b584488f825b0e58c82ad6d54cd2e899fad SHA512 be39757aac7b74d4deac6c5048d0964d839a32f8f2a0d1878c4246888c4d59e35a503413595178c7af3a0da80725d0b36c21026dc734e1f760c9affda017bbbb WHIRLPOOL beb99e1ae055947a4b94a45f51492bcc453def5a41188f853ff3285a85ef8e2921274b86b095b77dbcdc8f549358f6216996a75ba391247e17bf7a29c78849c5
 DIST twpol.txt.gz 7586 SHA256 22a815584d8586dc5fd737749ca53435088d5867355bb6b73ec152b2ef53b5fe SHA512 70fd91a5b32d0a8f8272a0462e6e2af9090f8917de2f2c4357cc71e175d49bba5a64e40ab94ba12986ddeec6132f7cb3a034fb665fa43b8377b548ba877e478e WHIRLPOOL de7ad93c1927c2cd4d7be35668bdfcce6055e8cfadf1e76425b8e62b7847c6c139aaff54b0c5b874d506cb0ef3a8c5e125adf7391bcc6b0aebd84ea9c93713ab
 EBUILD tripwire-2.4.2.2-r1.ebuild 2381 SHA256 79be65afd466c3a1577f865f1385c5545916623dc7d75c35dd3f2f50486fb3ee SHA512 35dff5bb072bd78968bddfa0eb5db8cdd39a46607ea1dbc194a87ef5019c22984a28bb8a7cfdf15c621acb0e2daf6f40498bb272a8da302543eaa87f5396b975 WHIRLPOOL 9b5831a688fc523ed53658abcdcc153d3f90e3255812d6a837169946485f78c1337ea6ce6776824e792b8280044070a2fd1b2050ccc773bc22ead4aa1d3eac99
-EBUILD tripwire-2.4.2.2-r2.ebuild 2532 SHA256 42e6ce53633dd981c7421a264665d7c02691eaadba1d874eba0c874a2a958444 SHA512 80d0debf47ecb1c1aa6acdbabd1f769a8fdf02690e4bb2a4f58f5c49ce2224d51b50c0cc10ba283601e80a17086f0a7433fb88b2d8f2e426b95c9984affc6b8d WHIRLPOOL e058c5baeb4b164434ddaf9273614489a2fc97e26064ef662fe4c4ef2a25d93c5045ca8a58cc8acbddf46c66fbebee73476f5ef1d7de9441d79bc03ab6f2a573
+EBUILD tripwire-2.4.2.2-r2.ebuild 2556 SHA256 76ba7974c7fbd2b91a59a2240b2e113827acea55b321570064fdd4efdb10650e SHA512 a695adc7e617d37a696d75bfa995b51d5741f20689a498f31e0a55c7cd82a84a45cf37674f9c6482c6601ef179e338f5b4351f3f9eed5ca4fa46617dfee4d451 WHIRLPOOL b273389084d2c300382386b2dd6cbeb25c236d6885c7a3a8b1efa216baf57cb912ca23e3c97fb88579ce1900bdfa042d73da42d3cecab344852f17d37bd260ba
 EBUILD tripwire-2.4.2.2.ebuild 2335 SHA256 e6efe3768196fbdfb1493c57811bfa2cd5432cfd6b24ce18a040011711df5597 SHA512 92f3fa637d4d88b0f547b530fe8b5247667a0381031e1db003730bd38b33cb98ef3804dc13f2a99599e0ddb94ffb4a1e6a981d9bbf224b70a1198327b3294267 WHIRLPOOL 66e45daa633d302e05d75dee71dd00a9e78f32c1ade62fefd51a57768a7f90d8019b1670f5ea0a68185bf8f3dbad6ca1574b6f81c6724e4c6b292180cc453285
-MISC ChangeLog 9054 SHA256 6177f32b882581f166ccb7fbbbad2eb173b303390d9cc4b30dde771772d0fc6d SHA512 7d9e902bf217711791c246e9b4529ee3465e3e73877349f04ea7d308078ff23b7d19797ae959f51b9d3b8af5a8ee31de9dcdfe34f3a2d211233d187a1ff6a820 WHIRLPOOL 11e2f56e90f8050700f2d0bf2751a2de62e95c4d0086fa8bc8c8d40143166e4b1b5de8ab3730445ba41ebb9c22db1fdadee5d89f61a5ced6dbe5830823c3fdcd
-MISC metadata.xml 1389 SHA256 eb082326672693e86d883ebbd02b0e71f963084a31ecf710bc4cd702e38636f3 SHA512 884ebda129ba69d3bccf3d066ceb300788731e2c9456492e725cd31549cb3d49d55fca4a38f5e1d4a41953e42a0b443c49f7f505b8bcd38ddfd223221e11b49e WHIRLPOOL ac9565917ddf69698f463f8a7a17868bc61b65ee1b019084cf8edb6e8028d0ec5b9223f15b168a9a584bba43927f8185f0013b83e4b28ebe91b543a7f9bc2654
+MISC ChangeLog 9363 SHA256 ec63dcd0911951fef0e229005d609e4e8f3c022194b9fb8ea1dc3ac0b8dfaeca SHA512 8b43e329b58df914371e4f73e98a963a482ab5774c26ca82b95152d1fb14409adf8a6c857c5a035096316094ff1c00b79d6e00566ba3b4cde7b35822db7e4978 WHIRLPOOL 4b14ca748b31ca43350b1afc395819135232106cbd1dece29cb9b881ff862e1f864491fefa7f825baa2272f93c5f9c01495510b0f267ae9f5ec0724158960f39
+MISC metadata.xml 1455 SHA256 cb245edc5cb594145833a3da82079c1c0a0fb8d1f6da486e8bf2641418e0bff1 SHA512 ac151a11e43d598ba99f6482cb19c8dc7a9fdf2bc5b2ae39bb201960a30f3c240193a1db290dcfa996123acb5ba1fbc6b19ba8411e5b4cc355f25d72fa8a2bf1 WHIRLPOOL b50933172fa3c78add29b2732068c9e500810c5b4bff016b98394f6f67292ba0f1f8e731e3aac643d3f19c181279179894e7e53df59ed0b32b36d0d72e42d06e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSQqL7AAoJEA2sAkrWKOU2EHAH/2rnsXrkTbeukM+6AiaX86Iy
-KK0FsIbx2+wRjE2TR0PoL3CAQUCdl1X2LYjSNXb904c/xRzH0S8r7JEUgXzHnxKv
-yBkc0ClJFnXYy4U4cVex1hHt4XjMI8oGX0PVFfW3KwnqvOfk5yY21DccJ6ryHl4W
-XaBtYL54PiWVLbnjp0ObJgWLuf4gF2k9jMcrP+/zylRw4EJg3zb/J8ZNufTPd97r
-QVTdUZ0at5SE1PZUg0m2eX4wOyLwgKeIinUC9/dpCnv3owsII8plmn8EtnbZaEKO
-OExiL0W32LEMmX2sO6gOQ390ZKJmBU55FW5da224KSq7HSJs4OSgS0bybsa3gHo=
-=8ndV
+iQEcBAEBCAAGBQJSRBDSAAoJEA2sAkrWKOU22cQH/2L365rJQrGdnImpLPxhIawr
+IvOQ0SIjNyz/ziLbg//avJMJUevz/VlJB/rNaW0FMnCVnrcjdICyeW0MCFhYtvmY
+BrWpO6CbeWDi3RBV6KxsnsAtJU9RU6MB+krZ9y2XP8Q/6PxhKCWCkvIt2NoPp2Yf
+clmhOV4gv0HqcbLYd4RxHEUa2GC//YEdjwK3sn4i1egFa0sV/P49FX7fQgiVmjRU
+mN6loxaXnz1uv5IV3HNy3hPZaYi4e8m4rOrZ5OIeqd4vE+388lT1I52FeAN9ydjV
+dhifruKqruoZPSA7ck6tqMmq+WoDzWyKoOUO9FFatZ72Bb3LBpqd6T1xTKd0rAs=
+=5X5v
 -----END PGP SIGNATURE-----
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
 }