gentoo resync : 15.12.2019

8 files changed, 2 insertions, 368 deletions

diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index bf8ac218ac13..61581b1c021c 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -1,14 +1,5 @@
-AUX daq-2.0.2-libpcap-check.patch 1000 BLAKE2B 9407ae9fee8095143ad63fef090b49bb1f6048d7fbd22eb03fd88d9a3266b5b0f0add7ad17b1e95040ca429a163c946d7bc1236c6a21bb64b93990ec07f42213 SHA512 9382026f9d93ae922299ae25a98b6e38c2bbb0619009f73feef6a7ce1ce499b5bde886323be80c7863cf8ed0c245f2b04d244166073f2435c6db915ca5afa17f
-AUX daq-2.0.2-parallel-grammar.patch 1355 BLAKE2B fe4c2938da34cfaafb4918e779c5675b8ae0befd9878763cb8f67c62b73485c0ef825b9a4eb2fe7386001579d22f1a00615349879ab702ef1db0f9dd518ba309 SHA512 18ba4e4cdaf9551504d201b76f3983e3eb33a267c2f5952006e9297e7c5de88ff1464adb103ffce9dba99339bdbbffc616ff6b659ce20179c55a1bb0173b4483
 AUX daq-2.0.6-parallel-grammar.patch 560 BLAKE2B 73cae026bca21c573a3871b1a7d97d3fce93f0d66328a840003b0b538792bd8439745081bbda3742d59b5f0880a4a844e919b6db6a19601bebababfe138d1ebe SHA512 d22182c91be6283a057f7f33ea093ba064f8a880fbebc3342ae0ab2d2923fee2fbb2ef1ec69b144b0dfb2fbca09c0f6a6421a961a88832d7b952907e6c2e2665
 AUX daq-2.0.6-static-libs.patch 5093 BLAKE2B a374f1d8aa237f55a102dff62084ff3cf62b9672f72448af4f6a1c29aff1f3453e0a49bd4d6c8b209d928425f71bf21d2272a9f6733fb72cc31e52f7ffdc04d2 SHA512 ef793b31c2759366f9890afb8229ce6e47552d4634ea3ae05c77dd55eb674be5e35a9443d271414671945b85dfb7f316a347df94ffea687a382f0b562b191102
-DIST daq-0.6.2.tar.gz 451581 BLAKE2B 64eebeb669eefc6715b206de19e823708a8e4255d5898d5f6d4b80889360611950764432c941a2a930582ab9b8c2300cfdb41784f008f4ef1c248f3469819d4e SHA512 da19034f210d9c202f5e3ba7ddf60645498ed8bdaf28410811922ebb1338b56c55c8e992e46e1c7b9b89de6148b471129826a02ab2a45c7232bc4091a4e53125
-DIST daq-2.0.0.tar.gz 480030 BLAKE2B ab25ce133833babbdaecd74c79d319739e5bfa34bfa100d35c19569c935fe58b425ea817a12f6d2fc1ff47a6e8097b822e2d5ac5dc295cdde516811f139accff SHA512 aa79e06473592c0ee57a3a2da60f01f35e6268a126fcb3a992ee7c6da48a079cf359db7439be3778997e774c340630d768712c9efea10c570feb4961f9a00b3c
-DIST daq-2.0.2.tar.gz 474447 BLAKE2B fa80d435056d672eaa15f003649d90dba91986780f372cd4e953b676e414232516c5fc43065f5497d38299e0309c58b2734458f9e5aa1b93cdfa29dfe72b622d SHA512 b2a47e174155f21cb1c6f1e1c431ea7cca6aa9f7371228e77def3c526a67fd42d0e26e4c94263195e041b203cdf0c2aaef14f9035afb23dde0bd5df3bf422cbd
 DIST daq-2.0.6.tar.gz 518013 BLAKE2B 702ab20c776b9047230bb1ac36574068e461a850ed5d15959c314d62b0b828c792cf23d19cdb411ba8c067348ae74dd2f011376ccbe0376c44536ad58fa1bba9 SHA512 61dd5408c587e57999445b9549ac539ffc5bb16ddc179601de1065fc5e251c1893536d8aa2251096e34b54093529d3578e7b5d97e3514cb2bbf4de113639b08c
