tested improperly, bump is proper now

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

6 files changed, 67 insertions, 23 deletions

diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index 9887e6e088c2..802f56a53b01 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-forensics/rkhunter
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.98 2014/05/27 13:11:54 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.99 2014/05/27 16:08:08 zerochaos Exp $
+
+  27 May 2014; Rick Farina <zerochaos@gentoo.org>
+  +files/rkhunter-1.4.0.conf.patch, +files/rkhunter-1.4.2.conf.patch,
+  -files/rkhunter.conf.patch, rkhunter-1.4.0.ebuild, rkhunter-1.4.2.ebuild:
+  tested improperly, bump is proper now
 
 *rkhunter-1.4.2 (27 May 2014)
 
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index 611085fd3fe7..ff057066cf87 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA512
 
 AUX rkhunter-1.3.cron 4050 SHA256 011216f98936daa079a7c9db4bec8620b0dae793b2de7649f532bbc15c16f751 SHA512 02114707162a918f96d5c6e9161b62d2905aa1999b03561f6371be5216a7893b8d5aa247262d225b21c6e87a1df8f181ab973d807d12b0f976c646379ba9f1da WHIRLPOOL 0dfdd9c12f7df1f79337295e297c28b1f1a1f215e4b3b3df71079fda4e5d5f24e63f9d3af6ea28eada41df681694a63bc0e07575c08c20804b11440f613d4069
+AUX rkhunter-1.4.0.conf.patch 786 SHA256 2ca73ff5b9e7b6b3b1c65948813f5124662b8fb6087108adebccd9aa5e4a19d8 SHA512 9a56075dabed278dc837e91872c62ca9fd648b35c1f7f37755e58f17f3f474d03d8dd6313e9de0a7cbc1c4506d12cb81015ac258c184b43139d5ff6d2afac603 WHIRLPOOL 0eff7c92543a10dfee1ccf2d86fffcd48473e12a23d5d2d46002453e87e54e14a3ab60d05b6c104d784b507a0a456e0c4817725635ab6421139a9b1b8330a8e1
+AUX rkhunter-1.4.2.conf.patch 1250 SHA256 ce828b367b04286e5ca9b564455bfadbb9cdfe01dfb0d6601f45adb49265142c SHA512 654887bea5d3b7388c11c9a59d3d924d763268c3552bee82a0bcf9b5077803eaa0cf16b7346aeaac44e817bfdd30e5d74abd10d12eb07f0bc1a97c57b850aefe WHIRLPOOL ccac3d0bd526a48b303ef6ca71ab8bbeb2f177d7fe6788b6b8bd194e7436e4afcbc9db3e016f1af50cc6b29a390b9407121e14e908a024eb01086d955b238c47
 AUX rkhunter.bash-completion 2628 SHA256 d99776d6b300697cb6571e409e6c93bc96e68980922ee22b76eda56f26d0d970 SHA512 575fcd0821f670f3e75acc3fe0fea3efce672f7ba865d006ed8953d053e3b168aaac432407c1e2a62bf49290cd898ac95087d55d3b4fb8527e4de760950b4bc3 WHIRLPOOL 9e0f670e827bb20623655e621113536b9a808fffdaee0de451358f1f04d51c43c05f940bd1b1328768b801142a2932cd39d232e25dedd6dc81dd3e4f7a7b2675
