Revision bump, don't install extra bash-completion file (bug #526308). Remove old.

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

4 files changed, 11 insertions, 102 deletions

diff --git a/net-misc/lldpd/ChangeLog b/net-misc/lldpd/ChangeLog
index 3afa1b58d4fe..fa960973d162 100644
--- a/net-misc/lldpd/ChangeLog
+++ b/net-misc/lldpd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.23 2014/10/14 17:16:53 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.24 2014/10/29 00:20:07 chutzpah Exp $
+
+*lldpd-0.7.11-r3 (29 Oct 2014)
+
+  29 Oct 2014; Patrick McLean <chutzpah@gentoo.org> -lldpd-0.7.11-r1.ebuild,
+  -lldpd-0.7.11-r2.ebuild, +lldpd-0.7.11-r3.ebuild,
+  files/lldpd-0.7.11-bash-completion-dir.patch:
+  Revision bump, don't install extra bash-completion file (bug #526308). Remove
+  old.
 
 *lldpd-0.7.11-r2 (14 Oct 2014)
 
diff --git a/net-misc/lldpd/files/lldpd-0.7.11-bash-completion-dir.patch b/net-misc/lldpd/files/lldpd-0.7.11-bash-completion-dir.patch
index f77ef0923afc..9e2735d737a2 100644
--- a/net-misc/lldpd/files/lldpd-0.7.11-bash-completion-dir.patch
+++ b/net-misc/lldpd/files/lldpd-0.7.11-bash-completion-dir.patch
@@ -5,5 +5,5 @@ index 454bdeb..f1580a0 100644
 @@ -44,2 +44,2 @@ endif
 -bashcompletiondir = $(sysconfdir)/bash_completion.d
 -dist_bashcompletion_DATA = lldpcli.bash-completion
-+bashcompletiondir = $(datadir)/bash_completion
++bashcompletiondir = $(datadir)/bash-completion/completions
 +dist_bashcompletion_DATA = lldpcli
diff --git a/net-misc/lldpd/lldpd-0.7.11-r1.ebuild b/net-misc/lldpd/lldpd-0.7.11-r1.ebuild
deleted file mode 100644
index 5f33574a48d8..000000000000
--- a/net-misc/lldpd/lldpd-0.7.11-r1.ebuild
+++ /dev/null
@@ -1,99 +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.11-r1.ebuild,v 1.1 2014/10/13 18:06:06 chutzpah Exp $
-
-EAPI=5
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-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}-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
-	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 \
-		--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-4 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/lldpcli.bash-completion lldpcli
-
-	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-r2.ebuild b/net-misc/lldpd/lldpd-0.7.11-r3.ebuild
index 917dceea7bad..6efed2ced58c 100644
--- a/net-misc/lldpd/lldpd-0.7.11-r2.ebuild
+++ b/net-misc/lldpd/lldpd-0.7.11-r3.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-r2.ebuild,v 1.1 2014/10/14 17:16:53 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.11-r3.ebuild,v 1.1 2014/10/29 00:20:07 chutzpah Exp $
 
 EAPI=5