gentoo auto-resync : 18:08:2022 - 02:33:40

12 files changed, 8 insertions, 728 deletions

diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index dbbbec97a7e6..be56df26893a 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,24 +1,10 @@
-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
 AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d24c4fa2b5b72426af5ee5ac57d40cfb2d1bc3ea6c1b253e1daaa341d998d66889bbc94c83d2438 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
-DIST lldpd-1.0.10.tar.gz 1961631 BLAKE2B 06d3b7d659dae0df4b10f3568a6ffa96c8e848863eb5ecb11b046806b4c23afdae084ffcab8b07b93e6a111dea2c24bd2cfc81a7f1c2559a39b3b2ed8f80814f SHA512 6835bfe36cbaffb0e7f0dbc958d234b7a16787bd51d0c5423c7b775d71dc89635ab28c005e2df550c40f4ee76ab461c0c7cb2a09b011878cadaca18153485d8f
-DIST lldpd-1.0.11.tar.gz 1962748 BLAKE2B 13b6efe44a7dd0f9ec681ec5ef96358ca01c500f0238460ce633b59a1506d9caf405baf3ac910be9baa5840f3751b9d9e0bda127c96083f012eb4af75ba7b9e9 SHA512 2433c81d892b8f8f43c4a897eedfde6fff41db8514fc212bd60b71d080b963b12346017f554657d5abe6d0f02256cf49c9f8b82c8e402763ad0a5c53d459ac32
-DIST lldpd-1.0.12.tar.gz 1965028 BLAKE2B 7725d650573d463e267670135fad20717b2fe2ee5f1c5b9f68a68890f6e74e7cac52bcb0aefad68b8bcade9eacd18f6aa783eec4a71e895adc173ddd2a554322 SHA512 893add53c814d904894dd768ea2e412f288bd7767090fb9b5f686ce3fed65a436ed1365039e5d7f8ef8f5ae9206800b087c71515caa16d1d375389dd7558050f
-DIST lldpd-1.0.13.tar.gz 1973988 BLAKE2B ad22d6f19e566886fda1b879e2ac39c59a0cf061e17df404f0cc68504453517a438d1bb0ac2350b7ba3cafb53ae0996deace93918a6af1043aebff5bf3720fad SHA512 b78440622882a822c9114c3617323ac3c8ce759040bb5b8a9f7357ca20e2993ab0130ee9ad85f65d5f38996665d599d70bbb9dd202e2557035e98545a4304aef
 DIST lldpd-1.0.14.tar.gz 1979314 BLAKE2B 9e4dc2126eb07b09e42da07c1ddff9fd02a306404c45632cc80eb791e05cf07c0919a57fca2b91c6302ec01447213ed7f1b5a5bb14482b1f9c3a1fc501a0fdcb SHA512 268d85144fd06c70c9394acdbd92478b0ee3426beed76e48363f71e329681c57ab6bb1d7b313011e1243eeaaeb2b1f35085641bd86d6894c7d998d030d84b548
-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 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
+DIST lldpd-1.0.15.tar.gz 1980892 BLAKE2B 40702bbe633e7214c73c61e3e811ebe2655480ba3ef0655371c2042798b61fb6066c0051c33fb81e80c17149a1ad94007b2d0562533d24a0d7505dc2fd5caa44 SHA512 c245421cd153be39756e15c379daa70529119a50e0db7fff82a1d7f892f527c6582783aedadf096a4e2ea6352befb7215cecae675bd605d5fcf55820a39a6791
 EBUILD lldpd-1.0.14.ebuild 2238 BLAKE2B c25a78e5786a2cc77119e17b09ef5ebd2e2a87b2b77a2e5767637b450cb1335bd368f00aeef02aa65cf32037537dcabcacaece05133a98ea1d9cc985415f691b SHA512 6bde251d2a12c68245f8599c5d3a77ad3bd8d21b767f25de2e4f92cc06e4a3d19487ea90f7703554d373d6d6fbecd7e0ef82ea187c826c7492387e65fd450984