-AUX rkhunter.conf.patch 786 SHA256 2ca73ff5b9e7b6b3b1c65948813f5124662b8fb6087108adebccd9aa5e4a19d8 SHA512 9a56075dabed278dc837e91872c62ca9fd648b35c1f7f37755e58f17f3f474d03d8dd6313e9de0a7cbc1c4506d12cb81015ac258c184b43139d5ff6d2afac603 WHIRLPOOL 0eff7c92543a10dfee1ccf2d86fffcd48473e12a23d5d2d46002453e87e54e14a3ab60d05b6c104d784b507a0a456e0c4817725635ab6421139a9b1b8330a8e1
 DIST rkhunter-1.4.0.tar.gz 244211 SHA256 8a03d6add50663531994d55aff058eced74c64df948b88176621cd761b68ccf9 SHA512 597e8b2e3f75cd1cb57dd3e33df004265f03ca1503310f984211612da43a160e5d3b50626b4918bd38bf0d239fe2e4a45e55a96212c5a3b5a5645e77e030b60a WHIRLPOOL 45c023b625c7c1664a9f99438b5bebe5ed70265346f122b9d71f91611439d77a2bda01c137698898314183458c4467c66f73bb703b83fbaae2ffe65ded3307ad
 DIST rkhunter-1.4.2.tar.gz 277707 SHA256 789cc84a21faf669da81e648eead2e62654cfbe0b2d927119d8b1e55b22b65c3 SHA512 a4e45caaaf5b8262619ebb890784c75c4e30db4c6c0eba305f86d419142b4796c95bc55fe8846dce8d58bc7636bdb365a4a8c41707f64d4d81373687c5a3b0d4 WHIRLPOOL 911ed8e37e112516adba3afb63e3d4862d061ea35cd4b8becea455922d6b2a744f4b8e7cf92685cff29c3192c594dfc58ba3c194f371dd4d95530bd4c09c5d84
-EBUILD rkhunter-1.4.0.ebuild 1594 SHA256 ccf782a20ef0bd17225531956f653c04584898093aff83d4b9f59ed07d85be05 SHA512 1052074aac90a5e683b80610d73c0df27f1953ba2bba564cab0079ef06ae56cef099b99ae423736a0b825f5dd1467bcf9c057b04cf23f0d8e89894b6763253d5 WHIRLPOOL e0352670379133464921dd1ccbc5efac677197d28ca3a682e730d9a64d8ab3770fba7655593fadb823857f520e6cb7da49ddd42a592e36584a37afd99d659b89
-EBUILD rkhunter-1.4.2.ebuild 1532 SHA256 76826ad2c7d1173eafbfea6bbd6ddd6971f9808e2d9aa321793f2e96bb51eaf2 SHA512 344b3113dc62207c9f5b4472e1f5420683752bad41188b67b6f33f13ad291e4d4057d80912b47acfa02f679a7cb9fd67baeb34338557b620d16cfd1b5275c7e7 WHIRLPOOL ee43392265ef6b301385567fbae7f174ad23d581f1466f9f9dc99443f0ec21b4073dd31322a452a92b2b19a670c0673212d91ab3af8954d20fa9ca05b2e93974
-MISC ChangeLog 16554 SHA256 5b68d8e24cf12108d729be4f89e180bc561fbfd033d27fc332b3fcb5fbf058f8 SHA512 e1df306dbef1d99c34f8640dc89caf32c7980477c6a93d83289afa1aa2e45c630be8d1b2b4cfb54721c873faf4ee054eaac9c4aba6d26e6a3a9e46a72130ca6d WHIRLPOOL 3f6bde3fd8aa347f88a226572af70d917c7c8d116ebefc9b2271c75a4e09d74852332b20a47b7e6e18fc65c13eecfcc16303884a51866d632e0dcd7920b37549
+EBUILD rkhunter-1.4.0.ebuild 1595 SHA256 57cd7c64352918b3ffabc62a4061d27edeff9e338d79ce47fd8da23e6e01eb86 SHA512 9b2714757b10d4a4df78df6b19a38fa86e2d8554e6476e1cb09c471296985002263e38256c0aa5e9910459953bfb13818acd5e025df9b788cd17d30c8d0325fe WHIRLPOOL b201d623a4c464bad2a1c530b028954528d9ca6b8e6c116319ac830d5d2f49933b51f0733ff645ef6e06c61c2b5f0d0e7e3fbb4a6d0674b1deb5626ac73236b7
+EBUILD rkhunter-1.4.2.ebuild 1531 SHA256 a39b5b17eeb56da5adb8fc9c139b8d95520b846f20b98361b23f0fc7320ef74a SHA512 7a0a7abbdcd82d13ab937b3bf8db2a54eaea42d2ae0c990b003480b43cf26a0e9ea9caa54816784dbf6b8fd17e056958e02693d6a680262d608bd54469835725 WHIRLPOOL d99f5382a5b964c4c32594f3ea533432b1e7420c0a9e3a04b6cae3408f3752780167b72c0f721ad53ab66452ea3c6c472855e88945b2f5ae5df56ebb019761ef
+MISC ChangeLog 16791 SHA256 21e57355dc11909c7040c9ae88c5d7cb44695b0f29283214e7d2fe88121807dd SHA512 b4590da7d39b486d73c04cf40087e388c8e97ea5f37a3698ade150d37318a89be643206a4fc0b5ddaef33db72efcaf34667c65b19d1bf5eeb51938138ce4966a WHIRLPOOL 5a085e5330d87864948fc9e18dbfc9ee385b7d5fdfdcaf3de1c1bbdfa8a2b21290dcb5719e081410f8e57785fd54e50f448118f5cd97ce53be94c3f3f55d4ae1
 MISC metadata.xml 164 SHA256 e8d7dfabbaf13302703ccc3428fa0ecedf5d444e0c58692ebbd03c5bd0d9240f SHA512 94406e683edbbedca87a25db398f638c7a020358a7a873bb54be987835a053cd2635ec470ff232d8fd14ccd458a97b96616132113c5a040b63023dc10a1cc807 WHIRLPOOL b83f30c16ff91069d0593d4b35335c9d391ebb28f4ce3d485d645629a8747d574e57c3c24647087e7dbfe3e9dc20e77d243302ad570d680dbf721a92125538b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJThI+5AAoJEKXdFCfdEflKJmIP/R/ehs8CjBY5VPkYU4uxbfNJ
