gentoo resync : 18.01.2020

8 files changed, 46 insertions, 34 deletions

diff --git a/net-dns/dnshijacker/Manifest b/net-dns/dnshijacker/Manifest
index 2bf8237172b0..14e33e352959 100644
--- a/net-dns/dnshijacker/Manifest
+++ b/net-dns/dnshijacker/Manifest
@@ -1,4 +1,4 @@
 AUX dnshijacker-1.3-gentoo.patch 1697 BLAKE2B 43fab06def7ae88def968fd2848f2905ba19a85cfa078917af6f3b64e2e414c89880f43a9c4b28ee9c1df9b1df7c127cf65cb91472799307669b6a9bc17ebf0d SHA512 37fb70e9616690b5da2edd111230647787b5e011a564cc34411bf65e7d198225028a7406fdb885aa092f533b64d038c40db412a9979c47eed491a93fa421b339
 DIST dnshijacker-1.3.tar.gz 23569 BLAKE2B cd7631f94b5048ab6bbf8afe8fa27f0c2eb0b4295e7d4cbcf43907f32155a0c32a9ac589a75e9ddadc00f4a879239e16ef90289caaacd3f2a7a41e94366685a9 SHA512 628d545f1b6345e641254519cbb696ae2a38e218a5129558dae404d0ef374afdabf06c63775d5bc5d2d020de3bf339342c7e1a1b10beed4beadb703ff63c693d
-EBUILD dnshijacker-1.3-r2.ebuild 670 BLAKE2B 3b2c5073931b493d20d503d78b27bcba1c9d873f08880dcbf226c6686f5d32acc910b6dca1b0734ddb688328f1bd9f01bf9a41aff76023df5b19872c30eb6c8d SHA512 c3efcfaf6be8705efeed8e051d71f011972ea79117cf096b40c76a3528b11b0dbabc4484cc9abaca7ae86833283167d03e0a9cbb25304970ecc4bf71259d89fc
+EBUILD dnshijacker-1.3-r2.ebuild 634 BLAKE2B 81e0c493cc479986a91bc0c9590e82a9cddda6be62673e81f40e823543c6072081122915da53113ceaef8d232e7aa6ace05c1d9c72aeb66ef9ce08401f5f0638 SHA512 38b10eb78cd13d89e1bdb1f1ee0dd62b7f6a42aa553933e99bd3433eaa04e7cbd661921bf41dfb035c91153aff44c72fda28e2dd0c3446bd3c84f33bd8295479
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild b/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
index 6a23ca9c088c..2f9090042770 100644
--- a/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
+++ b/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="a libnet/libpcap based packet sniffer and spoofer"
 HOMEPAGE="http://pedram.redhive.com/projects.php"
@@ -12,18 +12,16 @@ SRC_URI="http://pedram.redhive.com/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
-DEPEND="net-libs/libpcap
+DEPEND="
+	net-libs/libpcap
 	>=net-libs/libnet-1.0.2a-r3:1.0"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
-src_compile() {
-	emake CC=$(tc-getCC)
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
@@ -32,5 +30,5 @@ src_install() {
 	insinto /etc/dnshijacker
 	doins ftable
 
-	dodoc README
+	einstalldocs
 }
diff --git a/net-dns/dnswalk/Manifest b/net-dns/dnswalk/Manifest
index af2448233fcf..785797cd093f 100644
--- a/net-dns/dnswalk/Manifest
+++ b/net-dns/dnswalk/Manifest
@@ -1,3 +1,4 @@
+AUX dnswalk-2.0.2-portable-shebang.patch 192 BLAKE2B 699c23b223a0e4d0d735f50cac6e72af4e9b40bbfddb0989934a31e599b20ee9f277d9f32319ad01eaf9abdc1b0a30f80a8e994f15d536d4050c0fa9aa2e0d5d SHA512 15a04b32aadf85fc1cd42780b2d9bd9bf72f86c4912cfdbb6847a85dda9d5cdf5d0696da813cd98742171bd661a3e9447b1f133953f4b17ea33ccb4d81b9173b
 DIST dnswalk-2.0.2.tar.gz 27015 BLAKE2B fa7b357b8075b9f5bc2afc97764eaf5e6c07d9fb67f4f10cb89010d3bad1e550d3b13ef013669323ff5259c3784e3fdb2c03f1e2c5cab86388e96f25210002be SHA512 23e5408149ae65f69dbb6d0ecaf5b10233e2279a502f6e19f0dacde0e270ed4eed0aea72f8c12dd636228e99b0b115a335bb8327a0628ad1f36dae5f5572712c
-EBUILD dnswalk-2.0.2.ebuild 653 BLAKE2B 0c353672476d6a377cb2dabc2f5079600bcef07299d0371064b9ff72776bcc4d5d7be953b0aa6edc351fcaa44d94d0c0f2a7a608a7999e54ce756fe8506bb08b SHA512 fe7bebc43f6656ef9cfc7e0f32e59548385a16cf5585c6891bffd80823b1cb81bf37c1893dc300076ff0b79e67fc29616b36c061e64ff328712e6bf0a2efae55
+EBUILD dnswalk-2.0.2.ebuild 609 BLAKE2B 8f715c2d0821db8e9801ac01a89877b1e2cff7f161a700cd1a6b440da9306fb718b7b26d08135b7e13ea5b2f68a9fac2a7ed642396041f3682d3489f3f9c86fd SHA512 841c2bffaa3f51736f3c084ff313e8dd6af5bf1e1567d39a0355b697ec56102dd0db846c34d162f320389dc991b9877b387c3fde9290d4819952f7c7e7c4ab17
 MISC metadata.xml 244 BLAKE2B 3a3cdd078803168e1273361193fbc714041b6988b4fff2b933542a9cb3f302f3db3014d679b758bce39aefdfd22dd62d201bd4a638ba4bf52bc99679acac00dd SHA512 9e02e3ec7cc7cdf87fd3970fd60703bc661263fe067e173c782ed6fffd1ddd84f68c55a021a6657d6a8d1f0c2320fa6283d729954f214a8a88c5a725683baab1
diff --git a/net-dns/dnswalk/dnswalk-2.0.2.ebuild b/net-dns/dnswalk/dnswalk-2.0.2.ebuild
index 561f12577ffa..8114b78757d5 100644
--- a/net-dns/dnswalk/dnswalk-2.0.2.ebuild
+++ b/net-dns/dnswalk/dnswalk-2.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="dnswalk is a DNS database debugger"
 HOMEPAGE="https://sourceforge.net/projects/dnswalk/"
@@ -13,16 +13,14 @@ KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND=">=dev-perl/Net-DNS-0.12"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
-src_prepare() {
-	sed -i 's:#!/usr/contrib/bin/perl:#!'"${EPREFIX}"'/usr/bin/perl:' dnswalk
-}
+PATCHES=( "${FILESDIR}"/${PN}-2.0.2-portable-shebang.patch )
 
-src_install () {
+src_install() {
 	dobin dnswalk
 
-	dodoc CHANGES README TODO \
-		do-dnswalk makereports sendreports rfc1912.txt dnswalk.errors
+	einstalldocs
+	dodoc do-dnswalk makereports sendreports rfc1912.txt dnswalk.errors
 	doman dnswalk.1
 }
diff --git a/net-dns/dnswalk/files/dnswalk-2.0.2-portable-shebang.patch b/net-dns/dnswalk/files/dnswalk-2.0.2-portable-shebang.patch
new file mode 100644
index 000000000000..f194ea738f1d
--- /dev/null
+++ b/net-dns/dnswalk/files/dnswalk-2.0.2-portable-shebang.patch
@@ -0,0 +1,8 @@
+--- a/dnswalk
++++ b/dnswalk
+@@ -1,4 +1,4 @@
+-#!/usr/contrib/bin/perl
++#!/usr/bin/env perl
+ #
+ # dnswalk    Walk through a DNS tree, pulling out zone data and
+ # dumping it in a directory tree
diff --git a/net-dns/totd/Manifest b/net-dns/totd/Manifest
index cb30c69deb85..0cf50ac5f7c6 100644
--- a/net-dns/totd/Manifest
+++ b/net-dns/totd/Manifest
@@ -1,5 +1,6 @@
 AUX totd 703 BLAKE2B ff6438966449109cfe9d18cab97570a19876e467ae0e46e52c2431052e0e032ca9dce3fa2d8a8e30007454dfc5139a75b25c1823f4b9b4d9b36d3c54c74e0f2a SHA512 1ff0bf4969a2670147646590e5f33f6dfbebc1e3e03b3d544f03567867f439b386695020766a6433a411664ea0ec64a4e816794a7cff9172ff6ea546d888a4b9
+AUX totd-1.5.1-fix-CC.patch 232 BLAKE2B 88034db37515aa659cb22546835665ce57d17e5ddacbd6e06f67cffef290412f395d0758b3f06761e6de14a991b2b0d74a041272b9f0f55e27f5bb002d7e1c57 SHA512 6f3ec9f8faa4ac07e05792e7e1a44a37a60b8ae75ca34c57cf3a951bd2b2d22deef0009c8ca902855347d0a7ccd035fb63c06cedc8f4050c7dd97448562fe86b
 AUX totd-1.5.1-no_werror.patch 528 BLAKE2B 8e310b080acf352ad01158b145b801454a9a019e4ecaeab98527fbee5501e647bf86b352a5570d7461f004275a03f79543c6faa0044ae09a09e8de97ff39a9ca SHA512 ae7dc467c1e404c705502b256635c62a80e6f087878af64e8a3d8367abad053fcfc1d2d1da47a772e57bd669bd26c409302b808eed2fe69bd64d3483c1f5c30c
 DIST totd-1.5.1.tar.gz 235809 BLAKE2B ceab2edbebe22162db7193a6e20b0ae2c960c1e613afc3a4ecf068c8f7f3d0f798d03d6c392955799c4fbd1fec10561502e4da08c4a5b39ce5d313a2c0e09663 SHA512 47087fd0478bc2952b25a0952ffb7273e4fdebda019f61fd0bad3c0305ab8f6e32b8f8dd042364f9ae6e6bd31c223e8fd3b17e3b4d44219fd6509f530f56025a
-EBUILD totd-1.5.1.ebuild 905 BLAKE2B 75d82649ec98fff8b8e7f93573ab047d2c16ff5f562bb37a87fd10a83cda430b91656113e13b4a05831b129281c50278db4e827acdd234773ed9b95dcae63832 SHA512 ca5087f4228d05228190dd158cd2972709a6c119cf38cb2ab991e26c7088d6d7b42daed91cf6e85a653e28c43485f480e50d9c57353351915d310d494b10107d
+EBUILD totd-1.5.1.ebuild 876 BLAKE2B f03286d1d3a458b680dc34d84bdcc918a329bc139d832d693cdac36d5f8f7233679db29acdf082af01c393a8129560018d460d368efee25e15c3d75cf2ad75bc SHA512 b273145813e2fa8ef06e4bfea6c839c8056e1ad83a9c04de4cf183ecf086a7c54d66052f26f0dde5d20b1a3ea84aebcfbdedb63927040a700ae352b4a56a8da9
 MISC metadata.xml 395 BLAKE2B d4873364929e3fe57581648ad9ca585c12b141bd2da11c94aa6fec910fa2a719341f397cc6ec49450ffcdcd170e908bca580b0b97d7dc4ab6ad791c2864bdd68 SHA512 af806905403d42007aec9475bf059ac65957b83636bf93794dab668ecafb41a7df69c712531f1b3e38e4c23e7f9bed8173631773679035b5fd1175208235da06
diff --git a/net-dns/totd/files/totd-1.5.1-fix-CC.patch b/net-dns/totd/files/totd-1.5.1-fix-CC.patch
new file mode 100644
index 000000000000..3ebbd419d0e2
--- /dev/null
+++ b/net-dns/totd/files/totd-1.5.1-fix-CC.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4,7 +4,7 @@
+ # <$Id: Makefile.in,v 3.43 2005/01/31 11:55:14 dillema Exp $>
+ #
+ 
+-CC = gcc
++CC = @CC@
+ 
+ # These use the standard autoconf variables, which by default are
+ # rooted in @prefix@
diff --git a/net-dns/totd/totd-1.5.1.ebuild b/net-dns/totd/totd-1.5.1.ebuild
index 8cb983f4b008..e9e8691f95fe 100644
--- a/net-dns/totd/totd-1.5.1.ebuild
+++ b/net-dns/totd/totd-1.5.1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Trick Or Treat Daemon, a DNS proxy for 6to4"
 HOMEPAGE="http://www.dillema.net/software/totd.html"
@@ -12,14 +10,11 @@ SRC_URI="http://www.dillema.net/software/${PN}/${P}.tar.gz"
 LICENSE="totd BSD BSD-4"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no_werror.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-no_werror.patch
+	"${FILESDIR}"/${P}-fix-CC.patch
+)
 
 src_configure() {
 	econf \