[app-admin/tripwire] Cleanup of old versions.

Package-Manager: portage-2.1.11.9/cvs/Linux i686

12 files changed, 18 insertions, 634 deletions

diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index 6cacaa337d58..f70163f48238 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/tripwire
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.46 2012/08/15 14:12:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.47 2012/09/20 19:31:43 nimiux Exp $
+
+  20 Sep 2012; Chema Alonso <nimiux@gentoo.org>
+  -files/tripwire-2.3.0-50-rfc822.patch, -files/tripwire-2.3.1-2-fhs.patch,
+  -files/tripwire-2.3.1-2-gcc-3.3.patch, -tripwire-2.3.1.2-r1.ebuild,
+  -files/tripwire-2.3.1-gcc3.patch, -tripwire-2.3.1.2-r2.ebuild,
+  -files/tripwire-format-string-email-report.diff,
+  -files/tripwire-friend-classes.patch, -files/tripwire-jbj.patch,
+  -files/tripwire-mkstemp.patch:
+  Cleanup of version 2.3.
 
   15 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
   tripwire-2.4.2.2-r1.ebuild:
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 327517827fc6..4285131bc7b4 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -1,40 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tripwire-2.3.0-50-rfc822.patch 557 SHA256 c7b135e171a413669554f0198e69cbe865ce2f0c1ddcddcdd15b0d297f4c8491 SHA512 05741809b9f12e8374039fa2da8f3a3d6f9712cb78cc11874d03ccbccca0ababf974703ed1c8fbe1b8751d18e07b4245d5bd3078c746a02ebeff7c7c36794809 WHIRLPOOL 152ae69d9507ac96042ab0a8a63ff17804e12e3f72169e399f8b5e95e08894dcb7230c1d095b9eb0596a20ec7583ed5fc5a0fe7d71eba2cc13ece833a70d33d4
-AUX tripwire-2.3.1-2-fhs.patch 577 SHA256 19ab8e5d04ec81a62770d0e6aba725ba74356f9f10e5265706812b9811db8431 SHA512 0852312d17b4de521b38de254f0543ef05ef9652c9d24058afec4841197b63b3c84daa8371071cd9fa63a51c7e21037ccdb4caa416c8dc018d2300cfeb072aab WHIRLPOOL a8a2bdc0ec9375c2f13c2c3e5abea178e908eeb9688aae484a30ed4d1e56852ac0a47c2f62644378548b9e1d9a53de63da18bc8560d71573621c1f4519024395
-AUX tripwire-2.3.1-2-gcc-3.3.patch 227 SHA256 888bf46f1b187a7f2067faad6013005cc48d7bb5e1365ec9b363542f683777ca SHA512 ded8cdcb69a0979f56e9dc3951daf496df7f5d641ad49e214c4fc2af7cf6bb28b62b596e4c108744c9d8059f2f5c45b7c359d63ebec49c370232fa1fd35e8ac7 WHIRLPOOL e6fd33d6801190477a5202eb690e73c2c92bd4c647e091d583376b5f481d5e611e757cc4db299c9aa71814f8199a16e927ba2b115de606df648e0dc91ca9d006
-AUX tripwire-2.3.1-gcc3.patch 10099 SHA256 c9908821e8db4e4be0bae927b1d0a090e39a76c79d4542f617c98f9d9af65a40 SHA512 058e901cb2bef544dabc7312267fb42a24529a483b72aa15425fd1132ca5ac2d14310d9798480df7823b94a5925e2693314b69afeb27c47422d9d4692dfd0d0e WHIRLPOOL 0df6e3e3d900bb549377c909fdc703df961e9a7171eb6d83852c8dea13aabcb6033aa1bcd27a17aef71b792e8d4aa551c5dcbf84fbc481b3fe677026fd2cca51
 AUX tripwire-2.4.2-version.patch 3809 SHA256 0803b9432159f8197c4d5ac1bacd2e1e1ae0be79c68b3bca27203509652c8701 SHA512 6cd7868d037c7150e2e316b13b8ea79fac359cc65a73434e8ec0cd5b0e6ce5cf136e21ae06821ab606f00141642120451a84ed6b0c68a58bd23699c5dd1a5bf1 WHIRLPOOL 45e53c92f0cefe5a7984eaf353e202fcd459d7e97e094ab20e3afc2fa272b90e692e392514b526ab6231ba97380a5645735225ada5858826fa8d2191ec77c0c9
 AUX tripwire-2.4.2.2-buildnum.patch 230 SHA256 820535353f2b0b4003929b7db4478412a4552fb69d11c46260d6d373faa98d53 SHA512 2b88c9366d2e922f8c18d128d92c2c8cdab2f8b5871d1666e27afabd0c5fc58bc218d662d9c71b64f93ce3ef238eee0a3ffb7b9bba227f2914ba72e680dbb360 WHIRLPOOL a8c7a65771840975c1bdcbe5355ef1c0200850ce6cf5189d02f2bcf2500c3ba08b5283bf17766a878f972b2d0047a0d82b3a3fca2ae386eb1c4ea57bbfca39ff
 AUX tripwire-2.4.2.2-gcc-4.7.patch 790 SHA256 4d86f4db8361bec19cffef6986af68f61c4062e273ebd13f0f082bd513a2cacc SHA512 e05bbe96371e1c21a14ec72c6d2ced7a9f39da43cf8ac59c8ee6a8da58b86727d42e0311a8a924c39816cfdb8334f405543c77b423e7be47488e6a47a75c2ceb WHIRLPOOL 704099d31c20254da591dcca93591ddc262b6185a21c4945af6853cd510fb630c053379b123a713d6c550ab284f551c58553e1b1b846d34a5cde83c03dad8379
