9 files changed, 176 insertions, 24 deletions
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 0a0087d43115..83245c34552c 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,5 +1,6 @@
 AUX lldpd-1.0.10-glibc-2.33.patch 699 BLAKE2B 55dc33fa9b9e4ca274b8c97f1c84766686e01585797404c2b71aa9f046acf356b8b3c1dd7f8e9f80693204d73b7b69059646ed46320dabd954b97b321e7f43cd SHA512 c1ef0dd52408d64860b813ea79bf64a1587d7c58e1582faf936260e640e2aedbc0c53f1b3d6a18acdfddbce161f50400f97f246a18ecdc22212f93cc97a47cc4
 AUX lldpd-1.0.13-glibc-2.33.patch 1059 BLAKE2B 24f02e0278d3d804d4b2edf76d5bd2f17a6f6663e1e980174622441a19aa0370f5dba0b6a03ee6465fe348e16068a85b0fe1aa357f43d980ad2b5d7247c258ce SHA512 adf9f746958885b50788af72b50596dc8bbc99182a866bb365e61fd601e659c372366cdee63c704ccc10c839f5ce66066bb2fe7bc23368d8f6348a1ddc918425
+AUX lldpd-1.0.13-r2-glibc-2.33.patch 2699 BLAKE2B b74d70d2f0e55e060afafdf8c8f7de31a0d7eacfa9032d1016c302465905f6944c6c6359861634c975549d99338ee6d7b3ce387c555f47a427308f2f4274348f SHA512 35f0e673621afe22bac890c5b2efaab32ab2978c275e1c92d50d15af10a02cfb1ea158c712cb22d6aa2f999650eeebeff5f793079f7093f80590995f2f239cc6
 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
 AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
@@ -11,10 +12,11 @@ DIST lldpd-1.0.12.tar.gz 1965028 BLAKE2B 7725d650573d463e267670135fad20717b2fe2e
 DIST lldpd-1.0.13.tar.gz 1973988 BLAKE2B ad22d6f19e566886fda1b879e2ac39c59a0cf061e17df404f0cc68504453517a438d1bb0ac2350b7ba3cafb53ae0996deace93918a6af1043aebff5bf3720fad SHA512 b78440622882a822c9114c3617323ac3c8ce759040bb5b8a9f7357ca20e2993ab0130ee9ad85f65d5f38996665d599d70bbb9dd202e2557035e98545a4304aef
 DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69
 DIST lldpd-1.0.9.tar.gz 1961522 BLAKE2B 83a853bb3bde7abd15b4aa167d213d97677db817aba773b152f032b0d0bf299d5cc891c56871182b2f11fc3bfb2d6c88153f32973fdec5844df5c6fc6bc97b8b SHA512 5f5d5abed7fc73efc59932a1f2ee07eedbdca6f82d002221886b4ddf704955aef432acb92084adc72a965fef3e660f3c95b2a1b8892cf05d9616921501e6aae0
