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

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)

14 files changed, 38 insertions, 549 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/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}
-}