-AUX tripwire-format-string-email-report.diff 472 SHA256 f1810f65bc0060539891ce46390c34ef276f68017b82f008b8b423f3f2e6a312 SHA512 0ddf7d88913fe379a69165ddf0f9647076c5bde42fd81705a26306ed4f0c810db0ad8e17a8b74a0c6cbdfb144eb8981759e74334ddcf90c5c6781fabc22a686a WHIRLPOOL 2a2bbb82f7d051d350695261c4325575034d48ec7061975b0eca3902fcc5fabe83fe868e6b65267dc348a647df58efa0cd0d1c5bc19969e9d0ade694cc23a91c
-AUX tripwire-friend-classes.patch 1246 SHA256 5fbe5a2b9a477cfa5f7ccca0bb962c216f350f6c491644bcdf44891b684f4080 SHA512 fb67066df7f2d99d1afc807f22aa95c5572ff92c42016eed6cf7a5239bab16233be9d9105c4ded9b0a4c6f72ae8302629d98c31b5f1b26df4306e9d9c9e94312 WHIRLPOOL 4b3136e5b4829de9a35abf10809207b0416860e13c1ca548225328a0c25bf6ec5dce5cef787346494f9e98e26a295e69c039e5c4ff5a15495e065908d1105c9c
-AUX tripwire-jbj.patch 2301 SHA256 bb688eb669f7d818853e0d225cf77b3cb915f03272b737861556c48d455c2afe SHA512 ba664e9ce56b9caa5ead9f699e9a260017a37674fe2e537414d3256dd49a0f75c9c4daa0df82c4658a9f0bfd3e99a05f7baf6d7805445ca90ef68b56f2011f6f WHIRLPOOL 678feecee5fa75c7d5f5d7f4b5b167bd2f4c0c852d3967057d24fa6d1a6de4338af14f4f0896f4fce4190702018f7d647fe2cd20d27441df8128a6c565502565
-AUX tripwire-mkstemp.patch 966 SHA256 b9c8493ba919fa92de1911bacab93b127688b52e620659ac611506e9880f22f6 SHA512 1af52e802f62de43a27f287f8ee6aa2dfaae7c396f61272b5f5f5a7d29e22ff7cb3add63e1fc79806d95122f06c9d95339852084b2181cbac837dc9b84ff9af2 WHIRLPOOL 35481dd93149918bf53fa38c8dab1a1a0c1b5dc69358f746e3491522a730f3ce0b13da6e32fcf5c71e5e763075b6824c6237f0b84b8672279b78d1f96cf9d1e3
 AUX tripwire.cron 315 SHA256 be7a322661616b558124d7c1124f742a20d9c83119648a1e1f83156015f634d0 SHA512 a4c0046135681d4cbb899d7bc40b7747d1e903f64d6c683aa6d7205a49deacdd5ee2da572ef4d99269dbf8a60a64be2d0b8ecd7385305ac9bc4d89bdae9c7977 WHIRLPOOL 3212d1d6240ef99f1b6046804979035ea5659d9329bb2c89e3a705c06658d7b3e67e4b517aa918d39fb2e9ae1c3e8b14087e01f772de125d24b4f5b973658aec
 AUX tripwire.txt 8401 SHA256 6fdb25e5f862eb1d68d3d30fda73613f57ad572a97e2914b3054c3422f9c263f SHA512 2b905a9bb446fa41bfd41ce240e4f956f42f408b8247ad7c7d62f9f7a4e407e77e6fb467432930f7c227f9b8e1d560ffb1902385946206e341f9e39fd62d6c5b WHIRLPOOL 026092664fe6ce0f1edcba4263f55926f483d5f028c5c1dc8bb28a927de0aff1f2ef54c8bb0f793ab1aa418a09e7c638df05f80f3e42ee5ab7ae0481eb333d3e
 AUX twcfg.txt 604 SHA256 31d7d51cf90ee95627e27732524a3ba2b90f074ceda23d0035c52d2b02d90846 SHA512 c8a568638d5a18bb9508ee6f70aea815b8bfdb9efbf7823cdad59890a617bbe941454f6f4622e38e4ac4622e1d611c9fc085d73aec5a23b5c13ae7f1d783b388 WHIRLPOOL a290ac4d1e421890b99c9b4b78088a5ae5abd52d85c0e96e2398f89a97d8f0a2b958b3a7d0f1c8a2a7df0bc8e7cf8d71fbeb3d4557619f554a787d3718b4aa6e
 AUX twinstall.sh 10100 SHA256 edc9c96dee54c1564de52ca5e755bfdac42a35d5b821a97d4342d6121ffe433d SHA512 6cc728e87f45cec8459f948d9ac00a7c8b8520d8c4b77b3c65fce20818899c663763f8eb13da66bef56f047d58334a2c44ba8abb528ca8dbddf768dfc101725d WHIRLPOOL 9435b7eb226c14423387cd1e4b1f426f68a77fe5323046e7e8db86b47ad902a6192cf794e7b5c7a19bb8e81b38050546c30bcde54008afbfe44b5365c82cebc1
-DIST tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2 739663 SHA256 a430bf6de02360c562344b8b5277d9ddd3fbf5ccb80d12782ff47a5be9c2999d SHA512 4f1e4eb74bbbcf49e04584cd0e3a7d2accc56d3fc715dd01e20df15f88c9b891f824e1a612ba7cbad23295c02d698b2a91d48edc430d72330ff970ffff9e64de WHIRLPOOL d1aeb192cc347066f5a20fec420fd7850b17a70ef5dbbaaa9bf42532de63894423552f836f1d0c5ddb38663cf0d321bcdd9d909f49c90b703356216e8a51d6bc
-DIST tripwire-2.3.1-2.tar.gz 1514955 SHA256 d339fbc093ce9e9f0c98fa2b454735bb2c13613103d6edcfcce57dbd3a394d2a SHA512 0a12c8bacec3eedc9ebf4380c5b8bbb9c87657b44ff938fb2bdc50403aedd43eb0e657fa80acc5e68872888ee3b58395875ce293bbaf04f4f38ecf38aa4f4a81 WHIRLPOOL 30a4859258735a1d0e17958e29c383457c443e328cb20f3195c4ff518747a2f70f4d47ca7f292ebc9da0c97de6ef871121731833cf6aa6afceb8d41bed934029
 DIST tripwire-2.4.2-src.tar.bz2 708623 SHA256 af89a368ed25a0edd7283fffa05a3b659e06f693626b947644dec60d0dc482b7 SHA512 07b004f5352e5f2e7d66a8fa86565c34b122b246d39814f2336b6a9df42a949fed94748216bf20dc0c9839576e4dcff3a29c428b4e56bccf19ef125d408ab482 WHIRLPOOL 3af1096b4627ea4399224d0c79aec7631ecf0337c493c2e831004c1f93dce347464e9842ba00521f5d1a6a1d32ddcc874a9a6f90c0c4c6480dcd74c163218e2f
 DIST tripwire-2.4.2.2-src.tar.bz2 716616 SHA256 e09a7bdca9302e704cc62067399e0b584488f825b0e58c82ad6d54cd2e899fad SHA512 be39757aac7b74d4deac6c5048d0964d839a32f8f2a0d1878c4246888c4d59e35a503413595178c7af3a0da80725d0b36c21026dc734e1f760c9affda017bbbb WHIRLPOOL beb99e1ae055947a4b94a45f51492bcc453def5a41188f853ff3285a85ef8e2921274b86b095b77dbcdc8f549358f6216996a75ba391247e17bf7a29c78849c5
 DIST tripwire.gif 4679 SHA256 569274b35357140e5543aefea4dc6d7db7047965d2f5d054536806a96314d869 SHA512 a6c1c241b7afe9ce5ba96e098e56cfeac6ca51b566f29a5c1ec4007d5c0b030c2b5d5c4b0f9b13e025bc6b22e0f165d10f4bffe8f435ffdb65b44d48f7cbf11d WHIRLPOOL 7fea6c32786af28bc7a618567b9867942794b8007fd20c6c96e7a62eb9d6872f2934ac818993528abc836b51b8b450cfbc4e290a6f10b159d8de253a882dead4