-EBUILD daq-0.6.2-r1.ebuild 1902 BLAKE2B b63c75041b5cf855b68b86a316cb47636e8e491ad3d5c92dd9c68e467ae711ebee4f60039bba687a3234905dc87c61c62bc45541f6d221370cacd3fdcbcf122d SHA512 aa0552a61045f7332930082e9ed36557f973a39acc449143c35fda76b5e7a7f9da3dc521ec041956b038e70aa125fb75a0c2d4a3e4cdf660c9dec479e082ddf8
-EBUILD daq-0.6.2.ebuild 1932 BLAKE2B c8a683e11312124f500f67f390231270d114ef480a3cd75653f12e4c767645f8229ab52079c904df9be11babfb2fb7487b89050870ef6edb18eb29449cddfe7a SHA512 9b25bca43e52172bc9f1a3c43dc90d6bebfa2934eeeea579f7e4e8e3d0a9ae3210ae53249f4aab723fbf2d026dc053755462426f1d14cfa0f2a420222c2a091a
-EBUILD daq-2.0.0.ebuild 1901 BLAKE2B 60904e1b66d7c02e650e54bba013b8f64087404efee0121e7e91994201396ba0a0b3d5c9116c3132dfe4a4c7a50e916f347e0861ef0c338a13d0f556487b3c1b SHA512 ce7a7fbd708e662da4b1ebd4bed6b688e8339feb9a15db188e74925f122ab421775e1a5698d2bec1d6a204a7c9667fb0a54749cd98595d45e89ba925e012d254
-EBUILD daq-2.0.2.ebuild 2001 BLAKE2B 98a7568d9bfba601bcf36e87f9a5002c489415aaf5012b891b5f129f054848549a797b921bccb051df93cb8d56d385c4025ffeb304576920b565a66d0b1d2b9b SHA512 554b8c496b10d62ca9cefd1239738c64108b6d63a61401dbfc57109f22b255f7a24a5f419f859bd8672b073850b6604f233ac0be15d4739da15c2c0bad6435a5
-EBUILD daq-2.0.6-r1.ebuild 2055 BLAKE2B d16d3b66c7a0515713a48dbd717eef07f933d00cc0e717cc0387e514ea5ca6e47b7d343084bd5e84753a6383173cd9f3ad4d042578e05eac69c4bc35662fb0a2 SHA512 93c5ffe9a0f7a6886ca32abdf7261610c8d4dc4f936d950c7d409487ebb14ea184b7276825a4f601f54c6d073384d998760c8881b67c4d3faf24c4423157a1c0
+EBUILD daq-2.0.6-r1.ebuild 2053 BLAKE2B d47824d0990ffbf3d91ab7af37b72716983bf491f465c48169b6cb87bd3ebcb4b08a25514262dc207b6bcc68586119c84ae63f9d1274d09d75197a9a521edf35 SHA512 2131265fcf2b167b6d8b2f51edcf614cae22090feda1e44bb42167ad3f5b5b6f81c8892a0d3dac7bcdb75c187caa156eab8e17232268c668c33c510f43b490ef
 MISC metadata.xml 1416 BLAKE2B 33ab28e9bac28d75031405b2ce3b47f2b797d244853bef86f586330a1bc7558a21edf325297e0aeccce08e5eefdd29fad45cb50da6f6e6d62ee82c56d7c17b81 SHA512 77a8d9f238958948d3582b3d9a9bf859c03bae5d544728270a18a5db1c221745c4fa7044fb1959e4b0811864f33de5f9bae67bcd25aa6c74d3ca74f386e6bdaa
diff --git a/net-libs/daq/daq-0.6.2-r1.ebuild b/net-libs/daq/daq-0.6.2-r1.ebuild
deleted file mode 100644
index 09c66a2d3497..000000000000
--- a/net-libs/daq/daq-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Data Acquisition library, for packet I/O"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/1339 -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-
-DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
-		dump? ( >=net-libs/libpcap-1.0.0 )
-		nfq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )
-		ipq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable pcap pcap-module) \
-		$(use_enable afpacket afpacket-module) \
-		$(use_enable dump dump-module) \
-		$(use_enable nfq nfq-module) \
-		$(use_enable ipq ipq-module) \
-		$(use_enable static-libs static) \
-		--disable-ipfw-module \
-		--disable-bundled-modules
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-
-	# Remove unneeded .la files
-	rm \
-		"${D}"usr/$(get_libdir)/daq/*.la \
-		"${D}"usr/$(get_libdir)/libdaq*.la \
-		"${D}"usr/$(get_libdir)/libsfbpf.la \
-		|| die
-
-	# If not using static-libs don't install the static libraries
-	# This has been bugged upstream
-	if ! use static-libs; then
-		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"usr/$(get_libdir)/${z}.a
-		done
-	fi
-}
-
-pkg_postinst() {
-	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
-	einfo "calls to PCAP functions with an abstraction layer that facilitates"
-	einfo "operation on a variety of hardware and software interfaces without"
-	einfo "requiring changes to application such as Snort."
-	einfo
-	einfo "Please see the README file for DAQ for information about specific"
-	einfo "DAQ modules."
-}
diff --git a/net-libs/daq/daq-0.6.2.ebuild b/net-libs/daq/daq-0.6.2.ebuild
deleted file mode 100644
index 7070a8c4883d..000000000000
--- a/net-libs/daq/daq-0.6.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Data Acquisition library, for packet I/O"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/1339 -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
-IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-
-DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
-		dump? ( >=net-libs/libpcap-1.0.0 )
-		nfq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )
-		ipq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable pcap pcap-module) \
-		$(use_enable afpacket afpacket-module) \
-		$(use_enable dump dump-module) \
-		$(use_enable nfq nfq-module) \
-		$(use_enable ipq ipq-module) \
-		$(use_enable static-libs static) \
-		--disable-ipfw-module \
-		--disable-bundled-modules
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-
-	# Remove unneeded .la files
-	for x in pcap afpacket dump nfq ipq; do
-		rm "${D}"usr/lib64/daq/daq_${x}.la
-	done
-	for y in libdaq libdaq_static libdaq_static_modules libsfbpf; do
-		rm "${D}"usr/lib64/${y}.la
-	done
-
-	# If not using static-libs don't install the static libraries
-	# This has been bugged upstream
-	if ! use static-libs; then
-		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"usr/lib64/${z}.a
-		done
-	fi
-}
-
-pkg_postinst() {
-	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
-	einfo "calls to PCAP functions with an abstraction layer that facilitates"
-	einfo "operation on a variety of hardware and software interfaces without"
-	einfo "requiring changes to application such as Snort."
-	einfo
-	einfo "Please see the README file for DAQ for information about specific"
-	einfo "DAQ modules."
-}
diff --git a/net-libs/daq/daq-2.0.0.ebuild b/net-libs/daq/daq-2.0.0.ebuild
deleted file mode 100644
index b910b5c04777..000000000000
--- a/net-libs/daq/daq-2.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Data Acquisition library, for packet I/O"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/2311 -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-
-DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
-		dump? ( >=net-libs/libpcap-1.0.0 )
-		nfq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )
-		ipq? ( dev-libs/libdnet
-			>=net-firewall/iptables-1.4.10
-			net-libs/libnetfilter_queue )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable pcap pcap-module) \
-		$(use_enable afpacket afpacket-module) \
-		$(use_enable dump dump-module) \
-		$(use_enable nfq nfq-module) \
-		$(use_enable ipq ipq-module) \
-		$(use_enable static-libs static) \
-		--disable-ipfw-module \
-		--disable-bundled-modules
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-
-	# Remove unneeded .la files
-	rm \
-		"${D}"usr/$(get_libdir)/daq/*.la \
-		"${D}"usr/$(get_libdir)/libdaq*.la \
-		"${D}"usr/$(get_libdir)/libsfbpf.la \
-	|| die
-
-	# If not using static-libs don't install the static libraries
-	# This has been bugged upstream
-	if ! use static-libs; then
-		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"usr/$(get_libdir)/${z}.a
-		done
-	fi
-}
-
-pkg_postinst() {
-	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
-	einfo "calls to PCAP functions with an abstraction layer that facilitates"
-	einfo "operation on a variety of hardware and software interfaces without"
-	einfo "requiring changes to application such as Snort."
-	einfo
-	einfo "Please see the README file for DAQ for information about specific"
-	einfo "DAQ modules."
-}
diff --git a/net-libs/daq/daq-2.0.2.ebuild b/net-libs/daq/daq-2.0.2.ebuild
deleted file mode 100644
index 35b35c7c306a..000000000000
--- a/net-libs/daq/daq-2.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib autotools
-
-DESCRIPTION="Data Acquisition library, for packet I/O"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/downloads/2778 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
-
-PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
-IPT_DEPEND="
-	>=net-firewall/iptables-1.4.10
-	dev-libs/libdnet
-	net-libs/libnetfilter_queue
-
-"
-DEPEND="
-	dump? ( ${PCAP_DEPEND} )
-	ipq? ( ${IPT_DEPEND} )
-	nfq? ( ${IPT_DEPEND} )
-	pcap? ( ${PCAP_DEPEND} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-parallel-grammar.patch #511892
-	epatch "${FILESDIR}"/${P}-libpcap-check.patch
-	eautoreconf
-}
-
-src_configure() {
-	# We forced libpcap to 1.x, so we can set this cache var so
-	# cross-compiling doesn't break on us.
-	daq_cv_libpcap_version_1x=yes \
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable pcap pcap-module) \
-		$(use_enable afpacket afpacket-module) \
-		$(use_enable dump dump-module) \
-		$(use_enable nfq nfq-module) \
-		$(use_enable ipq ipq-module) \
-		$(use_enable static-libs static) \
-		--disable-ipfw-module \
-		--disable-bundled-modules
-}
-
-DOCS=( ChangeLog README )
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	# If not using static-libs don't install the static libraries
-	# This has been bugged upstream
-	if ! use static-libs; then
-		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"usr/$(get_libdir)/${z}.a
-		done
-	fi
-}
-
-pkg_postinst() {
-	einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
-	einfo "calls to PCAP functions with an abstraction layer that facilitates"
-	einfo "operation on a variety of hardware and software interfaces without"
-	einfo "requiring changes to application such as Snort."
-	einfo
-	einfo "Please see the README file for DAQ for information about specific"
-	einfo "DAQ modules."
-}
diff --git a/net-libs/daq/daq-2.0.6-r1.ebuild b/net-libs/daq/daq-2.0.6-r1.ebuild
index 749de964a78f..e695b8358c31 100644
--- a/net-libs/daq/daq-2.0.6-r1.ebuild
+++ b/net-libs/daq/daq-2.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.snort.org/downloads/snort/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
 
 PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
diff --git a/net-libs/daq/files/daq-2.0.2-libpcap-check.patch b/net-libs/daq/files/daq-2.0.2-libpcap-check.patch
deleted file mode 100644
index b68a8a4865f1..000000000000
--- a/net-libs/daq/files/daq-2.0.2-libpcap-check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-fix the libpcap check so that people can set the cache version when cross-compiling
-
-patch by Shawn Wallace <sjwallace@google.com>
-
---- a/m4/sf.m4
-+++ b/m4/sf.m4
-@@ -135,7 +135,7 @@
-         echo
-         exit 1
-     fi
--    AC_MSG_CHECKING([for libpcap version >= $1])
-+    AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x], [
-     AC_RUN_IFELSE(
-     [AC_LANG_PROGRAM(
-     [[
-@@ -147,16 +147,13 @@
-         if (strcmp(pcap_version, $1) < 0)
-             return 1;
-     ]])],
--    [libpcap_version_1x="yes"],
--    [libpcap_version_1x="no"])
--    if test "x$libpcap_version_1x" = "xno"; then
--        AC_MSG_RESULT(no)
-+    [daq_cv_libpcap_version_1x="yes"],
-+    [daq_cv_libpcap_version_1x="no"])])
-+    if test "x$daq_cv_libpcap_version_1x" = "xno"; then
-         echo
-         echo "    ERROR!  Libpcap library version >= $1  not found."
-         echo "    Get it from http://www.tcpdump.org"
-         echo
-         exit 1
--    else
--        AC_MSG_RESULT(yes)
-     fi
- ])
-
diff --git a/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch b/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch
deleted file mode 100644
index 42e0f93791ac..000000000000
--- a/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/511892
-
-the scanner needs the generated header file, so make sure it's listed as a
-dependency.  else you see a failure:
-	$ cd sfbpf
-	$ make clean
-	$ make sf_scanner.lo
-	<missing tokdefs.h>
-we'd like to list it as a dep of the object, but automake can use generated
-file names, so it's not easy to list that.
-
-we can't have both of the outputs from grammar.y run the lex, otherwise we
-hit random parallel build failures:
-	$ cd sfbpf
-	$ make clean
-	$ make tokdefs.h sf_grammar.c -j
-	<run yacc twice & fail>
-
---- a/sfbpf/Makefile.am
-+++ b/sfbpf/Makefile.am
-@@ -43,14 +43,16 @@
- libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
- 
- # use of $@ and $< here is a GNU idiom that borks BSD
--${builddir}/sf_scanner.c: ${srcdir}/scanner.l
-+${builddir}/sf_scanner.c: ${srcdir}/scanner.l ${builddir}/tokdefs.h
- 	@rm -f ${builddir}/sf_scanner.c
- 	${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c ${srcdir}/scanner.l
- 
--${builddir}/tokdefs.h ${builddir}/sf_grammar.c: ${srcdir}/grammar.y
-+${builddir}/sf_grammar.c: ${srcdir}/grammar.y
- 	@rm -f ${builddir}/sf_grammar.c ${builddir}/tokdefs.h
- 	$(V_YACC) -d ${srcdir}/grammar.y
- 	mv y.tab.c sf_grammar.c
- 	mv y.tab.h tokdefs.h
- 
-+${builddir}/tokdefs.h: ${builddir}/sf_grammar.c ; @true
-+
- CLEANFILES = ${builddir}/sf_scanner.c ${builddir}/sf_grammar.c ${builddir}/tokdefs.h ${builddir}/sf_scanner.h