-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
+EBUILD lldpd-1.0.15.ebuild 2240 BLAKE2B 749535ac6cb220188b8eb8cf787abec9cd9f580c5c27761974256630264945ad90fadfeea8fa031f09184112c3e23ae536895e8c3c6a1283ed50b8980e454148 SHA512 b9661a502d30eb7f7c40fb9777dcc8df05b9981f63176098b14d69e11361a826de4d019668385e2c6188d3ee85e5bba0e2aea77fbff5079b1e8e2b2d1bd0f9a1
+MISC metadata.xml 2845 BLAKE2B 30a48fae80109b4f3a2afc8ff90dd103e33ade04d9ecfbe44fc2e43cb0fd9d8f0d54ed098e28fcffedab5f4276b5719c62497d7b39d40fd75f0e12f1e0dcb439 SHA512 e96fbb704401d871d83e9f11144a9259ae5e58bfcdcc98bc08e0199998044588485118f264adafc4927ed69bba2de7fd06dc6bdd2bb3357b90d903168685451a
diff --git a/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch
deleted file mode 100644
index 876a9ce31cd5..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index 6d2736a..533f6fe 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -180,6 +180,7 @@ priv_seccomp_init(int remote, int child)
- 	    (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 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fstat), 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(connect), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(futex), 0)) < 0 ||
- 
diff --git a/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch
deleted file mode 100644
index 68f3592ec9b6..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/827736
-https://github.com/lldpd/lldpd/commit/e57bf5ea66a70ff87bba5c39c0e10c071b4af824
-
-From: Benedikt Neuffer <benedikt.neuffer@kit.edu>
-Date: Sat, 27 Nov 2021 17:07:50 +0100
-Subject: [PATCH] linux: add missing SECCOMP rules
-
-Signed-off-by: Benedikt Neuffer <benedikt.neuffer@kit.edu>
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -176,6 +176,8 @@ priv_seccomp_init(int remote, int child)
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(clock_gettime), 0)) < 0 ||
- 	    (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 ||
- 	    /* 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/files/lldpd-1.0.13-r2-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.13-r2-glibc-2.33.patch
deleted file mode 100644
index 62f8cdc2e62b..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.13-r2-glibc-2.33.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index ac13394b280f..000000000000
--- a/net-misc/lldpd/lldpd-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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=(
-	"${FILESDIR}/lldpd-1.0.10-glibc-2.33.patch"
-)
-
-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 \
-		$(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.11-r1.ebuild b/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
deleted file mode 100644
index 141fd8ee4ac3..000000000000
--- a/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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=(
-	"${FILESDIR}/lldpd-1.0.10-glibc-2.33.patch"
-)
-
-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 \
-		$(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.12-r1.ebuild b/net-misc/lldpd/lldpd-1.0.12-r1.ebuild
deleted file mode 100644
index ab5b19cd63ee..000000000000
--- a/net-misc/lldpd/lldpd-1.0.12-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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=(
-	"${FILESDIR}/${PN}-1.0.13-glibc-2.33.patch"
-)
-
-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 \
-		$(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.13-r1.ebuild b/net-misc/lldpd/lldpd-1.0.13-r1.ebuild
deleted file mode 100644
index 2c150aae8d94..000000000000
--- a/net-misc/lldpd/lldpd-1.0.13-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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 this on next release; upstream.
-	"${FILESDIR}/${P}-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.13-r2.ebuild b/net-misc/lldpd/lldpd-1.0.13-r2.ebuild
deleted file mode 100644
index 0d977a8c72aa..000000000000
--- a/net-misc/lldpd/lldpd-1.0.13-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.9-r1.ebuild b/net-misc/lldpd/lldpd-1.0.15.ebuild
index 371194f50d2f..4760cdf0d716 100644
--- a/net-misc/lldpd/lldpd-1.0.9-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.15.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd bash-completion-r1 autotools tmpfiles
 
@@ -10,7 +10,7 @@ HOMEPAGE="https://lldpd.github.io/"
 SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
-SLOT="0/4.9.0"
+SLOT="0/4.9.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 	seccomp sonmp snmp static-libs test readline xml"
@@ -42,7 +42,6 @@ src_prepare() {
 	default
 
 	eautoreconf
-	elibtoolize
 }
 
 src_configure() {
diff --git a/net-misc/lldpd/lldpd-1.0.7-r1.ebuild b/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
deleted file mode 100644
index 85d06cae202c..000000000000
--- a/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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 )"
-
-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 \
-		$(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/metadata.xml b/net-misc/lldpd/metadata.xml
index 1f19b52e0f6e..d77375b75aca 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/metadata.xml
@@ -31,4 +31,7 @@ lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Pro
 		<flag name="sonmp">Enable SynOptics Network Management</flag>
 		<flag name="snmp">Enable the use of SNMP</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">lldpd/lldpd</remote-id>
+	</upstream>
 </pkgmetadata>