-DIST tripwire_2.3.1.2-6.1.diff.gz 608867 SHA256 29284dcf6f464e6624d57e24ba692eb6fc0b04eafe1d0f96b41be6d058e58cc0 SHA512 18ce2144f8529e84faded33b451463d83be9c2764dbaa2f2417cb52bed443e994718fc8ed0474b5a0d0ca0eea02dbc8e2892eadd978e267f3058901fb3e56726 WHIRLPOOL 01af2f0d89e7943e97d2f6c7f212628247cd4be4ad57deb880a9832efd9e5531cf5a845375aacc5820741932add09190d8e69b855467d403de43ee82a5d79c30
 DIST twpol.txt.gz 7586 SHA256 22a815584d8586dc5fd737749ca53435088d5867355bb6b73ec152b2ef53b5fe SHA512 70fd91a5b32d0a8f8272a0462e6e2af9090f8917de2f2c4357cc71e175d49bba5a64e40ab94ba12986ddeec6132f7cb3a034fb665fa43b8377b548ba877e478e WHIRLPOOL de7ad93c1927c2cd4d7be35668bdfcce6055e8cfadf1e76425b8e62b7847c6c139aaff54b0c5b874d506cb0ef3a8c5e125adf7391bcc6b0aebd84ea9c93713ab
-EBUILD tripwire-2.3.1.2-r1.ebuild 2867 SHA256 f5a6dfbd9da5b06cec9f3e2c625a7b76ea444add02233b19f319d59523847292 SHA512 74fefb56cbbc5066299c49fd08611b5d3dc83e5831b2d11f49d69038a99ce907d4d9cc24729ef885fd8945a8e6dac0e5ac8ba49877df45ab464464da20aa83b6 WHIRLPOOL ed32864db21b0600edc0995a790f58f4cc0949b707499d17931e6458c97bf252904dd17401419bc5d36fcf2f19d4578e06c29ca85829896a35bd3aee40886431
-EBUILD tripwire-2.3.1.2-r2.ebuild 2598 SHA256 e8af2fb3680b44baa5d9dd74910b4038429460a91cb868b4d6c3eb7fb0c69c04 SHA512 8f077c8f9e89149d25366f8c16d281dac5d26d8e1c87ad4000493bf93eae252ebef12f9054e16f9eb4aa77c9412f62a83f4551100b36a8d89f2d6449b8d0b864 WHIRLPOOL 5c53095a082b2d45a88c0d7efd5c0928538977a7a119697aef5e1e9a201de02e0ff56762afe6c8b695022cdf7defbaa32fc0b74e28f69ba04ddec48c2beb6a55
 EBUILD tripwire-2.4.2-r1.ebuild 2069 SHA256 db73c4d1cfee347e042356046eac03b8b01c1e2f10c09aa56b32c36a472a6b71 SHA512 8b13f5cd8fb4f7539d495b5aa8a596e1c201c0883ffe428be806e3152de34efb9848e6ca7e3ea57a3395247ed98d5b35c6994ae976a28c064339b56f4edfcd13 WHIRLPOOL 7fd2736178a611d416c892aa4297a45ad25827624d134b9d246bfb7b85aeff4e6a2d655cdee8489a571ad88170a90e7aabfbfbe6e0294f8d22ffc883d59e8c7b
 EBUILD tripwire-2.4.2.2-r1.ebuild 2360 SHA256 0d24e6b3a8c73da84793549c01d01c6d4d18a13a0a756939dfeedee86fcbb564 SHA512 63a428159cf011c0242c549cff8f128261181ceef92c9c363ec5ff00a24ed7c3181de761fef60a6cb896b21e469dd583f2c52289979699236829c2094438a3ae WHIRLPOOL 96e3e1dabecb8e71268305157ecf6fa955f9806a3c26e359fc97e0c202d383714a7687a4cc723ef8c7c6300b6d3dd980748a3e6882ce99ffcb39c45d553a3571
 EBUILD tripwire-2.4.2.2.ebuild 2312 SHA256 417837902efc74ca7b354c071a4c5325fdb1da422482a99e9c5f30a2435899f3 SHA512 4b0f099eb9961c5da0ffd514984a8a80d43e4690295a6a40603da23e68aee70bbdcdc1cd9662e50e532912c94b7cf1ad26cecffc7a2d6adfff6ba1ec4756b013 WHIRLPOOL 47f538384d2fc2719099850c2d3be156870eb2856cc18888d8f18a6bd511f9afa4b1f94c7678f79406de661c9fda0c41c39ec19f49676cb7b538d54645dac324
 EBUILD tripwire-2.4.2.ebuild 1968 SHA256 aafe039f3c5bf227687cb60e322279bd1d3797fdf0dddb98d9528153d4eb3380 SHA512 4233b1574fcf72f1b69698cc18cafcac2e264cef967bf3d8686563e1d7523cc7628c7eae319b67eee4d018b674ffbb97722fd2250ecb06b72954b19d3e3ca203 WHIRLPOOL 99dad8649cf6359bee121645e615722fdff841441c5e9bc0f058e188c40256ccb8f473edfe687b6fded15608759899568b96d8f706095b585bc6037503924f1d