-p06H+xDEtEOcj0ZpVW5Qb1sp6upNCWVKDhj7nXciYRdRvSkbyB1v83BhE6AAEQ8K
-h84xhHlfnCscfOnrP6oItf5XsnwwrKf493RrfufzbWcyBb3yaInAeSbNCqpQkI1X
-AAHaybd6hA2zc5Sux98zVwgidXd3UQ+6MtkYiUpVMz1kfUT8Bao/UNGL0Inrhc59
-9T48hTRibZ4rv8ynBVcPn4+uoB3gv6UJQMj6HexGTCv4fJGacL3NcbyqFjEyfO9O
-xYIDE8BKGKfpgVN6oY3iWejp1FVkEwQGrMEGlW7Bho64aiv82NKXeDzCyT3NB79+
-vIW+uMl/Iiyy+6vytfIBeJm4gtaENLC6gn6MHgjJjEVOEjVQg/EJeZY8wCcr7lgD
-NFmMUi0tHHWgEYHfSOyMWlBV3EUEr5HZcRXlz9ozFR3+oJEBYo61hhB6hoL0CEhV
-dQOIp+XJ+hQ6XckYHkrilkPPsElch5mjHriikEXOTiVPJcPlES6iKGq5M0jdh9fH
-BbXd9EwctikH4BrXX3g5DhLaM8ov7M++MV34rzykn0PJu56oKQrAgeddcb1L+dIE
-FuZGmktr7RXhpM8Leq3vu1R3V7brrBuUurhnqintK/r5nIx087TsNDrtQNr+vOGX
-VtmDC98IRw5qm7bIgYQf
-=d3k3
+iQIcBAEBCgAGBQJThLkIAAoJEKXdFCfdEflKFtkP/iZ8Cl6OkP4pJycVezU9IV/o
+WTR8lYBhHuJ++immZ/l7a/t4XCsMzbFEu6BwtIMjWhjMZg99j8M0sqt1CthZmUqN
+xxqySy4J0liF/EI0K4CtQYqL2fYk0Fr9FRfbHf62dnmL7UQQXQ/1mACaP0tV2u2W
+gao3BgGog7GoE8go1NAQ0SLykApoC35gVBxcqWhdYRAarTvKTXmQu1LyP9EH0oI8
+lXbSOWJeXm8udv0Ur7hy2DUPlzUm/Ip1ZGAYJO2r+3NNpPgWTlwxM00MCUDwqmxr
+YpLLuFFkJ6y18kXgOgqhoqmn8JPu9hs1mUR8nz61OTJ588Zesw05buxiAAdG1+8O
+i1E1yjF/iZENM/AcJZNFoHnC2hCtckUJ6KpkQ3+8kjngjc+vqbueTHCKjl5nOQx0
+hoQ4BJGbdeuy1aaslBQiZ/zDTSutpfyDzPqT9IeNKjH4IDnd6GPC+EuH0QIGTwts
+yBAzXW6lRw7D33uJzVlC1YMtMSnhddm/74REQ4PkP9rzUReJk7LYe0DWikk1MwCn
+7BENpj0zD9D2CxYEjzxvPc6flmeiWmBbH2B1ptNYAdzI+mBfzv3fRCdMR5V1Jphu
+/NtuY26/TUUTGSxspIJ26OlCP+12t+o7GRP8R0NrVy6qUV/L832/F++vKGRVJeDt
+uBNIGlmCfu8J9taXxvL0
+=YrVp
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/rkhunter/files/rkhunter.conf.patch b/app-forensics/rkhunter/files/rkhunter-1.4.0.conf.patch
index 0b5465590c2a..0b5465590c2a 100644
--- a/app-forensics/rkhunter/files/rkhunter.conf.patch
+++ b/app-forensics/rkhunter/files/rkhunter-1.4.0.conf.patch
diff --git a/app-forensics/rkhunter/files/rkhunter-1.4.2.conf.patch b/app-forensics/rkhunter/files/rkhunter-1.4.2.conf.patch
new file mode 100644
index 000000000000..8fd49ab421da
--- /dev/null
+++ b/app-forensics/rkhunter/files/rkhunter-1.4.2.conf.patch
@@ -0,0 +1,38 @@
+diff -Naur rkhunter-1.4.2/files/rkhunter.conf rkhunter-1.4.2-fixed/files/rkhunter.conf
+--- rkhunter-1.4.2/files/rkhunter.conf	2014-01-25 16:29:51.000000000 -0500
++++ rkhunter-1.4.2-fixed/files/rkhunter.conf	2014-05-27 11:58:11.098750088 -0400
+@@ -72,6 +72,7 @@
+ # to use.
+ #
+ 
++INSTALLDIR=/usr
+ 
+ #
+ # If this option is set to '1', it specifies that the mirrors file
+@@ -154,7 +155,7 @@
+ # subsequently commented out or removed, then the program will assume a
+ # default directory beneath the installation directory.
+ #
+-#TMPDIR=/var/lib/rkhunter/tmp
++TMPDIR=/var/lib/rkhunter/tmp
+ 
+ #
+ # This option specifies the database directory to use.
+@@ -163,7 +164,7 @@
+ # subsequently commented out or removed, then the program will assume a
+ # default directory beneath the installation directory.
+ #
+-#DBDIR=/var/lib/rkhunter/db
++DBDIR=/var/lib/rkhunter/db
+ 
+ #
+ # This option specifies the script directory to use.
+@@ -171,7 +172,7 @@
+ # The installer program will set the default directory. If this default is
+ # subsequently commented out or removed, then the program will not run.
+ #
+-#SCRIPTDIR=/usr/local/lib/rkhunter/scripts
++SCRIPTDIR=/usr/lib/rkhunter/scripts
+ 
+ #
+ # This option can be used to modify the command directory list used by rkhunter
diff --git a/app-forensics/rkhunter/rkhunter-1.4.0.ebuild b/app-forensics/rkhunter/rkhunter-1.4.0.ebuild
index 62811ebf1ecd..3d76395220a1 100644
--- a/app-forensics/rkhunter/rkhunter-1.4.0.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.4.0.ebuild,v 1.6 2013/04/11 06:20:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.4.0.ebuild,v 1.7 2014/05/27 16:08:08 zerochaos Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ RDEPEND="
 S="${WORKDIR}/${P}/files"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}.conf.patch"
+	epatch "${FILESDIR}/${P}.conf.patch"
 }
 
 src_install() {
diff --git a/app-forensics/rkhunter/rkhunter-1.4.2.ebuild b/app-forensics/rkhunter/rkhunter-1.4.2.ebuild
index b47fff61805a..a2115b887033 100644
--- a/app-forensics/rkhunter/rkhunter-1.4.2.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.4.2.ebuild,v 1.1 2014/05/27 13:11:54 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.4.2.ebuild,v 1.2 2014/05/27 16:08:08 zerochaos Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ RDEPEND="
 S="${WORKDIR}/${P}/files"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}.conf.patch"
+	epatch "${FILESDIR}/${P}.conf.patch"
 }
 
 src_install() {