-EBUILD lldpd-1.0.10-r1.ebuild 2362 BLAKE2B f4b71aaf10388d9648d542cb7bdf2b39e04e4f4af0be4b89281c4fc1735909da03997c62c8b2523c844a54f4b988b585f9c43fe204e61afe22fcfcc005802997 SHA512 dafbae1310b0eb8b7040136853778e6b78d86f111246727e02c93c85a95e0c157a355fe52e97f744c20d6342db7a3b04ca6c32b9bb30ed3dcd923eaf980200a6
-EBUILD lldpd-1.0.11-r1.ebuild 2360 BLAKE2B 6a1fb9c77f31d6324d19c194372fff28a2ccac6483e8849199a295930361b1b46670dac8f35ef6a82a4cdc39b5651639f4741da8be00b6d7c02cd313e581c0b4 SHA512 3a64968141e8c2d6959f07a846b9e6f347a4936a6af5e77bb5370ac2786de5fd660781c5f37e4750405f723a73837878151bbbe19ddc4dde74681e91b8b58386
-EBUILD lldpd-1.0.12-r1.ebuild 2361 BLAKE2B 6b316330ffbea95e188b91f8a154a8f1c01d1809aa6d8ff2f3401437f669091e9475bcb9d0fe778454204ef7f980c8cd493fb2157d8ac5d52044e1e633ae98fa SHA512 7e4a84cbaee7765b208c48e25b4e9953f5ec88765e379fbd07804fd307d9a2269be4736595b8e7a054d9bfbae827616d6aa2119534378668c2508ea622637c3b
-EBUILD lldpd-1.0.13-r1.ebuild 2385 BLAKE2B ca1b95739c82eb9c3e0f86893e976d13458401d29d1e21b7acc9bb50b8a0fb5a669c8d445507832ceef7837680aafc8b0f47e088b9d659f1b56469e2f3e387af SHA512 4b11c554e69bac70b3add782fd8ddb5bab598bbfcada199afc175bba893ce5d68c6d6f13794a4dc969e34899ad044b706c86097cc8f8263ae2289fa0c935c815
-EBUILD lldpd-1.0.7-r1.ebuild 2302 BLAKE2B 9b3336bd039900e932aee6bca5965177fa9bbdb865b818df72c5a6ab4024fc7d8ec37d119bf947f324df94a70c86366acab7640b07f6bedf98eedc34638c112d SHA512 62383e53e503debae1fc6e3ba4534c0e7d9a76bc4b6e94bff9d4aa65c4ba38c78ea116d6584639067fed2c12369a624734882c20880810406ba43b6ec90f5563
-EBUILD lldpd-1.0.9-r1.ebuild 2304 BLAKE2B fcf481e2ecb171fc7d1ff7e1125f56b57d5e45a5470e90968f2cbcbf2d7e09a303139c5c43a7440f918642d1728b7ac05d705e9b3be2366f48d8ac7c4b1f23fa SHA512 57c900810484bcbd1a6274793ef88cfcac332bcdee7ae20b58dab2b66b81a7d1aa45d6e5cc778cc0c72f4b293488f86264e26c8453db03ba05e54bbdb62cc73e
+EBUILD lldpd-1.0.10-r1.ebuild 2311 BLAKE2B 54ebbd6fa93b90572a24d0bb5a79cfe42c4b7946e12449cd84d26d26d4f4e5ed9a71f186bf38810cb3e9965dba1c3f16b2c753826eed5dcc1bfbf2374260b937 SHA512 b6e337bf3ae7895ab85831c4ecccb3a454cfdd4975c06ad764bc24c2beff9d82abf8d3876cd4a14479a8b39857f68b08b09843ab287f19c35a56d745ca375c6e
+EBUILD lldpd-1.0.11-r1.ebuild 2309 BLAKE2B 96dc221542a8e7e1e963d17f0b594d6b445b46755b9dccb339ec6f056c2457da5cdc201006717118c398014a78e31a306275f25bb254b0b798e689f9ca0a88bd SHA512 52e06555a2f9a7c1cba91d4cd453ddf83fac6dd6fb4c543ac5876d94ff7668e15ddc0ab9575e25372d442425c5d07286866f435f1a2d4e4ba21609cd78e5eb9a
+EBUILD lldpd-1.0.12-r1.ebuild 2310 BLAKE2B e1aa76d0ad4886f042e2693fa7369371577101da54ff83aabfffa1a5cbc9e1f63368828bac0ba6bda43316b9694775ca738522a3c73bfd1b406cb2e2b9df86cf SHA512 158316ed020cc53a28007cc8da54313f04beb44d0604b8888fc46f9edd09b685b942e0b6dfd7d7159ec85aab6e76f50aeed09a56bb2ab614fd29db81cd0ed41e
+EBUILD lldpd-1.0.13-r1.ebuild 2334 BLAKE2B 51420942c3e86cebc71709ca90bedc91059d8484587687860586e4fd9ca4008c773012f892da2e95e4ae0113759b16c26def29974cbde9f2c785e556307dcb79 SHA512 d2bed42d041b46cb80e67abfe1da1f28602660ee7216a9c760c2634288df70218f621d20fe469400d889019cad145d89fe8895e2be9de41f616b93d0f6de7eea
+EBUILD lldpd-1.0.13-r2.ebuild 2383 BLAKE2B 49d8736aa06b028d811b36b8b19677ef856b0e4789cb1f6d8e0b7fba079ed9108303115f81f82d29ffbdfade3c12285bbead31413c42f8bf59b13a570e9fe8c8 SHA512 76a778aaa7193f2131c926cafdff38ea3e463c7ba53b65023dfecb792f3fe337a87987b7189090fcddb5c989bcdce4262ceb6d31b24f2bd744d5429c45585f8a
+EBUILD lldpd-1.0.7-r1.ebuild 2251 BLAKE2B 9777f9464d1386495b161073d45ec5ee4619aa86d34b13f03b9a69327974d377ea119ccf3a04df81f301605e057ac9737b573de63cbf56a44b4f142f74df035f SHA512 1f8669155bd57ed0517f7cbee62d67a36eb2b57a9425484a4a8a7b75314f5d3f23263fa0a4184d6e40e2698dcc4d7d10a1202773a01e332eb52502bac09cb191
+EBUILD lldpd-1.0.9-r1.ebuild 2253 BLAKE2B 137bfb67a1480bc6e8a9e20f6cc44426348e3546d12c865c141a24e6f0494c0398d79f63c050377ed876700c07ef25b75643fce15d58139b7411d39bcbf4468a SHA512 e7038541d2e784f44d849a6e4b9157904dd69db63b8492e4998ec3cfa9409844fe34b61aee0ea74ef9419769da0a66fbba6c259a4321a687375f03dffdb4c168
 MISC metadata.xml 2769 BLAKE2B 0e26b610c20744dafbe488e868e76ecb5b8540f1ad519952db8bd9586df14f6ae6ca0af66af443b5846861842351774013d03212b454fb488b2ee0788c2f424a SHA512 dc50bb275f32bae3d4ed6bba7007502c632c07f8f33876c211e52d159a62cc927ff263dae8f00c948e2ce10f88140b1a0fb970201c2cd2604a879147defabe12
