gentoo resync : 06.08.2019

7 files changed, 13 insertions, 232 deletions

diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 2256476e68bc..88b304073c18 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,4 +1,3 @@
-AUX lldpd-0.7.11-zsh-completion-dir.patch 318 BLAKE2B 98a182c00ac6d5fedabf2c5c0891020b1c896e6b412bdefbf2db6715065df8b1bf75965f262f42a794d2be3cfe78c716c44b02e6076bc5a1bfcb68f88730e337 SHA512 cd4c069f9d637d6c9f0a687a7a415a6382bf5217390a94a269de19f5a35c1edd47d5c3455bc63d75aa7bc74a72d7f2c9de9210c0795a95bd0c78a10c1709fcb1
 AUX lldpd-0.9-seccomp-missing-syscalls.patch 1192 BLAKE2B 2692d29b9ffcd7edc09c96b512dfdf1e868be50a07428ac810ec5276b132ef43215f59de498e0b1e61fbf9dce0db4261c96ee81461b20d2ab9764448b74a56ca SHA512 360c53265171ba2effed935da762d66213a911da53832d2c5426e775d4e0d00d2ee74b0041bebe100a4aeb1ecd0292ac4bd2f95dcf0c79440e28f2ec47b01669
 AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc
 AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
@@ -9,11 +8,8 @@ AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e1
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
 AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d24c4fa2b5b72426af5ee5ac57d40cfb2d1bc3ea6c1b253e1daaa341d998d66889bbc94c83d2438 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
-DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283
-DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
 DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
-EBUILD lldpd-0.9.3-r1.ebuild 2476 BLAKE2B ea99c4a7cf9b328e074c400ae1873340e10c2865b0ec7297f995563f5f0bb7656806d02caa490664b69e72effafa9af964820013a7c3b2a7bb83629680ff3b68 SHA512 aade0484be9dd930dbd7e7225e70796a93f3986b79a6a3a289f30de717e82845c890a6ce93c7986f7542e3f398ac583a95768d60ecf5e34091db7b70bd749fb0
-EBUILD lldpd-1.0.1-r1.ebuild 2439 BLAKE2B fc2b1c220d371f0e2d42efc6e7ed3f7ee5389cd4c2b96f7d5af6449a1bd8f1ccd7b42c01fd5a98587048df6694261ac0b5c157cae80010cb058bdf091227c829 SHA512 3a8fb50e15715e6b7cf53f6723b74b476ffe942adc39ee93612fa7eb7a4dd37c05b763c19afe128c9e17e4251cec9369e2c2c6f78249356f96d9caf0b4e9c788
-EBUILD lldpd-1.0.1.ebuild 2390 BLAKE2B b201067dde29c59460b13866be79e359bd933b24d9dfff80e59f69c0f586e8a6ba1daac4ef4dd4c86a3de398a05e96866f7fd3297771c07cc478830e2d1438fd SHA512 084fb2530ed91f354410515ddaeb790bdf8c6cc94d4db3e34c6ad9d6e094ecb18e7659a92ca46110975a1a6b39693c58eab72b89d0fdcb4b622aa687f1a054af
-EBUILD lldpd-1.0.3.ebuild 2542 BLAKE2B 047b22f95ba2b5b1708b963952d8e0a0f7d1de026fe07247761357006c19be93eabdbef1f666da9ce2ec4a32439834037918aa231fcf7bfda3838be147b98f4e SHA512 ddd5b65a8545d030284043eb782e0faa1a2ab0427891861d0f4323db595693225d0d7bf8f05f88f0bb8a30c846f63fb758775fe37c034ff844348a275064cd66
-MISC metadata.xml 2829 BLAKE2B 83e3f2636828107af74952f951e1e5874ce647f786932a509f79e154ab026a0556bc0341576f4c458e40c88feacee187e7a18fd1ee736953425d2cb252e0175c SHA512 a401329c2f122ba079995ce0c7810d32920a91dc94e8678378f3c0eb9f72e613710933df8508eb25ad1516bda1f406d6e459fe1049112dedd8c524a7d8432c01
+DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9
+EBUILD lldpd-1.0.3.ebuild 2540 BLAKE2B 5feb12c469fcc8b1197ae90b81b07384ba5d9562e8a8104f5e1e1f3f89c1a50aca0b4801cbd18e553bbb5db8aae0eb41a328e37050c22393f62382b700b600af SHA512 497abc9c43b915427ae051d522a613db865ea7d221fece4c005e416bbae69aff60b99ced62d372f4c6ea8728c92dc06256f35ee2c50f858afe9fbb5cc9b456a9
+EBUILD lldpd-1.0.4.ebuild 2522 BLAKE2B 301b2684c36504372139267a37b51523ce21fcb0d775413f0a0234abe6b1a716d2825ea30ef8d49e1dd6dec3094200931a6f0d31585f621656dc071cba60e914 SHA512 24480ce8ad674947232f640ca6c8a6962cf3f79b568e83b34be709d30acd331a2351f9c6db4b714fce2e2950df01567581e5d80bc9c8cad13da34b04353b0fb5
+MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch b/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch
deleted file mode 100644
index ff20d9aabc75..000000000000
--- a/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/src/client/Makefile.am b/src/client/Makefile.am
-index 454bdeb..fd391fd 100644
---- a/src/client/Makefile.am
-+++ b/src/client/Makefile.am
-@@ -46 +46 @@ dist_bashcompletion_DATA = lldpcli.bash-completion
--zshcompletiondir = $(datadir)/zsh/vendor-completions
-+zshcompletiondir = $(datadir)/zsh/site-functions
diff --git a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild b/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
deleted file mode 100644
index 4f8d9c61c91d..000000000000
--- a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph jansson +lldpmed old-kernel
-	sanitizers seccomp sonmp snmp static-libs readline xml zsh-completion"
-
-RDEPEND="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	jansson? ( dev-libs/jansson )
-	seccomp? ( sys-libs/libseccomp )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.11-zsh-completion-dir.patch"
-	"${FILESDIR}/${PN}-0.9-seccomp-missing-syscalls.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_with jansson json) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.1.ebuild b/net-misc/lldpd/lldpd-1.0.1.ebuild
deleted file mode 100644
index 31d70bcb6cd9..000000000000
--- a/net-misc/lldpd/lldpd-1.0.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
-	seccomp sonmp snmp static-libs test readline xml zsh-completion"
-
-RDEPEND="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5:=
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	seccomp? ( sys-libs/libseccomp )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)
-	test? ( dev-libs/check )"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.5-seccomp-add-socket-ops.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
index 822e037de615..df8005f63804 100644
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 	seccomp sonmp snmp static-libs test readline xml zsh-completion"
 
