Version bump, add json-c USE flag and rename json to jansson. Import bash and zsh completions from upstream git. Import some bugfix patches from upstream.

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

8 files changed, 266 insertions, 16 deletions

diff --git a/net-misc/lldpd/ChangeLog b/net-misc/lldpd/ChangeLog
index 94c43600c612..589efffadb6e 100644
--- a/net-misc/lldpd/ChangeLog
+++ b/net-misc/lldpd/ChangeLog
@@ -1,6 +1,16 @@
 # 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.17 2014/07/08 23:17:39 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.18 2014/09/22 18:09:19 chutzpah Exp $
+
+*lldpd-0.7.10 (22 Sep 2014)
+
+  22 Sep 2014; Patrick McLean <chutzpah@gentoo.org> +lldpd-0.7.10.ebuild,
+  +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, metadata.xml:
+  Version bump, add json-c USE flag and rename json to jansson. Import bash and
+  zsh completions from upstream git. Import some bugfix patches from upstream.
 
 *lldpd-0.7.9-r3 (08 Jul 2014)
 
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index f75472207151..8491d9309fe5 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,6 +1,10 @@
 -----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.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
@@ -10,29 +14,31 @@ AUX lldpd-initd-1 546 SHA256 41e90798d0bf488e05abdb7bbea2c24b422c88550ef5030a6e3
 AUX lldpd-initd-3 438 SHA256 51da90a95b0fe264500d26b2ccefbd23c6f64577c1acd999c361dee75f911920 SHA512 85516cedb8461fffb5561f696aa641e5bb140b3f126c07ce7926ea86e2e06b6795758e1d598acf23b8adf9338b0d7efb04755e937399be0cbf4fc3fe479a500a WHIRLPOOL b78a1df6f2c8af8f439d5cb6841de42c688aac8bff0a2398a7b3abaac218dc15cf4ed280987881c301989d04b3879c8a522d2256913f0a3cfd3c9eca094b35c0
 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.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.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.9-r3.ebuild 2139 SHA256 48d2a02fa761b069f2af979d909b3d31d725f6b47b6c0fcda40f30aaf974f2a7 SHA512 30ff77189034d4869d4863f68fb03eea6e3787607ecaa7f5b637fa10e33e3989f8e9e6a116cb4ad7b735fe97ca3179eb56c754a25f0625e0ede794bd2ae425eb WHIRLPOOL 7bfeea79986dd520766c6775fb1f381b1f262093b06fa9acdda1c71fe068f0f701acaf935089fe88f8f5dc016569da25a8ed9aaaefcc7703819c6af8e53c3dd0