diff --git a/net-misc/lldpd/files/lldpd-1.0.13-r2-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.13-r2-glibc-2.33.patch
new file mode 100644
index 000000000000..62f8cdc2e62b
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.13-r2-glibc-2.33.patch
@@ -0,0 +1,50 @@
+https://github.com/lldpd/lldpd/commit/0ea4b1a5e0e9c35d960145d25166e92a9990227f
+https://github.com/lldpd/lldpd/commit/1def824404cfcab9f64b687da1cb7a4b4b51bbe0
+
+From: Antonio Quartulli <a@unstable.cc>
+Date: Sun, 9 Jan 2022 15:24:55 +0100
+Subject: [PATCH] linux: add access syscall to seccomp rules
+
+Signed-off-by: Antonio Quartulli <a@unstable.cc>
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -178,6 +178,7 @@ priv_seccomp_init(int remote, int child)
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(gettimeofday), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(pread64), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(access), 0)) < 0 ||
+ 	    /* The following are for resolving addresses */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||
+
+From: David Sastre Medina <d.sastre.medina@gmail.com>
+Date: Tue, 11 Jan 2022 14:55:05 +0100
+Subject: [PATCH] daemon: add additional syscalls to SECCOMP filter when
+ running in the foreground
+
+Running lldpd in the foreground as follows:
+
+strace -c /usr/sbin/lldpd -d -cfse -D -C lldpd-peer -I lldpd-peer \
+       -S lldpd-system-name -m 192.168.50.6
+
+Requires additional syscalls to be filtered (non relevant syscalls removed):
+
+% time     seconds  usecs/call     calls    errors syscall
+------ ----------- ----------- --------- --------- ----------------
+  0.47    0.000026           6         4           ppoll
+  0.33    0.000018           3         5           rt_sigprocmask
+  0.27    0.000015           3         4           getsockopt
+------ ----------- ----------- --------- --------- ----------------
+100.00    0.005520           8       637        22 total
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -179,6 +179,9 @@ priv_seccomp_init(int remote, int child)
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(pread64), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(access), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigprocmask), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockopt), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(ppoll), 0)) < 0 ||
+ 	    /* The following are for resolving addresses */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||
diff --git a/net-misc/lldpd/lldpd-1.0.10-r1.ebuild b/net-misc/lldpd/lldpd-1.0.10-r1.ebuild
index 2e1925b588b5..ac13394b280f 100644
--- a/net-misc/lldpd/lldpd-1.0.10-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="ISC"
 SLOT="0/4.9.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"
