gentoo resync : 25.09.2019

4 files changed, 28 insertions, 49 deletions

diff --git a/net-dns/dnscap/Manifest b/net-dns/dnscap/Manifest
index 84d4aa9daed9..1ccf13bb7999 100644
--- a/net-dns/dnscap/Manifest
+++ b/net-dns/dnscap/Manifest
@@ -1,6 +1,5 @@
-AUX dnscap-0_p20130814.install.patch 853 BLAKE2B 5f237bc91ee0e83d498d8df525d81aa137f520d484fbb05df29084669be611574bc53ad5258d3ccbc8068ff574c14126a19e22bf6a27cbf99cfc20b70565cc50 SHA512 03bda20b9034e2a594ae08824306583f1591ddc9b3fe5542d84e4a4534100a8b09f70b34db89a7a3edc97e4b4c9219a6586ca7b0f79878206efa8407bd44d23a
-DIST dnscap-0_p20130814.tar.gz 99609 BLAKE2B 5881d0d98d664246dd79272cb52f2afbd1261002c70951e33288b09e105b802f55bb0b639c20f1b008e10ceb13f7c81d646ba54db7c30204c1a0a92eb9c69bf2 SHA512 135b6498013bf4a12882ed5cf89cf2df480a357b16a65e99b1c8c1b3b400217611a4c16d1b34ffc521f7eedfdda61662180801c89d80cbbc8719dcec50128531
 DIST dnscap-1.10.0.tar.gz 661981 BLAKE2B e4c3c1cf0ddc21fb5c28abb339607c0233097394cd5c75b55a90d89903aab4beaf32f8ab8fc09a57c16eb2d9598c8fa6b98d034a5c5c5226c1c7a0e8a03e8b9b SHA512 b116bcdf876dd1b03d9d093549e8e19db6f366d6df4eef3ddd09cf8eb1d79e94c9abebdd702702efb105633b2e437bbc835abcb1252599261a546881de477791
-EBUILD dnscap-0_p20130814.ebuild 612 BLAKE2B a748e878a845cdc1158cdc7d536d313ac63ae8e80e1b6ad6ed009ac055aff362045490667c6d9706120d0a510ecc6c5fd94e11c91555e5342ed7bf6418dd486d SHA512 a9edfc5e175ffb73dbcf5eac7840a4c74efb96e481b8cab477f4bcf584f61480cd015e3fd65e49255f12f103b7dc48fd23663ea48fe39de538ec7391c5df129e
+DIST dnscap-1.10.2.tar.gz 655932 BLAKE2B 317547e9d7b8f87d08e954639b62e1894e4d8e37eb9612a984dc10deb674c35973f03f94843df0e9eeb74c94904de00b2718e7121f3dddb9e343b3519d13e02e SHA512 22df8068a17b202b1dfed2dc4ce1c4178abf32af16a3b15a76ae8f46510b3979d44c62eac673afd8452abda69a49e3da133f740217b7ab64631d2c18657a9a8b
 EBUILD dnscap-1.10.0.ebuild 587 BLAKE2B 5783d7fef07d955b3bdb6fc3dc596e1c3f5422242eee1a6e173b867e8fda95b2b6899c2c27f22fb7499e0e45c4028af0246572963ca92d3c4e0438bc1b4b956a SHA512 53a156266ecaa02f80ab4572b361bbf6f5194b50f8732b8ca6c891453a4447711b9bca18669989d2e99666c811116cb70e476cf8eae8ed26861fdb4377422d3c
+EBUILD dnscap-1.10.2.ebuild 587 BLAKE2B 5783d7fef07d955b3bdb6fc3dc596e1c3f5422242eee1a6e173b867e8fda95b2b6899c2c27f22fb7499e0e45c4028af0246572963ca92d3c4e0438bc1b4b956a SHA512 53a156266ecaa02f80ab4572b361bbf6f5194b50f8732b8ca6c891453a4447711b9bca18669989d2e99666c811116cb70e476cf8eae8ed26861fdb4377422d3c
 MISC metadata.xml 456 BLAKE2B bdda5ca1757331c14c11df81e2bb7e5915f9c771b8ecac997fb528334ab9e0d961f79fbb690f47329b5d7ae77cba7a6e44e01f26160a5a21a4c2be0374d74955 SHA512 b9d9248bcc882d4c50403ebed1474aeae687682141798d16965a1eea88700dcd28bf95a16437397b919abdfbf0f812612f2578251c147a6f1b11dcae799af383
diff --git a/net-dns/dnscap/dnscap-0_p20130814.ebuild b/net-dns/dnscap/dnscap-0_p20130814.ebuild
deleted file mode 100644
index 63d02bf19d69..000000000000
--- a/net-dns/dnscap/dnscap-0_p20130814.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="network capture utility designed specifically for DNS traffic"
-HOMEPAGE="https://dnscap.dns-oarc.net/"
-
-## github commit tarball
-MY_GIT_COMMIT="727ed7d5e46625abc2c8d988689a300589e948b6"
-MY_P="DNS-OARC-${PN}-${MY_GIT_COMMIT:0:7}"
-SRC_URI="https://github.com/DNS-OARC/${PN}/tarball/${MY_GIT_COMMIT} -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="ISC"
-IUSE=""
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}.install.patch" )
diff --git a/net-dns/dnscap/dnscap-1.10.2.ebuild b/net-dns/dnscap/dnscap-1.10.2.ebuild
new file mode 100644
index 000000000000..38e157300abc
--- /dev/null
+++ b/net-dns/dnscap/dnscap-1.10.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Network capture utility designed specifically for DNS traffic"
+HOMEPAGE="https://dnscap.dns-oarc.net/"
+SRC_URI="https://www.dns-oarc.net/files/dnscap/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="ISC"
+IUSE=""
+
+RDEPEND="net-libs/libpcap
+	net-libs/ldns
+	sys-libs/zlib
+	dev-libs/openssl:=
+	dev-perl/YAML"
+
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	elog "If you plan to use dnscap's -x/-X features, it is necessary to install"
+	elog "net-dns/bind as well."
+}
diff --git a/net-dns/dnscap/files/dnscap-0_p20130814.install.patch b/net-dns/dnscap/files/dnscap-0_p20130814.install.patch
deleted file mode 100644
index b09c7cfdbfcf..000000000000
--- a/net-dns/dnscap/files/dnscap-0_p20130814.install.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN verisign-dnscap-727ed7d.orig/Makefile.in verisign-dnscap-727ed7d/Makefile.in
---- verisign-dnscap-727ed7d.orig/Makefile.in	2013-08-14 01:31:33.000000000 +0200
-+++ verisign-dnscap-727ed7d/Makefile.in	2014-04-26 22:04:35.438580361 +0200
-@@ -45,13 +45,11 @@
- all: ${prog} ${prog}.cat1
- 
- install: all
--	install -d -m 755 ${bindir}
--	if [ -f ${bindir}/${prog} ]; then \
--		mv -f ${bindir}/${prog} ${bindir}/${prog}.old; fi
--	install -m 755 ${prog} ${bindir}/
--	install -d -m 755 ${mandir}
--	install -d -m 755 ${mandir}/cat1
--	install -m 644 ${prog}.cat1 ${mandir}/cat1/${prog}.1
-+	install -d -m 755 $(DESTDIR)${bindir}
-+	install -m 755 ${prog} $(DESTDIR)${bindir}/
-+	install -d -m 755 $(DESTDIR)${mandir}
-+	install -d -m 755 $(DESTDIR)${mandir}/cat1
-+	install -m 644 ${prog}.cat1 $(DESTDIR)${mandir}/cat1/${prog}.1
- 
- .c.o:
- 	${CC} ${CFLAGS} -c $<