-MISC ChangeLog 3438 SHA256 93c7b6b7a34457690426590ed92cad5510d84ece13aa08bbdecbd2e715d61a46 SHA512 3a9ced50cb7b2369c23c2a7ad936b0126aed41a417797509e61a623540786f1edeb50ccbbf09a5b0c9e1c955876d5ff3df61cd3e4da2b0aa6b163a3a9b90413d WHIRLPOOL 0cb786519b85262534b6627398b0156f8cd128c9bb026abaa264c62e1a3fdeca4cfdc37da8fd165aae6e8e6852e4659906d020f0424142181a41885f26efd9ca
-MISC metadata.xml 2718 SHA256 47dba0b887082461fac8017091a249014731a9228139a31028ddb65e443f7710 SHA512 15a78cdd37bca3dfae31f4551ed11e2fd329d2cf5ef54f2561fc92e421ec62ff8364e945454568b5f7ab61b65787cde1a094c7c0a2ead4ca77bcec43a2018764 WHIRLPOOL 33049e9119917389637f07210589d5a0c425ae11d5402f5658a74a7816559c11aafde1930d5d55efcc1a14c9c24e6244a86a2a8a6d1932abba28d776133275e3
+MISC ChangeLog 3914 SHA256 c19006abc755ae69218a65ef3b56f1732b8327d72cf6d844d65848694505a7bf SHA512 903b12a20816841bdb4dab05499e7c453c168988f7dfba5cbf84a2002e3ac9d3e20cd2f18bea937a3c2d107c8f62177786cfe56d8ae0c00f9495bfbed6a95485 WHIRLPOOL 770fb148f65e30d90202e534e7de0b8a5dab1c77e7b7d0335db0ce3256e5d2d2d8e0721f935fc6e8f07112791393fab4a446c8e706a33088bb82cc9b02b5fc30
+MISC metadata.xml 2838 SHA256 9f121c4d95fe02236d939cdd7e3e13eb02cdecda8a401e637994c685f25d6688 SHA512 d5548a36c7cac67752035b06f1952875d8f2844f2b3e7cb3fed33a2f58ca65fe0ae449d4561a7415ccf6ed4d513cce5f109d82cc29f5d158f8f23f7830292861 WHIRLPOOL 3547d0d61e49f498c1df52402221efe9a1c4a9fdf440148242c8c71ea36261c74f049d39ea534f2d29af98e0d265db794abd33b7d5556133dd28b7161e80cd74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTvHwUAAoJEHy/RO9cNQiDwZIQAMmss7iMdfMuaXnVXKxXjCTs
-sIRg1immgF8WYt548AxXjXlyrtl6PUGBB9opMdmjmbwUbBRYe8ixcyPEbdR3UVLZ
-hrkjJe4K7MZYCuF2QwccfCHiv8405VugXzFpzLD/gypi4u5zs7MXnR+N1qyT07pJ
-MgS7Uj/VtRe/vrLdlZwR7ItSb/xBGbYVjQ4m3pxS3rgxYzm70hhrNnNnId6gO/Tv
-NNMYOh50/LbNTzFKKdbi/aTA8UM4OIpYJHOGVFtOrtoIU8w+fS/uFzt4LFAhBOaQ
-fU8AwBMPLIpj12ypjkwqjjumoj8AjSI+FA+5PH2vTUh7/XcS5mxSX++Bcw36OMgi
-+9TWtoAnLY7+6mrU+eRw4DW3+IYe+iemZZ2iUSJK0S//2zp0GwyDhlVEMMIBWR2+
-XeZ296mMriG/KT9LXf4hWkFUZtYeGn/1L+ubNOMFgx7JAmKAGwa+HbatFJd+LVNn
-Qnmiyt3uSJ19Yk0USJCdHfdKd2jL7aYZuT+ZaihdJry+BCd3L+BRVtq9l10iTESQ
-kHH6wYADO65cioDqP5mZHkaQJTlRDpEBd69gTsXaKPpycw8lmM9KMAKEuOxzxvCD
-9rQUmLyHBJ5QcgUTRmhh138+zT6hiPdkbEkflYalFtBLFi4zN5RoH7OYNQHhM6gX
-OcDDB1ZHH1KQaQePenEn
-=FLOj
+iQIcBAEBCAAGBQJUIGXQAAoJEHy/RO9cNQiDta8P/iHBripM1SZyqKYcE5KjQnsA
+z4km7eRtR1eY9/zsXZFYuKuhRjqYOBQr9ZA0fefzNcuWK1Gh2OuMxNFcI5iu2g9P
+sMvVMwOeJtj3bWNfxuqK0TJiFHwrjxL0q6HbpBqgWQppt9R1F6TLYja85h3jU/xL
+gvf16YzLVvLGMryIWhgZErB8C/h5adVWBzdwhjG17qMizwAJ2mqUZdkt+BQDzgCK
+pnshBrBmnyB5zGswtyvlHXO3A91hhcGRjRMEDLc5S55gCoW7u+QujOLkVPEjMieO
+MzAiBNpgDMiOIYP+0c6CmhxtBOw9LZBcs/x7XDvopAKb+7C8ML5gEyUx002ap75W
+T/9xdrAZSx0r6b+aEVR19njQtGBjK3aUUERMdQf6U683xGQf7lwhvQnR408EY4xu
+aT6udzQ5DKIExARZE9qIq3H/NpUrG23mVMT3lb2Ek5/WLgkcH8dy+lfsoNu/GLZj
+x08BL6YtAzqkIFRggGWlEY0MInDpeRDxRBogfC8ehFeE/8JEPjTlZZHmuNcvzkPb
+ZHgKDUEJXQdelAe67U4fx+6u/vMSi/QTZPUbennGxrcPvhcKsN2uGnNhm/+Dd2VY
+iXgKF7dVWgvqivgSCIeo7sxyqPq26cyD0hsnXtxzpxe5+FzfbCjbZiAhzCV/fVek
+S1xLp/FJQpoH2VVRorhI
+=9kB0
 -----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
new file mode 100644
index 000000000000..bdaba252ba49
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.7.10-completions.patch
@@ -0,0 +1,85 @@
+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
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.7.10-handle-read-errors.patch
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
new file mode 100644
index 000000000000..43602a84d27c
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.7.10-only-use-physical-for-chassis-id.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000000..666e8d5ac027
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.7.10-zsh-completion-dir.patch
@@ -0,0 +1,11 @@
+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/lldpd-0.7.10.ebuild b/net-misc/lldpd/lldpd-0.7.10.ebuild
new file mode 100644
index 000000000000..213443379b28
--- /dev/null
+++ b/net-misc/lldpd/lldpd-0.7.10.ebuild
@@ -0,0 +1,106 @@
+# 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/metadata.xml b/net-misc/lldpd/metadata.xml
index b6d7fc9d49e2..6953550edc2a 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/metadata.xml
@@ -25,7 +25,9 @@ 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='json'>Enable JSON output via Jansson</flag>
+		<flag name='json-c'>Enable JSON output via json-c</flag>
 		<flag name='lldpmed'>Enable LLDP-MED extension</flag>
 		<flag name='seccomp'>Enable use of libseccomp for system call filtering</flag>
 		<flag name='sonmp'>Enable SynOptics Network Management</flag>