+	seccomp sonmp snmp static-libs test readline xml"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,7 +25,6 @@ RDEPEND="
 	seccomp? ( sys-libs/libseccomp:= )
 	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
 	xml? ( dev-libs/libxml2:= )
-	zsh-completion? ( app-shells/zsh )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
diff --git a/net-misc/lldpd/lldpd-1.0.11-r1.ebuild b/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
index 4f6497abc941..141fd8ee4ac3 100644
--- a/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="ISC"
 SLOT="0/4.9.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"
+	seccomp sonmp snmp static-libs test readline xml"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,7 +25,6 @@ RDEPEND="
 	seccomp? ( sys-libs/libseccomp:= )
 	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
 	xml? ( dev-libs/libxml2:= )
-	zsh-completion? ( app-shells/zsh )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
diff --git a/net-misc/lldpd/lldpd-1.0.12-r1.ebuild b/net-misc/lldpd/lldpd-1.0.12-r1.ebuild
index 7f942ca82105..ab5b19cd63ee 100644
--- a/net-misc/lldpd/lldpd-1.0.12-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="ISC"
 SLOT="0/4.9.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"
+	seccomp sonmp snmp static-libs test readline xml"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,7 +25,6 @@ RDEPEND="
 	seccomp? ( sys-libs/libseccomp:= )
 	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
 	xml? ( dev-libs/libxml2:= )
-	zsh-completion? ( app-shells/zsh )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
diff --git a/net-misc/lldpd/lldpd-1.0.13-r1.ebuild b/net-misc/lldpd/lldpd-1.0.13-r1.ebuild
index 146a3f5d5986..2c150aae8d94 100644
--- a/net-misc/lldpd/lldpd-1.0.13-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="ISC"
 SLOT="0/4.9.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"
+	seccomp sonmp snmp static-libs test readline xml"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,7 +25,6 @@ RDEPEND="
 	seccomp? ( sys-libs/libseccomp:= )
 	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
 	xml? ( dev-libs/libxml2:= )
-	zsh-completion? ( app-shells/zsh )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
diff --git a/net-misc/lldpd/lldpd-1.0.13-r2.ebuild b/net-misc/lldpd/lldpd-1.0.13-r2.ebuild
new file mode 100644
index 000000000000..0d977a8c72aa
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.13-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd bash-completion-r1 autotools tmpfiles
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://lldpd.github.io/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/4.9.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/lldpd
+	acct-user/lldpd
+	dev-libs/libbsd
+	>=dev-libs/libevent-2.1.11:=
+	sys-libs/readline:0=
+	seccomp? ( sys-libs/libseccomp:= )
+	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
+	xml? ( dev-libs/libxml2:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+"
+BDEPEND="virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)
+"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+	# Can drop both of these on next release; upstream.
+	"${FILESDIR}/${P}-glibc-2.33.patch"
+	"${FILESDIR}/${P}-r2-glibc-2.33.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+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 \
+		$(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
+	find "${D}" -name '*.la' -delete || die
+
+	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
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/lldpd/lldpd-1.0.7-r1.ebuild b/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
index 276e1da109ae..85d06cae202c 100644
--- a/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="ISC"
 SLOT="0/4.9.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"
+	seccomp sonmp snmp static-libs test readline xml"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,7 +25,6 @@ RDEPEND="
 	seccomp? ( sys-libs/libseccomp:= )
 	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
 	xml? ( dev-libs/libxml2:= )
-	zsh-completion? ( app-shells/zsh )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
diff --git a/net-misc/lldpd/lldpd-1.0.9-r1.ebuild b/net-misc/lldpd/lldpd-1.0.9-r1.ebuild
index 11ab20df05de..371194f50d2f 100644
--- a/net-misc/lldpd/lldpd-1.0.9-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="ISC"
 SLOT="0/4.9.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"
+	seccomp sonmp snmp static-libs test readline xml"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,7 +25,6 @@ RDEPEND="
 	seccomp? ( sys-libs/libseccomp:= )
 	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
 	xml? ( dev-libs/libxml2:= )
-	zsh-completion? ( app-shells/zsh )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )