Update to EAPI 4 and migrate to the bash-completion-r1 eclass.

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

3 files changed, 24 insertions, 23 deletions

diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index 8fe7305ca2c4..8fa88bcac366 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-forensics/rkhunter
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.82 2011/07/11 22:43:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.83 2011/09/10 12:47:30 radhermit Exp $
+
+  10 Sep 2011; Tim Harder <radhermit@gentoo.org> rkhunter-1.3.8.ebuild:
+  Update to EAPI 4 and migrate to the bash-completion-r1 eclass.
 
   11 Jul 2011; Tim Harder <radhermit@gentoo.org> rkhunter-1.3.4-r3.ebuild,
   rkhunter-1.3.6.ebuild, rkhunter-1.3.8.ebuild:
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index 2be4b781df53..ee49b08637a7 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -10,17 +10,17 @@ DIST rkhunter-1.3.6.tar.gz 217691 RMD160 ffc017cae3bc1c9c1542a8529911ba3ff32bb41
 DIST rkhunter-1.3.8.tar.gz 241551 RMD160 7c013fd68675d5f859db0430c04673154209a64e SHA1 f4b0c3f149213aa50e00c9658ad8a4a79861621f SHA256 fb1fb8bac53bab476142b5556140c59d589bc0f45d3dc058f400f2edada77a33
 EBUILD rkhunter-1.3.4-r3.ebuild 1863 RMD160 48c2fe6f55bfdac7224acb8be8424e0536041ee0 SHA1 47ceb6449e6a0ebf79481a4a1ae71c3719e31079 SHA256 ee44423000af6b27d1b111c56889395f4318fcbcf91bfbbe9757dc94e111161b
 EBUILD rkhunter-1.3.6.ebuild 1816 RMD160 d4b1778ea0d1d8283e7066d56b56810d24b3dbcb SHA1 da7d94d99ddcd54f086da1e939e1d29bf282a572 SHA256 db81a7903f56c803fafa82ca5d27b55b5976fee7333b2be8f73645e0262e5bf7
-EBUILD rkhunter-1.3.8.ebuild 1816 RMD160 4ed634533cc0a32c6708337e1a153f8b38e3f705 SHA1 6aa7995179946821153561f4df0cc2d8907e969d SHA256 c8b16d9fe85625271e42d773045d8e2278ac9af9ba9cd75073f476588a843246
-MISC ChangeLog 14560 RMD160 4076537bc510c65bc6e4dbb4f93ad70b85d65bb2 SHA1 3c8cb02b6ac5f67327f097b27ba2f310679aee20 SHA256 5deb9bd5d430fb6562f1bb37801b820fe76711015e75301bfdf050ad19c714df
+EBUILD rkhunter-1.3.8.ebuild 1593 RMD160 cecc46f7798d19250253ab83b1ae3bcab1b6454a SHA1 d59f437ae12e384fe3ef24d0d8116f191a781ff3 SHA256 55d44e3b09305802eba12c8ae44f1bfd80f6ac73051f7d78af67053d507dcfb8
+MISC ChangeLog 14698 RMD160 dcd3f2288ac1a2938cacc8be7b9c8bce744fe5ad SHA1 d50d6d411186fc36ecbce0083c834cd03fcb46b7 SHA256 62a3cb7cca75e137cd5930c7e1b06625a220bbc71eb357c204a46d57911832db
 MISC metadata.xml 164 RMD160 7cd3bffc39aa87dceaef97342b19343323175238 SHA1 97b9dc021ecbad46bf0f3a99aeb204f45792faeb SHA256 e8d7dfabbaf13302703ccc3428fa0ecedf5d444e0c58692ebbd03c5bd0d9240f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOG3yoAAoJEEqz6FtPBkyjaIoH/RffgeZdeSBlD14YgAT9KVoY
-XC9xLoPBDM75QTCmDOMmhPKn/Gp2MDqBzUGxHmj7sn/UzfRo5wBysKVokhkjfOSR
-n2P9gPxBtkYvC0FZ/7ZW7Is3QpFxLc1ePp/2r5kw1XygAunpFLGO5p6ylpGsw5li
-i7Vi53Cv1sHjD7cv5vnC5e0JJTEzpsGk8Fl0vmHxUCsS5BtfawIm9iL+i9bedMk3
-FOWtO5Uo9UYdPASAWmq+almAKrCAmKr7lCT1myUDyrQZJcutd3dvoi9eHarxqqRV
-mxFnbdQrAkTfriGo90WkJ+8dko9LktaTx0+m75s3wHhgp+zsQ/rYLwR49kD/rTs=
-=qIWz
+iQEcBAEBCgAGBQJOa1xnAAoJEEqz6FtPBkyje20H/Rl3Tue4zN/tJcMTyrosnPeG
+HjclrjNSyhbdA/MFfcXVIvDiVJln0oyOjLyvcVVxm80HDvs3E2lEMTLz/w6gpvu1
+txeuoICL+0XhrV37AvobaceFXK+ZXPbWG/FNWIC7jfyAGzcs0Tfj+FTn/XFXzJQS
+nJe0y9uOTppO0WF6Bs+x0S8ekOSTqKrgjfJ/Eoo2kvD82xR0q+PIKTimsWZPotYm
++YonWAe2zT1HE9eyJ9dzQ0fD56T6pB8ixQ2L67S9SEHKekJV4vK3jTVPCOV2npK5
+i2RD2r6i3hJBuz3iQqnJi9pMZYXxTRZYEkhjyf06lzaZe47VMkW4nvdA/qN+s3k=
+=3ebA
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/rkhunter/rkhunter-1.3.8.ebuild b/app-forensics/rkhunter/rkhunter-1.3.8.ebuild
index 83571b254429..5459c728efa6 100644
--- a/app-forensics/rkhunter/rkhunter-1.3.8.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.3.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.3.8.ebuild,v 1.2 2011/07/11 22:43:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.3.8.ebuild,v 1.3 2011/09/10 12:47:30 radhermit Exp $
 
-EAPI=2
+EAPI=4
 
-inherit eutils bash-completion
+inherit eutils bash-completion-r1
 
 DESCRIPTION="Rootkit Hunter scans for known and unknown rootkits, backdoors, and sniffers."
 HOMEPAGE="http://rkhunter.sf.net/"
@@ -36,25 +36,24 @@ src_install() {
 	dodir /var/lib/${PN}/tmp
 
 	insinto /etc
-	doins ${PN}.conf || die "failed to install ${PN}.conf"
+	doins ${PN}.conf
 
 	exeinto /usr/lib/${PN}/scripts
-	doexe *.pl || die "failed to install scripts"
+	doexe *.pl
 
 	insinto /var/lib/${PN}/db
-	doins *.dat || die "failed to install dat files"
+	doins *.dat
 
 	insinto /var/lib/${PN}/db/i18n
 	doins i18n/*
 
-	doman ${PN}.8 || die "doman failed"
-	dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README || die "dodoc failed"
+	doman ${PN}.8
+	dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README
 
 	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/${PN}-1.3.cron" ${PN} || \
-		die "failed to install cron script"
+	newexe "${FILESDIR}/${PN}-1.3.cron" ${PN}
 
-	dobashcompletion "${FILESDIR}/${PN}.bash-completion"
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" ${PN}
 }
 
 pkg_postinst() {
@@ -65,5 +64,4 @@ pkg_postinst() {
 	elog "virtual/mailx or alter the EMAIL_CMD variable in the"
 	elog "cron script and possibly the MAIL_CMD variable in the"
 	elog "${PN}.conf file to use another mail client."
-	bash-completion_pkg_postinst
 }