-MISC ChangeLog 7605 SHA256 5f5e1c600f60574b7cb40c5696ce9138172c73ee75be049ba200fdb1fd00c35c SHA512 624bb0d0d58d148c51443cb1b4ef14d032c55f48cc9140c92b91d8ad685f89a8355d371b4624fd90be85d12ae0f70c0bf77d3e6018d25bef938c649f7e39bc5d WHIRLPOOL 005e8500cdea47afb9605447cfd9c29d2c3d05272597e8054eb167acc0c9137a1df6f9d27b42ccf47f95d1a4778a2c8e489974621cadd32e4dd826998c5ecff4
+MISC ChangeLog 8040 SHA256 2ce7324c53b0427eba51664c7b2fe995a73570c2169bf087e169cbf6b4c52d5c SHA512 99162fb8dfeae01d48b855a3155bed298a58be55dd7dec6cab9bd91afa76111aebcd8aafe8aac0cd29c711e1ef9bc8b5e10ea61c0ac42315f2aefdcc928529be WHIRLPOOL c55a513de82b3248d967de9d07f7a6bd4e15685a932337e83e2e963b0e09d6ba62b5be1ba3975867c7e3d7a4c316ac0433926730de4eaed808c0e4a0e8e283f6
 MISC metadata.xml 1250 SHA256 4a0e4a9254102c42ae05fec94121f540b5714e9439fe43bd82edc943546ebe4c SHA512 1741cb088f6ebc42aa362b0ae8d540f82d64f714d4f5629318e4cdd5e7a0227367fbfd839379dc5de546e825fc87cbc5c64190587755d2e82dea139347e1270a WHIRLPOOL 0f5402f608a4b22a6f7f7092ea796227617ebfe61954bc9d43a58726541c9e6c3ae1eb6376b74494af2773cb3ba10d7316705308bee54a07b38f58e6f0ddfee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlArrj0ACgkQl5yvQNBFVTUajgCfZufS1EgX00jhuHZeRFtaMzLM
-jU8AoJuC7cg+GgkDslGbt+0onlhfSyt5
-=LKz7
+iQEcBAEBCAAGBQJQW274AAoJEA2sAkrWKOU2dMsIAIhNMKdrjIJanERX1sW8uEBs
+vzXsunOGjA8V6BqndtL+y7xgLpEGKaKNQFr592nqgXxQOPu2qxIwBzqilAxwHTfJ
+GfkUAM/XvQdeBnZ48uP4cUpF249p50zidT6XWUhBbhRMDHZ/N0KT09NevS0GVbEh
+xM65lyUKM19q8ZLnNUFH9/DEZd7ggWqxQHW4hSY/RJtHJG9+VzBeUIilDHIhxNCK
+imAtuHUpRngjojrdLS5VI8fH/3FwJNuwft93lu+eKv9VWg8tTmzJkQfVTXkvJP3t
+R7wC+egwi0eUPXk4RuNvMzFZtMLDin90Cqt0R1jHTATaO1rv2/XIytLfx4jr65U=
+=xRzR
 -----END PGP SIGNATURE-----
