Revision bump, make sure to pass LLDPD_OPTS to the command line (bug #525190). Remove old.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

15 files changed, 54 insertions, 579 deletions

diff --git a/net-misc/lldpd/ChangeLog b/net-misc/lldpd/ChangeLog
index eede18c4379e..5ac0b6bf0e60 100644
--- a/net-misc/lldpd/ChangeLog
+++ b/net-misc/lldpd/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-misc/lldpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.21 2014/10/10 11:02:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.22 2014/10/13 18:06:06 chutzpah Exp $
+
+*lldpd-0.7.11-r1 (13 Oct 2014)
+
+  13 Oct 2014; Patrick McLean <chutzpah@gentoo.org> -lldpd-0.7.1.ebuild,
+  -lldpd-0.7.6.ebuild, -lldpd-0.7.7.ebuild, -lldpd-0.7.10.ebuild,
+  -lldpd-0.7.11.ebuild, +lldpd-0.7.11-r1.ebuild,
+  -files/lldpd-0.7.6-include-unistd.patch,
+  -files/lldpd-0.7.7-fix-readline-wrapper.patch,
+  -files/lldpd-0.7.10-completions.patch,
+  -files/lldpd-0.7.10-handle-read-errors.patch,
+  -files/lldpd-0.7.10-only-use-physical-for-chassis-id.patch,
+  -files/lldpd-0.7.10-zsh-completion-dir.patch, -files/lldpd-initd-1,
+  +files/lldpd-initd-4:
+  Revision bump, make sure to pass LLDPD_OPTS to the command line (bug
+  #525190). Remove old.
 
   10 Oct 2014; Agostino Sarubbo <ago@gentoo.org> lldpd-0.7.9-r3.ebuild:
   Stable for x86, wrt bug #522704
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index f15590d7000d..9d1d62216683 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,47 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX lldpd-0.7.10-completions.patch 2819 SHA256 98c2eaf448e508a39be32373a2f5a962a11262b3d4a1ea6ef69c2c09f6b1aab6 SHA512 f81796ec5ceeec4eae4beb9cc1a88d47de82aea29116b9d7bde96b885fdf42bd85e6721efb7f28cec7bf9df3168c6ef9f6cef8b62fb5c65ba3603c328c08439f WHIRLPOOL c44d97ef7cc7249c7b2f24005126a00a5833c37e03f68548991447fad9bab4c07cedd658f16e94c28032562ec76f19c9cb3fc1f7a17d36cfc37cf2317268460f
-AUX lldpd-0.7.10-handle-read-errors.patch 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
-AUX lldpd-0.7.10-only-use-physical-for-chassis-id.patch 1108 SHA256 e7ac76f1c60843f65dc49d602fd7e6d0a338642fe533b9dfb1fd700b3cb22f3e SHA512 fb45bbe3fbed07afe6644d46dbb705ee1c419429097c32da4648432af815ff34e8f184adb714044577411e1c4485068b2e248b6a93b84421b2699615bd44e106 WHIRLPOOL 3d9c3ea51fd43980ea2899611aff018a8f892b61fe0c3401ef53adac5df0428fbae8de2062d740ee0f7dc515f58730873173be6e895eec45789f5ea3035a7821
-AUX lldpd-0.7.10-zsh-completion-dir.patch 423 SHA256 8860f9986fdbfe0160b9b1e3446ae0ec6a946e62fa8e90ea0b6f94f0915de627 SHA512 2be685a14e87ce4f591ffbd77113c842f5280045ea62cb55be35f8fa71b3876554ab7d997d3ea47cf5da304c4967097ba0bae6bc51583ae40c0d4365b8313f5a WHIRLPOOL ca12309c21b1cf5e7deb1d57b5410f6f76822a4f18096e4c2955afa2be82df6511a49a6c3e821144d9f924c7ff9d7bfad113e6e4b557231f9c68e2d1277ca400
 AUX lldpd-0.7.11-zsh-completion-dir.patch 318 SHA256 a6b1cab53649d58d3332ae847bb0827c07f8c550e57812802ae88e9a009b6083 SHA512 cd4c069f9d637d6c9f0a687a7a415a6382bf5217390a94a269de19f5a35c1edd47d5c3455bc63d75aa7bc74a72d7f2c9de9210c0795a95bd0c78a10c1709fcb1 WHIRLPOOL 058512d0caf9ee539c91fbf2722cc1cb17322fceed62fa498c63773e10be2e461cf510650b0e680fe781954b05031ede70acd4912a270f853d2db61a03950538
-AUX lldpd-0.7.6-include-unistd.patch 283 SHA256 695fd16d350b75ed0a1b5b630ac13bb0365bc8b0738148b2b45ceed27e2e7f6e SHA512 f7345796fe30d21f819fcd3ec1ed580156bf3fe2d4cd7e1287ef43ba81d84c1a21372eb6550e2384d67372d9d0a7bbf7c66572426406ba6043a8c0ec48061f04 WHIRLPOOL 4331b0ba7dfac85bd0eea35c1c4c296efe245d38fd20e38fcf51b2219276416eb481d8bc12acbae4cb15b3d425f6b762b1b446eda06eb29be61c3e0ce767442f
-AUX lldpd-0.7.7-fix-readline-wrapper.patch 735 SHA256 aeb73ba9fa70b9351a998b4368ca812cc309c0b5c183161b6f9567a819e362b1 SHA512 3ff88a539ae80a4c75e00342bb2989f759791cd3372d06ca7cad6f1644f6bfc59e00bf264c54e73b6ffb0dec6b66ac714a8b38e747b5ff173b9cd32a5ae83ce0 WHIRLPOOL 3ad03197ccf7109724b955cd2b280468312da8d57a3385ca4b169406d077bfa8244d9f1993665ad36e17a5b5723cfdb3ce2e847e0c057f50d3baab75e3a37e3a
 AUX lldpd-0.7.9-dont-fork-after-making-pidfile.patch 4184 SHA256 caf7666effc2337ae7d1c68641a190edc0659f653fe9339d32d1749fd50e80c0 SHA512 9c92c8ebc3cb3e615c37e1bda353ceb22bba5a265d7da51371c8ac713aaea6a2633e813ec5c2bc556508b705784307c7ddf35da66b6f19debbb69a0b837b9b19 WHIRLPOOL b7d18617072e0143a2413916d5b5869ec7d48169f3939d4901b583e17eab11c427a83a53ad200f13aac411817ea3ceaa95377ceca672c4aedbd792d2369508bf
 AUX lldpd-0.7.9-seccomp-add-syscalls.patch 987 SHA256 bf934224ff3326cff15ea808517586a46f5e43fb5ce6b94230c50c3d092befe0 SHA512 d8aaec8d9d2d9cc0589d8d4102fc218bb1510badd53e9a7bae6e3b727cb1e0065b94eb59b991e0a077d9dee35f2e4ca500ef2ecad3aa5051c75d6e59f6d3d893 WHIRLPOOL 1910bcb8eee72b04b4187272965f20ef6e172a1d779f059797ff2fb597bf1af037bccb802a5510f584bdfb17dfb245ddfd8f2649057788020e9c6551e58532ff
 AUX lldpd-confd-1 142 SHA256 b1680fcf0395fc681bfb3283df7c86ac873aa105a9c92be37c41475b9ba9ee4c SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c WHIRLPOOL 0312f12cb5328dd9a3af675fbc142c726cb872b588e624c53b5e162cce191bf79d80ce039a61683d6c5c59c3263621ebd7e91deca1be40f6161865ccc257ad45
-AUX lldpd-initd-1 546 SHA256 41e90798d0bf488e05abdb7bbea2c24b422c88550ef5030a6e3b4b354a4dc2fa SHA512 0484d6105646b7e4f2f6bebf31e7add838207101a341b35d3475ea260868ed993b969dccb28419dfec7a90173d5525ad11a30abc1f91e6b61c252c9f97c09d95 WHIRLPOOL 48f0cf607d84a411a4048d1242fedbce76cf0378eab7e306693056be867093d39966fef230b3ee84a9416257afd797859eb63ca935444d3f004dc9d9df1ffcbe
 AUX lldpd-initd-3 438 SHA256 51da90a95b0fe264500d26b2ccefbd23c6f64577c1acd999c361dee75f911920 SHA512 85516cedb8461fffb5561f696aa641e5bb140b3f126c07ce7926ea86e2e06b6795758e1d598acf23b8adf9338b0d7efb04755e937399be0cbf4fc3fe479a500a WHIRLPOOL b78a1df6f2c8af8f439d5cb6841de42c688aac8bff0a2398a7b3abaac218dc15cf4ed280987881c301989d04b3879c8a522d2256913f0a3cfd3c9eca094b35c0
+AUX lldpd-initd-4 467 SHA256 8094ec4b1c33c9d61562d0e2a3ed7e867a0facf5186c97df2f3055aecdda16c3 SHA512 0dd88c937f093c643f90267067fbd611ad2be3fe2ce2a3e2cfe68ad9d95d94bb665eac335e6ba7cd3cd23e0fc388ee7f2edd1a6cfeef5cc655ea2d5fa8fd0331 WHIRLPOOL f074a9f6a2df5e6cd19990303a1cbc85dd04cee4a96532c59bc1bc6cd8aae03c6987233c9616cfcedcb05e9bd4b7bb25572faef482d2f5db287bad3e1bb74a06
 AUX lldpd.service 205 SHA256 a8434a8092ae95de991c4af83a96bbeacb0daae816cde127a3fbde6715605ef9 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054 WHIRLPOOL 20ffed164e88e7a84428df12bfd3a1475d41d121e0b1a129995327521f0ba908e417484d1acffb2819a0a55724181ea72264fdc31fb8f915dae1e59eb615b99a
-DIST lldpd-0.7.1.tar.gz 1404076 SHA256 557c3358eedd05f5817d4c63be8cff1b467df3e34c7265eadd20078f73643719 SHA512 63004da745ffa266c97861724b9cf387664b054cf7cde7afbb5e0b1f9668241e7dd1c422b371ddb9a444199040ccae1c72f86dc3ec2061ad25605dcf94f28b0a WHIRLPOOL 3e392b2451c5572c39b0a18b2ea16219e8ef06574af071b06b109094af645020223507845ca752437706cc41ad3586984901fcdacd5057d2b2f2aa879a768267
-DIST lldpd-0.7.10.tar.gz 1504912 SHA256 8db2cf79ace6e5348c4370b120c49861547aafff92d3232d26ae5b75330433b0 SHA512 2f4cebb65b2c482130787a35208e3872cd24a97cefa65ba0f8b5d16f5f4dffc72d489a7f7d3cebef9e9a242d14df77af6e004dc84cb3c299a02c336096349ccc WHIRLPOOL 4599d98c91d1976362e697dc43235b4a96074248a5d72c2fcd85eb85218bbc539f18af81c8181d1d51fa182534d8337d8f43fe8a8f89a2927cbfdc8d8d649c99
 DIST lldpd-0.7.11.tar.gz 1509215 SHA256 5257169e0de6037e81efb1bcb26f6dd5755e3efa0a025144d6763bdfaf982e6b SHA512 7f5454ef4255a4fae0e323703d607bd93254b8a511984e434539d0305de1298f8bcf481beb2f121876bedc9890e6f1338cc30f5b08d7b5cf261cf87d5bb69bff WHIRLPOOL 710826936318099a562c7503653ce002c60256055e5f34d7328e7bc5397805c5790670efcc746a11f5abb5a2ff1b6590c888a3ccf02048f260f83a6ea855f28a
-DIST lldpd-0.7.6.tar.gz 1459094 SHA256 e4c14f9e86723985bb8ed04a3bcaba858a6fb2111cd5cd764434a4a232c67149 SHA512 dbb17c11c3fd50c9dc36b3c90e5340fd5f73ef55620785f2181c60d8dc41270766ac2a48d9c2440ea8920d337470b6b1271ecd196de3083bcbfe9c62d3546b94 WHIRLPOOL 66a6e5c71982648607e89ef15d59fe1c31a7396549034c7c96e15f663023cd6a3026351aa377530a7c8edb726f76031fd7ed7165ea6e39bbb6ce65a4e72fbe4b
-DIST lldpd-0.7.7.tar.gz 1481777 SHA256 a81f5f1f850808e31fea42d74819f6209784a51c899981c781195183f252ada9 SHA512 f7b0d43e6930908d754b4d3823d47a642513af993c5a9183cbe73361c4d0fcdc2ec4374a3651849b3c7462abbd5c9e7e768242a0327485fcc80c02fd679f4c85 WHIRLPOOL d212d1679249bb29f80c0e0e3868dac03267e91935993da2cd7d780a7f0af9c08af2f653462aa143da917f58e8e178fce24e19d9e8a0d5429a049932b5515e1b
 DIST lldpd-0.7.9.tar.gz 1496740 SHA256 7ac9abb7de51203cd3a88f8f032baef272474523bfb9c3fcc5c585e5c0c8dac1 SHA512 f8808dc6f0c57c48b62221b25c71e6b92f84500d850f8db75e53ba36a79e6937dcb49c9403fcd0363aa99af84bd3d6e1725f38890173d58b2866da0aaa5f2aa6 WHIRLPOOL ea1a7d8d1bc379b7a8751e2ccd50efc1bd9cd79c3285ecae803184e9f8009b6d871a9dba2912351d9a387bce018d6d7bd1544f39346b91c3d657b7a94f0f3e4a
-EBUILD lldpd-0.7.1.ebuild 1826 SHA256 1b80c38edb8fdd8f38bdb9998623e493c43df93bfb918717ea40958d8e003d93 SHA512 dfe883cc05a0fb4d61bbadec79dbae2930a4c67f9914a5524b17f8d29bc4cca246d3e11c1dfcb7a56d8015c75cc8a79a088ac35338ba0c72774f37f57ac89caf WHIRLPOOL 87a22552fbef8111ae7c997aa2075b94cf680efc4cf393172c62ddfe1b2dfa922d4ab613f3042b29ff02d63e2d33e40d1350b92c862bd25b04eacbadb160e3b7
-EBUILD lldpd-0.7.10.ebuild 2627 SHA256 f4717607d008c08860c90def2bbd5fd1de7fb05d632fbfe913d9929ce9cd0b24 SHA512 169c5f76ba79e55f332f5c675528d4ada08c3259febd9588d3d3ca8261f228e83cc9ec3d3c9892c48b5a95df2f8d3cb0a7ce12480f7fb4253e8b404a1e724a99 WHIRLPOOL 04227b6cc40cfbbfd67f402a899ed6944bcaed3ef42297c86d3dea342256f0c5fde3901f97f779ce559a3df1a45f2cabec778b6fa7e8be6154793a95cfd0858b
-EBUILD lldpd-0.7.11.ebuild 2406 SHA256 4997f093a0defb9cedfee0c0c107c2a74c3f0e95268a7b4a126ac74e210de374 SHA512 cb0a69b05fa40441317143d396c42bfdd2fffbb1a91b48d19b72dc2222faa653f12edda29488add88e7a5a98900648c883289fb15018e3bd6425f507e32bf63c WHIRLPOOL 9ce18be1065c3537b1e218c16cf2c276f6e2c4e4abc386bcc62ea696b45971c498f5f95c65c8694779169c72a786fd7c164eb23d718f52f3ca282c043e2614d7
-EBUILD lldpd-0.7.6.ebuild 1941 SHA256 f91d579fe9678a6fc958fa9439ccc3b3178557873115dfb8b1a6b957a075dc90 SHA512 c17e2cec3080f76be28c83637c38c1ac2c2ff87aa0c75edf01992125178c7a9e5c58fcd56146576803b4aea8c97a8ff76ca75e37e2c487eb1fa7c1b2330fece1 WHIRLPOOL a096e39cf57f57611d4e083319f9c041143873d39cea708bbfb8db944d013ff290c3e59b43913c29bccefb1f51b8e00fcbe91d5d7ee30e4274b4567939fabfa3
-EBUILD lldpd-0.7.7.ebuild 2019 SHA256 dfbb98f55489302d85facc09aec37c04514c491bcc0db493bde6abe20aaaee43 SHA512 e8cbf5f8adfdaae0ead238c9cd194724699b54187a5b2fe9f9e3a236c5c626792c240f6b168f2df5d8838cda08bd179003b5855c98f7cbd34193c4e143cc9695 WHIRLPOOL 9cbdea3b2a07addc8e7a9a1e93d927a0318e08e15a7279162f4693df6106f76174931db991bc90a69cb354176ea5a47af9a79db4cc9327974871900098cd311c
+EBUILD lldpd-0.7.11-r1.ebuild 2409 SHA256 ea18b0e92d950469107ef8e98c76b896792cd473de0a341ccd1c335290082006 SHA512 05721872abfd2912cd34e41dca623722f20c186724961ae8699340593d7a28fb7cf63f529b86c2fc48814631a49892a041c0a0eaa016c21bd790edc45fa1753e WHIRLPOOL d6cf447bf453e1f1f6820451f89b82d5f20d89daa676b24e719fa0cffd951004083a8ccb38e6bb316d8970f018f5fb5539e0e088220a3581eaccb8f31bfa817d
 EBUILD lldpd-0.7.9-r3.ebuild 2132 SHA256 6409b59690e240bca19ca76d0450b174ec07ed037f972f3dbbfed0a137869064 SHA512 3cb144c6c164fea560525655c1af6d7ff4eccbfa76d81294e6c13704e451f6c35c1f9b54439dd8f18962734db11930e2b771e82e6600f03b5deb7795bad8a032 WHIRLPOOL 74536f94e158f2d5bb68e0e8d2e4b7cbd51654d9c469ca6a719beec3aa69da95c9f56167491ba6c73854974b940a1103ea0765fcd35e52a5ca35282e99f9e5d3
-MISC ChangeLog 4293 SHA256 d3dad0d32b63630eb68e48a0a103c43e36eacb9f00c6c3fa790dff7b992d5b22 SHA512 9f66edf59a429cf44436358455ef32b350e406ba6f0c16bde985c55442e471dae047c777b3c6ef4cdf612c27c89c80a2135ee556a9f9df012e10e82e06a158fc WHIRLPOOL 467fee57f4d7e67e41b0baa5cc1da50d0ede4a962b3b4ef19dc55f20283089750d6f3c1fb22c8c9f511aa6205eb26897ca10105326c72745b06145d57dcfe304
+MISC ChangeLog 4951 SHA256 90a8f63a713a32819717fad69401713fc62519147a4dd08bf73a22873b6a5f74 SHA512 677e7344b89d63bbadf4a82c99ce7c4fe4122bb95d13335d314e657afcfc6a8d852eafb3e6d506cbbdc57989fed95d939fc14f0e6274539a36df0da21761e4b2 WHIRLPOOL 1549359a384b6855613857a95009ff0ae14ff8aa2fd6e60adc47790243082646072470aa1a9f3faf847e734e9f6698d79aaab4f79953072fcb845b99bf56aea9
 MISC metadata.xml 2838 SHA256 9f121c4d95fe02236d939cdd7e3e13eb02cdecda8a401e637994c685f25d6688 SHA512 d5548a36c7cac67752035b06f1952875d8f2844f2b3e7cb3fed33a2f58ca65fe0ae449d4561a7415ccf6ed4d513cce5f109d82cc29f5d158f8f23f7830292861 WHIRLPOOL 3547d0d61e49f498c1df52402221efe9a1c4a9fdf440148242c8c71ea36261c74f049d39ea534f2d29af98e0d265db794abd33b7d5556133dd28b7161e80cd74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUN7yzAAoJELp701BxlEWfvU4P/imZFFD2SoSo5/NrD3aLl6hC
-jBmI+Dhfbhp8WRzDmESJx504kgmj12m/g/71GDOysS4XbbBqLaQCer8QKQECNUTG
-fHCo7DefILf9vfzR7arjXYygeF7KE+jheE7iUwziBco/kx2ZWBUgv2qiBx4FWdqD
-Fwc/CFwqFIDNn3JzIiWlv8PIIDKfRJOjkah4cNNdTlUKh1f5/Xn8vAYKX7CIKVJ/
-oq5HT7Q9KUkg295KtT2E3rC8JB7f7t2je4c+GQCx2PmqXuBntkEVnwH2SprWiC5S
-A6ywLQHQGdVr+6fSq9NhFGWQEfOBhBzVPiuW9dAaDaODh19WkSNnEKsxbH0folzO
-KRcDaibEo7YQVu3P2w/WnfE9soKL/9pHHTetrBZybNhv8V0CPPYg7M8xGGm1AP8y
-GtTn3ze81/2GaAFhM599WwV4Lzi1bhzeDYCHpLLfAfMCIxcetcitFrzwHQwKptEu
-9697+fRhho8oz8VpfGXrl98XeMSVRcK2NCzW0fz0XPLNc8tO13rZgLmZvde+3GAp
-IaJgvG7ZVsZilw5QBURhvsOUL6ueGr4UZUnH4TH13SKflL2odI5dwiHk5r09r+N6
-41+gBQET92kiEgR/ggd0CZbsc2qdm6Z1tjSrCArHsC2dowqmbgDmxrFJ26nOd/Qs
-DNO8wf773BBS3Xuhkd+l
-=Sfow
+iQIcBAEBCAAGBQJUPBSPAAoJEHy/RO9cNQiDbqkP/AvHOEZewMhYOMjsR103Zxwc
+K8GpqBa44IblG6LH1kOTB1JfG0gOOLA4XolP02W+tBt2e9RzSLF6flm0ss08HLii
+wU9vxs3swg24rhYzPQGk83gbrV2h3NGCph9S3Us++5INOZIArWnEhM794f5i6sL7
+byYJnwHJEuVibMCBEFow7d0CKqtGk/JtQsaVzFz4JRpCgPtsbEt3TDCtbUtrWVrL
+aAPnWEmRIHrumXVbTZSXeyh5IMTwXxgQBQnsm6HIuF1msgAQty6P6zqJjZXYuB2m
+DUI/fEUFbkNVa1yYmNe+0Mtphd1D423k32V9hPWDyJPsTjSa00EJ0cmBM0gc9LQ6
+DpEYttczDFO3jzUrYkWoGeXAvwauWgO/hZ/O+AilizEQcd5WjANK06WbBXKrQ2G4
+Sx7aNqzoZbAtXTKRX4psbI+/J55d35xSr7iPTVzeffzkXCvcPwpeKo8MZEdw3Eex
+SPrOS8E+yss37BKtpgRoXpaINXeRVhLL2l99CYDdfitDZYcqQb+vjDOJg16Bvubx
+MZE09hV86wrrWHwYaVBWTxXB7TZqN//Wm1Hl7k2Brp/BDSSz/hDzaqkB9etjuzke
+o9fELqF26WaA6DTBZhLBWHWQUbUZvZqKBnVRt99S/NSeZXmobqIckZ4MKRo4KiB3
+57NVLJUL+UmKunL3AAxe
+=jrNW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/lldpd/files/lldpd-0.7.10-completions.patch b/net-misc/lldpd/files/lldpd-0.7.10-completions.patch
deleted file mode 100644
index bdaba252ba49..000000000000
--- a/net-misc/lldpd/files/lldpd-0.7.10-completions.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/src/client/Makefile.am b/src/client/Makefile.am
-index af747ea..f7305db 100644
---- a/src/client/Makefile.am
-+++ b/src/client/Makefile.am
-@@ -39,3 +39,9 @@ lldpcli_SOURCES += jsonc_writer.c
- lldpcli_CFLAGS  += @JSONC_CFLAGS@
- lldpcli_LDADD   += @JSONC_LIBS@
- endif
-+
-+# Completions
-+bashcompletiondir = $(sysconfdir)/bash_completion.d
-+bashcompletion_DATA = lldpcli.bash-completion
-+zshcompletiondir = $(datadir)/zsh/vendor-completions
-+zshcompletion_DATA = _lldpcli
-diff --git a/src/client/_lldpcli b/src/client/_lldpcli
-new file mode 100644
-index 0000000..9f7a98a
---- /dev/null
-+++ b/src/client/_lldpcli
-@@ -0,0 +1,40 @@
-+#compdef lldpcli
-+#
-+# zsh completion for lldpcli
-+#
-+# Copyright (c) 2014 Vincent Bernat <bernat@luffy.cx>
-+#
-+# Permission to use, copy, modify, and/or distribute this software for any
-+# purpose with or without fee is hereby granted, provided that the above
-+# copyright notice and this permission notice appear in all copies.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+
-+
-+__lldpcli_command () {
-+    local -a completions
-+    completions=(${(f)"$(_call_program commands lldpcli complete ${words[1,$(($CURRENT-1))]})"})
-+    completions=(${completions:s/ /:/})
-+    _describe -t lldpcli-command "lldpcli completion" completions "$@"
-+}
-+
-+_lldpcli () {
-+    local curcontext="$curcontext" state line
-+
-+    _arguments -C \
-+        '*-d[print more debugging information]' \
-+        '(- *)-v[print version number and exit]' \
-+        '-u[use an alternate socket with lldpd]:UNIX socket:_files' \
-+        '-f[output format]:format:(plain xml json keyvalue)' \
-+        '*-c[read a configuration file]:configuration file:_files' \
-+        '(-)*::lldpcli command:__lldpcli_command'
-+}
-+
-+
-+_lldpcli "$@"
-diff --git a/src/client/lldpcli.bash-completion b/src/client/lldpcli.bash-completion
-new file mode 100755
-index 0000000..8ce68d7
---- /dev/null
-+++ b/src/client/lldpcli.bash-completion
-@@ -0,0 +1,19 @@
-+# -*- sh -*-
-+_lldpcli()
-+{
-+    COMPREPLY=()
-+    COMP_WORDBREAKS=" "
-+    local cur=${COMP_WORDS[COMP_CWORD]}
-+    local cmd=(${COMP_WORDS[*]})
-+
-+    if [ "" != "$cur" ]; then
-+        unset cmd[COMP_CWORD]
-+    fi
-+
-+    local choices=$(${cmd[0]} complete ${cmd[@]:1} | \
-+        cut -d " " -f 1)
-+    COMPREPLY=($(compgen -W '${choices}' -- ${cur} ))
-+    return 0
-+}
-+
-+complete -F _lldpcli lldpcli
diff --git a/net-misc/lldpd/files/lldpd-0.7.10-handle-read-errors.patch b/net-misc/lldpd/files/lldpd-0.7.10-handle-read-errors.patch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-misc/lldpd/files/lldpd-0.7.10-handle-read-errors.patch
+++ /dev/null
diff --git a/net-misc/lldpd/files/lldpd-0.7.10-only-use-physical-for-chassis-id.patch b/net-misc/lldpd/files/lldpd-0.7.10-only-use-physical-for-chassis-id.patch
deleted file mode 100644
index 43602a84d27c..000000000000
--- a/net-misc/lldpd/files/lldpd-0.7.10-only-use-physical-for-chassis-id.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 790752d0b5e7941a2e368cee6e30df6695162752
-Author: Vincent Bernat <vincent@bernat.im>
-Date:   Thu Sep 18 11:27:21 2014 +0200
-
-    interfaces: only use physical interfaces to get a chassis ID
-
-diff --git a/src/daemon/interfaces.c b/src/daemon/interfaces.c
-index d29eacc..a52e99c 100644
---- a/src/daemon/interfaces.c
-+++ b/src/daemon/interfaces.c
-@@ -288,8 +288,8 @@ interfaces_helper_vlan(struct lldpd *cfg,
- }
- #endif
- 
--/* Fill out chassis ID if not already done. This handler is special
--   because we will only handle interfaces that are already handled. */
-+/* Fill out chassis ID if not already done. Only physical interfaces are
-+ * considered. */
- void
- interfaces_helper_chassis(struct lldpd *cfg,
-     struct interfaces_device_list *interfaces)
-@@ -313,7 +313,7 @@ interfaces_helper_chassis(struct lldpd *cfg,
- 		return;		/* We already have one */
- 
- 	TAILQ_FOREACH(iface, interfaces, next) {
--		if (iface->flags) continue;
-+		if (!(iface->type & IFACE_PHYSICAL_T)) continue;
- 		if (cfg->g_config.c_cid_pattern &&
- 		    !pattern_match(iface->name, cfg->g_config.c_cid_pattern, 0)) continue;
- 
diff --git a/net-misc/lldpd/files/lldpd-0.7.10-zsh-completion-dir.patch b/net-misc/lldpd/files/lldpd-0.7.10-zsh-completion-dir.patch
deleted file mode 100644
index 666e8d5ac027..000000000000
--- a/net-misc/lldpd/files/lldpd-0.7.10-zsh-completion-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/client/Makefile.am b/src/client/Makefile.am
-index 8281555..994904c 100644
---- a/src/client/Makefile.am
-+++ b/src/client/Makefile.am
-@@ -43,5 +43,5 @@ endif
- # Completions
- bashcompletiondir = $(sysconfdir)/bash_completion.d
- bashcompletion_DATA = lldpcli.bash-completion
--zshcompletiondir = $(datadir)/zsh/vendor-completions
-+zshcompletiondir = $(datadir)/zsh/site-functions
- zshcompletion_DATA = _lldpcli
diff --git a/net-misc/lldpd/files/lldpd-0.7.6-include-unistd.patch b/net-misc/lldpd/files/lldpd-0.7.6-include-unistd.patch
deleted file mode 100644
index f8933541b549..000000000000
--- a/net-misc/lldpd/files/lldpd-0.7.6-include-unistd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/daemon/priv-linux.c b/src/daemon/priv-linux.c
-index 68eee70..d17ec38 100644
---- a/src/daemon/priv-linux.c
-+++ b/src/daemon/priv-linux.c
-@@ -17,6 +17,7 @@
- 
- #include "lldpd.h"
- 
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/net-misc/lldpd/files/lldpd-0.7.7-fix-readline-wrapper.patch b/net-misc/lldpd/files/lldpd-0.7.7-fix-readline-wrapper.patch
deleted file mode 100644
index 79f024cc3778..000000000000
--- a/net-misc/lldpd/files/lldpd-0.7.7-fix-readline-wrapper.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 02987888adc8575cd8efa103fe901de69224f4b4
-Author: Vincent Bernat <bernat@luffy.cx>
-Date:   Thu Feb 20 21:57:29 2014 +0100
-
-    lldpcli: fix readline() wrapper to take prompt as argument
-    
-    `readline()` is expecting the prompt as argument. We fix the wrapper to
-    have the same requirement.
-
-diff --git a/src/client/lldpcli.c b/src/client/lldpcli.c
-index 4223c90..35c1b94 100644
---- a/src/client/lldpcli.c
-+++ b/src/client/lldpcli.c
-@@ -239,10 +239,10 @@ cmd_help(int count, int ch)
- }
- #else
- static char*
--readline()
-+readline(const char *p)
- {
- 	static char line[2048];
--	fprintf(stderr, "%s", prompt());
-+	fprintf(stderr, "%s", p);
- 	fflush(stderr);
- 	if (fgets(line, sizeof(line) - 2, stdin) == NULL)
- 		return NULL;
diff --git a/net-misc/lldpd/files/lldpd-initd-1 b/net-misc/lldpd/files/lldpd-initd-1
deleted file mode 100755
index 90e5a6f1b7a6..000000000000
--- a/net-misc/lldpd/files/lldpd-initd-1
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/files/lldpd-initd-1,v 1.1 2012/02/09 23:34:41 chutzpah Exp $
-
-depend() {
-	use net
-}
-start() {
-	ebegin "Starting lldpd"
-	start-stop-daemon --start --exec /usr/sbin/lldpd \
-	    --pidfile /var/run/lldpd.pid \
-	    -- ${LLDPD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping lldpd"
-	start-stop-daemon --stop --exec /usr/sbin/lldpd \
-	    --pidfile /var/run/lldpd.pid
-	eend $?
-}
diff --git a/net-misc/lldpd/files/lldpd-initd-4 b/net-misc/lldpd/files/lldpd-initd-4
new file mode 100644
index 000000000000..97c79e33f033
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-initd-4
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/files/lldpd-initd-4,v 1.1 2014/10/13 18:06:06 chutzpah Exp $
+
+name=lldpd
+pidfile=/run/lldpd.pid
+command=/usr/sbin/lldpd
+retry="TERM/10/KILL/5"
+command_args="${LLDPD_OPTS}"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath --directory /run/lldpd
+}
+
+# vim:ft=gentoo-init-d:noet:ts=4:sts=4:sw=4:
diff --git a/net-misc/lldpd/lldpd-0.7.1.ebuild b/net-misc/lldpd/lldpd-0.7.1.ebuild
deleted file mode 100644
index 59d12feb285d..000000000000
--- a/net-misc/lldpd/lldpd-0.7.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.1.ebuild,v 1.5 2013/03/28 20:14:56 chutzpah Exp $
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="http://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 json +lldpmed sonmp snmp readline xml"
-
-RDEPEND=">=dev-libs/libevent-2.0.5
-		snmp? ( net-analyzer/net-snmp[extensible(+)] )
-		xml? ( dev-libs/libxml2 )
-		json? ( dev-libs/jansson )"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		doc? (
-			graph? ( app-doc/doxygen[dot] )
-			!graph? ( app-doc/doxygen )
-		)"
-
-REQUIRED_USE="graph? ( doc )"
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	# remove the bundled libevent
-	rm -rf libevent
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/var/lib/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable cdp) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable lldpmed) \
-		$(use_enable sonmp) \
-		$(use_with json) \
-		$(use_with readline) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/${PN}-initd-1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-
-	use doc && dohtml -r doxygen/html/*
-
-	keepdir /var/lib/${PN}
-}
diff --git a/net-misc/lldpd/lldpd-0.7.10.ebuild b/net-misc/lldpd/lldpd-0.7.10.ebuild
deleted file mode 100644
index 213443379b28..000000000000
--- a/net-misc/lldpd/lldpd-0.7.10.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.10.ebuild,v 1.1 2014/09/22 18:09:19 chutzpah Exp $
-
-EAPI=5
-
-inherit eutils user systemd bash-completion-r1
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="http://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 json-c +lldpmed seccomp sonmp
-	snmp static-libs readline xml zsh-completion"
-
-RDEPEND=">=dev-libs/libevent-2.0.5
-		snmp? ( net-analyzer/net-snmp[extensible(+)] )
-		xml? ( dev-libs/libxml2 )
-		jansson? ( dev-libs/jansson )
-		json-c? ( dev-libs/json-c )
-		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 ) json-c? ( !jansson )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-completions.patch
-	"${FILESDIR}"/${P}-handle-read-errors.patch
-	"${FILESDIR}"/${P}-only-use-physical-for-chassis-id.patch
-	"${FILESDIR}"/${P}-zsh-completion-dir.patch
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-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 graph doxygen-dot) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable cdp) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable lldpmed) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with json-c) \
-		$(use_with jansson) \
-		$(use_with readline) \
-		$(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-3 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/lldpcli.bash-completion lldpcli
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins src/client/_lldpcli
-	fi
-
-	use doc && dohtml -r doxygen/html/*
-
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/net-misc/lldpd/lldpd-0.7.11.ebuild b/net-misc/lldpd/lldpd-0.7.11-r1.ebuild
index f6d30d1b7afd..5f33574a48d8 100644
--- a/net-misc/lldpd/lldpd-0.7.11.ebuild
+++ b/net-misc/lldpd/lldpd-0.7.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.11.ebuild,v 1.1 2014/10/09 21:38:31 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.11-r1.ebuild,v 1.1 2014/10/13 18:06:06 chutzpah Exp $
 
 EAPI=5
 
@@ -87,7 +87,7 @@ src_install() {
 	emake DESTDIR="${D}" install
 	prune_libtool_files
 
-	newinitd "${FILESDIR}"/${PN}-initd-3 ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd-4 ${PN}
 	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
 	newbashcomp src/client/lldpcli.bash-completion lldpcli
 
diff --git a/net-misc/lldpd/lldpd-0.7.6.ebuild b/net-misc/lldpd/lldpd-0.7.6.ebuild
deleted file mode 100644
index 1239e484586b..000000000000
--- a/net-misc/lldpd/lldpd-0.7.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.6.ebuild,v 1.3 2014/03/03 23:50:56 pacho Exp $
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="http://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 json +lldpmed sonmp snmp static-libs readline xml"
-
-RDEPEND=">=dev-libs/libevent-2.0.5
-		snmp? ( net-analyzer/net-snmp[extensible(+)] )
-		xml? ( dev-libs/libxml2 )
-		json? ( dev-libs/jansson )"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		doc? (
-			graph? ( app-doc/doxygen[dot] )
-			!graph? ( app-doc/doxygen )
-		)"
-
-REQUIRED_USE="graph? ( doc )"
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	# remove the bundled libevent
-	rm -rf libevent
-	epatch "${FILESDIR}"/${P}-include-unistd.patch
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/var/lib/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable cdp) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable lldpmed) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with json) \
-		$(use_with readline) \
-		$(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-1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-
-	use doc && dohtml -r doxygen/html/*
-
-	keepdir /var/lib/${PN}
-}
diff --git a/net-misc/lldpd/lldpd-0.7.7.ebuild b/net-misc/lldpd/lldpd-0.7.7.ebuild
deleted file mode 100644
index 0158454109bf..000000000000
--- a/net-misc/lldpd/lldpd-0.7.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.7.ebuild,v 1.1 2014/02/21 18:47:03 chutzpah Exp $
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="http://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 json +lldpmed seccomp sonmp snmp static-libs readline xml"
-
-RDEPEND=">=dev-libs/libevent-2.0.5
-		snmp? ( net-analyzer/net-snmp[extensible(+)] )
-		xml? ( dev-libs/libxml2 )
-		json? ( dev-libs/jansson )
-		seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		doc? (
-			graph? ( app-doc/doxygen[dot] )
-			!graph? ( app-doc/doxygen )
-		)"
-
-REQUIRED_USE="graph? ( doc )"
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	# remove the bundled libevent
-	rm -rf libevent
-	epatch "${FILESDIR}"/${P}-fix-readline-wrapper.patch
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/var/lib/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable cdp) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable lldpmed) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with json) \
-		$(use_with readline) \
-		$(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-1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-
-	use doc && dohtml -r doxygen/html/*
-
-	keepdir /var/lib/${PN}
-}