diff --git a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild
index 4f6e234cb95b..04dd3d66540b 100644
--- a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils user systemd bash-completion-r1 autotools
 
@@ -19,22 +19,23 @@ RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
 	sys-libs/readline:0=
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	seccomp? ( sys-libs/libseccomp )
+	xml? ( dev-libs/libxml2:= )
+	seccomp? ( sys-libs/libseccomp:= )
 	zsh-completion? ( app-shells/zsh )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	test? ( dev-libs/check )"
+BDEPEND="virtual/pkgconfig
 	doc? (
 		graph? ( app-doc/doxygen[dot] )
 		!graph? ( app-doc/doxygen )
-	)
-	test? ( dev-libs/check )"
+	)"
 
 REQUIRED_USE="graph? ( doc )"
 
 PATCHES=(
 	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
 	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
+	"${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
 )
 
 pkg_setup() {
@@ -87,7 +88,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 
 	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
 	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml
index 83adab8a47e0..1b100cd39eca 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/metadata.xml
@@ -25,7 +25,6 @@ lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Pro
 		<flag name="dot3">Enable Dot3 extension (PHY stuff)</flag>
 		<flag name="edp">Enable Extreme Discovery Protocol</flag>
 		<flag name="fdp">Enable Foundry Discovery Protocol</flag>
-		<flag name="jansson">Enable JSON output via Jansson</flag>
 		<flag name="lldpmed">Enable LLDP-MED extension</flag>
 		<flag name="old-kernel">Enable compatibility with Linux kernel older than 2.6.39</flag>
 		<flag name="sanitizers">Enable code instrumentation with selected sanitizers</flag>