diff --git a/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch b/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch
deleted file mode 100644
index 7811135a9ffa..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur tripwire-2.3.0-50-orig/src/tripwire/mailmessage.cpp tripwire-2.3.0-50/src/tripwire/mailmessage.cpp
---- tripwire-2.3.0-50-orig/src/tripwire/mailmessage.cpp	Sat Oct 28 02:26:18 2000
-+++ tripwire-2.3.0-50/src/tripwire/mailmessage.cpp	Thu Jul  5 05:12:54 2001
-@@ -241,7 +241,7 @@
- 	time_t current_time = time(NULL);
- 	tm = localtime ( &current_time );
- 	
--	const TCHAR* szFormat = _T("%a %d %b %Y %H:%M:%S %z");
-+	const TCHAR* szFormat = _T("%a, %d %b %Y %H:%M:%S %z");
- 	
- 	size_t numChars = _tcsftime( szDate, countof( szDate ), szFormat, tm );
- 	
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch b/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch
deleted file mode 100644
index 0a146ebb6f87..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-The header defines USES_FHS, while some source files expect USE_FHS, so
-define both to be safe.
-
---- tripwire-2.3.1-2/src/core/platform.h	Fri Aug 10 00:29:29 2001
-+++ tripwire-2.3.1-2/src/core/platform.h	Fri Aug 10 00:29:36 2001
-@@ -291,6 +291,7 @@
- //       where <tw-exe-dir> is the directory the tripwire executable is located in.
- //=============================================================================
- #define USES_FHS 				IS_LINUX
-+#define USE_FHS 				IS_LINUX
- 
- //=============================================================================
- // Miscellaneous
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch b/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch
deleted file mode 100644
index 9d9f30b2a8cd..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/debug.h~	2000-10-28 03:15:19.000000000 +0200
-+++ src/core/debug.h	2003-07-14 06:16:37.000000000 +0200
-@@ -43,7 +43,7 @@
- 
- 
- #include <iostream>
--#include <varargs.h>
-+#include <stdarg.h>
- #include "types.h"
- 
- //
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch b/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch
deleted file mode 100644
index 9b2ae7539ce1..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch
+++ /dev/null
@@ -1,256 +0,0 @@
---- tripwire-2.3.1-2/src/core/stringutil.h.sopwith	Sun Feb  4 00:38:27 2001
-+++ tripwire-2.3.1-2/src/core/stringutil.h	Fri Feb  1 01:11:59 2002
-@@ -64,7 +64,7 @@
-     Convert( std::string& lhs, const std::string& rhs )
-     {
-       lhs = rhs;
--      return lhs.c_str();
-+      return std::string::const_iterator(lhs.c_str());
-     }
- 
-   /// Specialize Everything Else
---- tripwire-2.3.1-2/src/core/charutil.cpp.sopwith	Sat Oct 28 15:22:55 2000
-+++ tripwire-2.3.1-2/src/core/charutil.cpp	Fri Feb  1 01:11:59 2002
-@@ -105,7 +105,7 @@
-     }
- 
-     first = cur;
--    last = tss::strinc( cur );
-+    last = TSTRING::const_iterator(tss::strinc( cur.base() ));
-     return true;
- }
- 
---- tripwire-2.3.1-2/src/core/displayencoder.cpp.sopwith	Fri Oct 27 21:15:20 2000
-+++ tripwire-2.3.1-2/src/core/displayencoder.cpp	Fri Feb  1 01:11:59 2002
-@@ -828,7 +828,8 @@
-             ach[0] = ch;
-             for( sack_type::const_iterator atE = m_encodings.begin(); atE != m_encodings.end(); atE++ )
-             {
--                if( (*atE)->NeedsEncoding( &ach[0], &ach[1] ) )
-+                if( (*atE)->NeedsEncoding( std::string::const_iterator(&ach[0]),
-+					   std::string::const_iterator(&ach[1]) ) )
-                 {
-                     if( fFailedATest )
-                         return false; // each char can only fail one test
---- tripwire-2.3.1-2/src/core/displayutil.cpp.sopwith	Sat Oct 28 15:22:55 2000
-+++ tripwire-2.3.1-2/src/core/displayutil.cpp	Fri Feb  1 01:11:59 2002
-@@ -45,7 +45,7 @@
-     TOSTRINGSTREAM sstr;
-     TSTRING strT;
-     bool fFirstLine = true;
--    for( TSTRING::const_iterator i = str.begin(); i != str.end(); i = tss::strinc( i ) )
-+    for( TSTRING::const_iterator i = str.begin(); i != str.end(); i = TSTRING::const_iterator(tss::strinc( i.base() )) )
-     {
-         // return found -- add line to output string
-         if( _T('\n') == *i )
-@@ -74,7 +74,7 @@
-         else
-         {
-             // add char to string   
--            strT.append( i, (TSTRING::const_iterator)tss::strinc( i ) );
-+            strT.append( i, TSTRING::const_iterator(tss::strinc( i.base() )) );
-         }
-     }    
-                 
---- tripwire-2.3.1-2/src/cryptlib/misc.h.sopwith	Fri Oct 27 20:26:21 2000
-+++ tripwire-2.3.1-2/src/cryptlib/misc.h	Fri Feb  1 01:11:59 2002
-@@ -150,7 +150,7 @@
- 	operator T *()
- 		{return ptr;}
- 
--#if !defined(_MSC_VER) && !defined(_KCC)
-+#if !defined(_MSC_VER) && !defined(_KCC) && 0
-     T *operator +(unsigned int offset)
- 		{return ptr+offset;}
- 	const T *operator +(unsigned int offset) const
---- tripwire-2.3.1-2/src/cryptlib/i686-pc-linux.mak.sopwith	Fri Feb  1 01:12:57 2002
-+++ tripwire-2.3.1-2/src/cryptlib/i686-pc-linux.mak	Fri Feb  1 01:13:12 2002
-@@ -71,12 +71,12 @@
- # Recusively call make defining the appropriate $(D_FLAGS) var
- 
- debug:
--	gmake -f $(MAKEFILE) cryptlib_d.a "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
--#	gmake -f $(MAKEFILE) cryptest_d "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
-+	$(MAKE) -f $(MAKEFILE) cryptlib_d.a "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
-+#	$(MAKE) -f $(MAKEFILE) cryptest_d "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
- 
- release: 
--	gmake -f $(MAKEFILE) cryptlib.a "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
--#	gmake -f $(MAKEFILE) cryptest "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
-+	$(MAKE) -f $(MAKEFILE) cryptlib.a "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
-+#	$(MAKE) -f $(MAKEFILE) cryptest "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
- 
-  
- ###############################################################################
---- tripwire-2.3.1-2/src/db/hierdatabase.cpp.sopwith	Sun Feb 25 00:41:13 2001
-+++ tripwire-2.3.1-2/src/db/hierdatabase.cpp	Fri Feb  1 01:11:59 2002
-@@ -255,7 +255,8 @@
- 	}
- 	else
- 	{
--		int offset	= rhs.mIter - rhs.mEntries.begin();
-+	        int offset;
-+		offset = -(rhs.mEntries.begin() - rhs.mIter);
- 		mIter		= mEntries.begin() + offset;
- 	}
- 
---- tripwire-2.3.1-2/src/fco/fconame.cpp.sopwith	Fri Oct 27 20:25:41 2000
-+++ tripwire-2.3.1-2/src/fco/fconame.cpp	Fri Feb  1 01:11:59 2002
-@@ -269,7 +269,7 @@
- 	
-     mpPathName->ClearList();
- 	
--	TSTRING::const_iterator at  = ( pszin + 0 );
-+	TSTRING::const_iterator at  = TSTRING::const_iterator( pszin + 0 );
-     TSTRING::const_iterator end = at;
-     while ( *end ) ++end;               // NOTE: Find end
- 
-@@ -277,9 +277,9 @@
- 	while ( at < end )
- 	{
- 		while ( !(*at == mDelimiter) && at < end )
--            at = tss::strinc( at );
-+            at = TSTRING::const_iterator(tss::strinc( at.base() ));
- 
--        if ( at == beg && tss::strinc(at) >= end && at != pszin )
-+        if ( at == beg && TSTRING::const_iterator(tss::strinc(at.base())) >= end && at.base() != pszin )
-             break;
- 
- 		cFCONameTblNode* pNode = 
-@@ -287,7 +287,7 @@
- 
-         mpPathName->mNames.push_back( pNode );
- 		
--        beg = ( at = tss::strinc( at ) );
-+        beg = ( at = TSTRING::const_iterator(tss::strinc( at.base() )) );
- 	}
- }
- 
-Binary files tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc.sopwith and tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc differ
---- tripwire-2.3.1-2/src/siggen/siggenmain.cpp.sopwith	Fri Oct 27 20:26:25 2000
-+++ tripwire-2.3.1-2/src/siggen/siggenmain.cpp	Fri Feb  1 01:11:59 2002
-@@ -118,11 +118,7 @@
-         // set unexpected and terminate handlers
-         // Note: we do this before Init() in case it attempts to call these handlers
-         // TODO: move this into the Init() routine
--#if IS_GCC
--            #define EXCEPTION_NAMESPACE 
--        #else
--            #define EXCEPTION_NAMESPACE std::
--        #endif
-+#define EXCEPTION_NAMESPACE std::
-         EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
-         EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
- 
---- tripwire-2.3.1-2/src/tripwire/mailmessage.cpp.sopwith	Fri Feb  1 01:11:59 2002
-+++ tripwire-2.3.1-2/src/tripwire/mailmessage.cpp	Fri Feb  1 01:11:59 2002
-@@ -509,9 +509,9 @@
-     std::string::size_type stringSize = 0;
-     std::string::const_iterator at;
-     std::string::difference_type charSize;
--    for( at = sIn.begin(), charSize = ( tss::strinc( at ) - at );
-+    for( at = sIn.begin(), charSize = ( std::string::const_iterator(tss::strinc( at.base() )) - at );
-          at != sIn.end();
--         at += charSize, charSize = ( tss::strinc( at ) - at ) )
-+         at += charSize, charSize = ( std::string::const_iterator(tss::strinc( at.base() )) - at ) )
-     {
-         ASSERT( charSize > 0 );
- 
---- tripwire-2.3.1-2/src/tripwire/tripwiremain.cpp.sopwith	Sat Feb 24 14:02:12 2001
-+++ tripwire-2.3.1-2/src/tripwire/tripwiremain.cpp	Fri Feb  1 01:11:59 2002
-@@ -122,11 +122,7 @@
-         // set unexpected and terminate handlers
-         // Note: we do this before Init() in case it attempts to call these handlers
-         // TODO: move this into the Init() routine
--#if IS_GCC
--            #define EXCEPTION_NAMESPACE 
--        #else
--            #define EXCEPTION_NAMESPACE std::
--        #endif
-+#define EXCEPTION_NAMESPACE std::
-         EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
-         EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
- 
---- tripwire-2.3.1-2/src/twadmin/twadminmain.cpp.sopwith	Fri Oct 27 20:26:22 2000
-+++ tripwire-2.3.1-2/src/twadmin/twadminmain.cpp	Fri Feb  1 01:11:59 2002
-@@ -86,11 +86,7 @@
-         // set unexpected and terminate handlers
-         // Note: we do this before Init() in case it attempts to call these handlers
-         // TODO: move this into the Init() routine
--#if IS_GCC
--            #define EXCEPTION_NAMESPACE 
--        #else
--            #define EXCEPTION_NAMESPACE std::
--        #endif
-+#define EXCEPTION_NAMESPACE std::
-         EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
-         EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
- 
---- tripwire-2.3.1-2/src/twparser/policyparser.cpp.sopwith	Sat Feb 24 14:02:12 2001
-+++ tripwire-2.3.1-2/src/twparser/policyparser.cpp	Fri Feb  1 01:11:59 2002
-@@ -228,7 +228,7 @@
-          // at gets incremented when used....
-        )
-     {
--        int nBytes = ::mblen( (char*)at, MB_CUR_MAX );
-+        int nBytes = ::mblen( at.base(), MB_CUR_MAX );
-         if ( nBytes == -1 )
-         {
-             d.TraceDebug( "Unrecognized Character: %c\n", *at );
---- tripwire-2.3.1-2/src/twprint/twprintmain.cpp.sopwith	Fri Oct 27 20:26:19 2000
-+++ tripwire-2.3.1-2/src/twprint/twprintmain.cpp	Fri Feb  1 01:11:59 2002
-@@ -98,8 +98,8 @@
- #if IS_GCC
-           #define EXCEPTION_NAMESPACE 
-         #else
--          #define EXCEPTION_NAMESPACE std::
-         #endif
-+#define EXCEPTION_NAMESPACE std::
- 	  EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
- 	  EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
- 
---- tripwire-2.3.1-2/src/Makefile.sopwith	Sat Mar  3 23:03:52 2001
-+++ tripwire-2.3.1-2/src/Makefile	Fri Feb  1 01:11:59 2002
-@@ -93,7 +93,7 @@
- # file to Makefile.linux_intel or something similar.
- 
- MAKEFILE = Makefile
--GMAKE = gmake
-+GMAKE = $(MAKE)
- 
- #-----------------------------------------------------------------------------
- # STLPORT
-@@ -145,7 +145,7 @@
- 
- # It's handy for clean, .PHONY, etc. to have one big list
- #
--targets  = $(debugbinaries) $(debuglibraries) $(releasebinaries) $(releaselibraries) STLport_d STLport_r
-+targets  = $(debugbinaries) $(debuglibraries) $(releasebinaries) $(releaselibraries) 
- 
- 
- # Let make know these aren't real file names...
---- tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc.sopwith	Fri Oct 27 20:26:25 2000
-+++ tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc	Fri Feb  1 01:11:59 2002
-@@ -19,11 +19,11 @@
- # General variable definitions
- #
- 
--GMAKE = /usr/bin/gmake
-+GMAKE = $(MAKE)
- CC = g++
- CXX = $(CC)
- AR = ar
--SYSDEF=-D_REDHAT -D_IX86 -D_GCC
-+SYSDEF=-D_REDHAT -D_IX86 -D_GCC $(RPM_OPT_FLAGS)
- STLPORT=../STLport-4.0
- 
- #
-@@ -33,7 +33,7 @@
- CXXFLAGS_R = -I.. -I$(STLPORT)/stlport -ftemplate-depth-32
- DEFINES_R = -DNDEBUG $(SYSDEF)
- LINKFLAGS_R = -static
--LIBRARYFLAGS_R = -L../../lib/$(SYSPRE)_r -lm -lstlport_gcc
-+LIBRARYFLAGS_R = -L../../lib/$(SYSPRE)_r -lm
- ARFLAGS_R = crv
- 
- #
diff --git a/app-admin/tripwire/files/tripwire-format-string-email-report.diff b/app-admin/tripwire/files/tripwire-format-string-email-report.diff
deleted file mode 100644
index 7e4f2676d4ef..000000000000
--- a/app-admin/tripwire/files/tripwire-format-string-email-report.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r1.1 -r1.2
---- src/tripwire/pipedmailmessage.cpp   21 Jan 2001 00:46:48 -0000      1.1
-+++ src/tripwire/pipedmailmessage.cpp   26 May 2004 20:59:15 -0000      1.2
-@@ -180,7 +180,7 @@
-
- void cPipedMailMessage::SendString( const TSTRING& s )
- {
--    if( _ftprintf( mpFile, s.c_str() ) < 0 )
-+    if( _ftprintf( mpFile, "%s", s.c_str() ) < 0 )
-     {
-         TOSTRINGSTREAM estr;
-         estr << TSS_GetString( cTripwire, tripwire::STR_ERR2_MAIL_MESSAGE_COMMAND
-)
diff --git a/app-admin/tripwire/files/tripwire-friend-classes.patch b/app-admin/tripwire/files/tripwire-friend-classes.patch
deleted file mode 100644
index 4dbcc56bd000..000000000000
--- a/app-admin/tripwire/files/tripwire-friend-classes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nru tripwire-2.3.1-2/src/fco/fconame.h tripwire-2.3.1-2-p1/src/fco/fconame.h
---- tripwire-2.3.1-2/src/fco/fconame.h	2000-10-27 18:25:40.000000000 -0600
-+++ tripwire-2.3.1-2-p1/src/fco/fconame.h	2006-03-08 11:21:03.000000000 -0700
-@@ -49,6 +49,7 @@
- ///////////////////////////////////////////////////////////////////////////////
- class cFCONameTblNode;
- class cFCONameIter;
-+class cFCOName_i;
- 
- class cFCOName : public iTypedSerializable
- {
-diff -Nru tripwire-2.3.1-2/src/fco/fcosetimpl.h tripwire-2.3.1-2-p1/src/fco/fcosetimpl.h
---- tripwire-2.3.1-2/src/fco/fcosetimpl.h	2000-10-27 18:25:39.000000000 -0600
-+++ tripwire-2.3.1-2-p1/src/fco/fcosetimpl.h	2006-03-08 11:07:14.000000000 -0700
-@@ -46,6 +46,8 @@
- #include "fconame.h"
- #endif
- 
-+class cFCOIterImpl;
-+
- class cFCOSetImpl : public iFCOSet
- {
- 	friend class cFCOIterImpl;
-diff -Nru tripwire-2.3.1-2/src/tw/fcoreport.h tripwire-2.3.1-2-p1/src/tw/fcoreport.h
---- tripwire-2.3.1-2/src/tw/fcoreport.h	2000-10-27 18:25:36.000000000 -0600
-+++ tripwire-2.3.1-2-p1/src/tw/fcoreport.h	2006-03-08 11:07:53.000000000 -0700
-@@ -85,6 +85,7 @@
- class cFileHeaderID;
- class cErrorQueue;
- class cFCOReportGenreHeader;
-+class cFCOReportSpecIter; 
- 
- class cFCOReport : public iTypedSerializable
- {
diff --git a/app-admin/tripwire/files/tripwire-jbj.patch b/app-admin/tripwire/files/tripwire-jbj.patch
deleted file mode 100644
index 9906c23a40ec..000000000000
--- a/app-admin/tripwire/files/tripwire-jbj.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- tripwire-2.3.1-2/src/core/resources.h.jbj	2002-11-16 13:08:59.000000000 -0500
-+++ tripwire-2.3.1-2/src/core/resources.h	2002-11-16 14:07:42.000000000 -0500
-@@ -98,7 +98,7 @@
-         typedef Value&              ValueRef;
-         typedef const Value&        ConstValueRef;
-         
--        typedef Table::value_type   Pair;           
-+        typedef typename Table::value_type   Pair;           
- 
-         
- 
---- tripwire-2.3.1-2/src/core/archive.cpp.jbj	2002-11-16 13:42:37.000000000 -0500
-+++ tripwire-2.3.1-2/src/core/archive.cpp	2002-11-16 13:42:51.000000000 -0500
-@@ -45,7 +45,7 @@
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <iostream.h>
-+#include <iostream>
- #include "file.h"
- #include "stringutil.h"
- 
---- tripwire-2.3.1-2/src/core/stringutil.h.jbj	2002-11-16 13:44:39.000000000 -0500
-+++ tripwire-2.3.1-2/src/core/stringutil.h	2002-11-16 13:49:08.000000000 -0500
-@@ -169,7 +169,7 @@
-             //- - - - - - - - - - - - - - - - - - - - - - - - - -
-             // required typedef ( to be a container it must have this... )
-             //- - - - - - - - - - - - - - - - - - - - - - - - - -
--           typedef _ParentT::value_type    value_type;
-+           typedef typename _ParentT::value_type    value_type;
- 
-             //- - - - - - - - - - - - - - - - - - - - - - - - - -
-             // required constructors and assignment operators...
---- tripwire-2.3.1-2/src/tw/twutil.cpp.jbj	2002-11-16 14:34:10.000000000 -0500
-+++ tripwire-2.3.1-2/src/tw/twutil.cpp	2002-11-16 14:37:07.000000000 -0500
-@@ -672,7 +672,7 @@
-         throw eSerializerInputStreamFmt(_T(""), filename, eSerializer::TY_FILE);
-     }
- 
--    d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
-+    // d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
- 
-     // check for a mismatched header
-     if (fileHeader.GetID() != cConfigFile::GetFileHeaderID())
-@@ -775,7 +775,7 @@
-         throw eSerializerInputStreamFmt(_T(""), filename.c_str(), eSerializer::TY_FILE);
-     }
- 
--    d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
-+    // d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
- 
-     // check for a mismatched header
-     if (fileHeader.GetID() != cConfigFile::GetFileHeaderID())
diff --git a/app-admin/tripwire/files/tripwire-mkstemp.patch b/app-admin/tripwire/files/tripwire-mkstemp.patch
deleted file mode 100644
index daeae8cc33a5..000000000000
--- a/app-admin/tripwire/files/tripwire-mkstemp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- tripwire-2.3.1-2/src/core/unix/unixfsservices.cpp.mkstemp	2001-02-24 14:02:12.000000000 -0500
-+++ tripwire-2.3.1-2/src/core/unix/unixfsservices.cpp	2003-01-04 12:54:33.000000000 -0500
-@@ -243,6 +243,7 @@
- {
-     char* pchTempFileName;
-     char szTemplate[MAXPATHLEN];
-+    int fd;
- 
- #ifdef _UNICODE
-     // convert template from wide character to multi-byte string
-@@ -253,13 +254,12 @@
-     strcpy( szTemplate, strName.c_str() );
- #endif
- 
--    // create temp filename
--    pchTempFileName = mktemp( szTemplate );
--
--    //check to see if mktemp failed
--    if ( pchTempFileName == NULL || strlen(pchTempFileName) == 0) {
--      throw eFSServicesGeneric( strName );
--    }
-+    // create temp filename and check to see if mkstemp failed
-+    if ((fd = mkstemp( szTemplate )) == -1)
-+	throw eFSServicesGeneric( strName );
-+    else
-+	close(fd);
-+    pchTempFileName = szTemplate;
- 
-     // change name so that it has the XXXXXX part filled in
- #ifdef _UNICODE
diff --git a/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild b/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
deleted file mode 100644
index 1a22a7876ef3..000000000000
--- a/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild,v 1.15 2009/10/11 23:59:13 halcy0n Exp $
-
-inherit eutils flag-o-matic
-
-TW_VER="2.3.1-2"
-DESCRIPTION="Open Source File Integrity Checker and IDS"
-HOMEPAGE="http://www.tripwire.org/"
-SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}.tar.gz
-	http://non-us.debian.org/debian-non-US/pool/non-US/main/t/tripwire/tripwire_2.3.1.2-6.1.diff.gz
-	mirror://gentoo/twpol.txt.gz
-	mirror://gentoo/tripwire.gif"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-alpha x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-util/patchutils
-	sys-devel/automake
-	dev-libs/openssl"
-RDEPEND="virtual/cron
-	virtual/mta
-	dev-libs/openssl"
-
-S="${WORKDIR}"/tripwire-${TW_VER}
-
-src_unpack() {
-	# unpack tripwire source tarball
-	unpack tripwire-${TW_VER}.tar.gz
-	unpack twpol.txt.gz
-	cd "${S}"
-
-	# some patches ive collected/made for tripwire
-	# mostly from mandrake, some from other sources
-	epatch "${FILESDIR}"/tripwire-2.3.0-50-rfc822.patch
-	epatch "${FILESDIR}"/tripwire-2.3.1-2-fhs.patch
-	epatch "${FILESDIR}"/tripwire-2.3.1-2-gcc-3.3.patch
-	epatch "${FILESDIR}"/tripwire-2.3.1-gcc3.patch
-	epatch "${FILESDIR}"/tripwire-jbj.patch
-	epatch "${FILESDIR}"/tripwire-mkstemp.patch
-
-	# pull out the interesting debian patches
-	filterdiff  -i '*/man/man8/twadmin.8' -z  --strip=1	\
-		"${DISTDIR}"/tripwire_2.3.1.2-6.1.diff.gz > "${T}"/debian-patch.diff
-	epatch "${T}"/debian-patch.diff
-
-	# cleanup ready for build
-	rm -rf "${S}"/src/STLport*
-	touch "${S}"/src/STLport_r "${S}"/src/STLport_d
-
-	# security fix, http://www.securityfocus.com/archive/1/365036
-	epatch "${FILESDIR}"/tripwire-format-string-email-report.diff
-}
-
-src_compile() {
-	cd "${S}"/src
-
-	# tripwire can be sensitive to compiler optimisation.
-	# see #32613, #45823, and others.
-	# 	-taviso@gentoo.org
-	strip-flags
-
-	emake -j1 release RPM_OPT_FLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	dosbin "${S}"/bin/*/{tripwire,twadmin,twprint} || die
-
-	for i in {4,5,8}
-	do
-		cd "${S}"/man/man${i}
-		doman *.$i
-		cd "${S}"
-	done
-
-	dodir /etc/tripwire
-	dodir /var/lib/tripwire/report
-
-	exeinto /etc/cron.daily
-	doexe "${FILESDIR}"/tripwire.cron
-
-	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
-		"${WORKDIR}"/tripwire.gif "${FILESDIR}"/tripwire.txt
-
-	insinto /etc/tripwire
-	doins "${WORKDIR}"/twpol.txt "${FILESDIR}"/twcfg.txt
-
-	exeinto /etc/tripwire
-	doexe "${FILESDIR}"/twinstall.sh
-
-	fperms 755 /etc/tripwire/twinstall.sh /etc/cron.daily/tripwire.cron
-}
-
-pkg_postinst() {
-	elog "After installing this package, you should run \"/etc/tripwire/twinstall.sh\""
-	elog "to generate cryptographic keys, and \"tripwire --init\" to initialize the"
-	elog "database Tripwire uses."
-	elog
-	elog "A quickstart guide is included with the documentation."
-	elog
-}
diff --git a/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild b/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild
deleted file mode 100644
index 7aac0c360c1f..000000000000
--- a/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild,v 1.16 2012/04/25 16:07:04 jlec Exp $
-
-inherit eutils flag-o-matic autotools
-
-TW_VER="2.3.1-2"
-DESCRIPTION="Open Source File Integrity Checker and IDS"
-HOMEPAGE="http://www.tripwire.org/"
-SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}.tar.gz
-	mirror://gentoo/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
-	mirror://gentoo/twpol.txt.gz
-	mirror://gentoo/tripwire.gif"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
-IUSE="ssl"
-
-DEPEND="sys-devel/automake
-	sys-devel/autoconf
-	dev-util/patchutils
-	ssl? ( dev-libs/openssl )"
-RDEPEND="virtual/cron
-	virtual/mta
-	ssl? ( dev-libs/openssl )"
-
-S="${WORKDIR}"/tripwire-${TW_VER}
-
-src_unpack() {
-	# unpack tripwire source tarball
-	unpack tripwire-${TW_VER}.tar.gz
-	unpack twpol.txt.gz
-	cd "${S}"
-
-	# Paul Herman has been maintaining some updates to tripwire
-	# including autoconf support and portability fixes.
-	# http://www.frenchfries.net/paul/tripwire/
-	export EPATCH_OPTS="-F3 -l"
-	epatch "${FILESDIR}"/tripwire-friend-classes.patch
-	epatch "${DISTDIR}"/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
-	epatch "${FILESDIR}"/tripwire-2.3.0-50-rfc822.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	# tripwire can be sensitive to compiler optimisation.
-	# see #32613, #45823, and others.
-	# 	-taviso@gentoo.org
-	strip-flags
-	append-flags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
-
-		ebegin "	Preparing Directory"
-			mkdir "${S}"/lib "${S}"/bin || die
-		eend
-	einfo "Done."
-	chmod +x configure
-	econf `use_enable ssl openssl`
-	emake || die
-}
-
-src_install() {
-	dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
-	doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
-	dodir /etc/tripwire /var/lib/tripwire{,/report}
-	keepdir /var/lib/tripwire{,/report}
-
-	exeinto /etc/cron.daily
-	doexe "${FILESDIR}"/tripwire.cron
-
-	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
-		"${WORKDIR}"/tripwire.gif "${FILESDIR}"/tripwire.txt
-
-	insinto /etc/tripwire
-	doins "${WORKDIR}"/twpol.txt "${FILESDIR}"/twcfg.txt
-
-	exeinto /etc/tripwire
-	doexe "${FILESDIR}"/twinstall.sh
-
-	fperms 755 /etc/tripwire/twinstall.sh /etc/cron.daily/tripwire.cron
-}
-
-pkg_postinst() {
-	elog "After installing this package, you should run \"/etc/tripwire/twinstall.sh\""
-	elog "to generate cryptographic keys, and \"tripwire --init\" to initialize the"
-	elog "database Tripwire uses."
-	elog
-	elog "A quickstart guide is included with the documentation."
-	elog
-}