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

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

5 files changed, 34 insertions, 106 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/Manifest b/net-misc/lldpd/Manifest
index 514f0d42c4a8..4b1aa0ad1d57 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,4 +1,7 @@
-AUX lldpd-0.7.11-bash-completion-dir.patch 362 SHA256 ab9f0d777e939d1de60bcab67ac805011fcabc9184afe60711a7526a5db0f942 SHA512 fb3cb89dc4586f4690ba0425a2a330d48646e3ae84349d80c983b46c09e84973fd1bcb688a403af881b1e7b76a15fc6664780028676a533e4a844906f7ea6696 WHIRLPOOL d4869bae1346f5d4e0bff6ef7d135abfa688452a7725f6b5512c22a6d5e2b97ca3a4b9353eaeca4b78c3336e5521605a7c05ff047e7a7cc8849ccaee93d56c24
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX lldpd-0.7.11-bash-completion-dir.patch 374 SHA256 5e502278a5f304c7324283bcc2f5103892b935873fa5e46cd8be1e799175064f SHA512 31267d07e0bfa126181105bcc5092d061adc489057fadbc2afa817bf232d31c92c0e65c39cfe8b21e558d68d02029645dbc63cf01d99cff32a415640b4530d38 WHIRLPOOL 991a53bb007ed3a926ac57b43db7c8068b56bf6f61800177fd604f21dea70a43ce1aa91afb3fa7617b56859507cbe31c44558f356bff2e84f458a6a6496c819c
 AUX lldpd-0.7.11-zsh-completion-dir.patch 318 SHA256 a6b1cab53649d58d3332ae847bb0827c07f8c550e57812802ae88e9a009b6083 SHA512 cd4c069f9d637d6c9f0a687a7a415a6382bf5217390a94a269de19f5a35c1edd47d5c3455bc63d75aa7bc74a72d7f2c9de9210c0795a95bd0c78a10c1709fcb1 WHIRLPOOL 058512d0caf9ee539c91fbf2722cc1cb17322fceed62fa498c63773e10be2e461cf510650b0e680fe781954b05031ede70acd4912a270f853d2db61a03950538
 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
@@ -8,8 +11,24 @@ AUX lldpd-initd-4 467 SHA256 8094ec4b1c33c9d61562d0e2a3ed7e867a0facf5186c97df2f3
 AUX lldpd.service 205 SHA256 a8434a8092ae95de991c4af83a96bbeacb0daae816cde127a3fbde6715605ef9 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054 WHIRLPOOL 20ffed164e88e7a84428df12bfd3a1475d41d121e0b1a129995327521f0ba908e417484d1acffb2819a0a55724181ea72264fdc31fb8f915dae1e59eb615b99a
 DIST lldpd-0.7.11.tar.gz 1509215 SHA256 5257169e0de6037e81efb1bcb26f6dd5755e3efa0a025144d6763bdfaf982e6b SHA512 7f5454ef4255a4fae0e323703d607bd93254b8a511984e434539d0305de1298f8bcf481beb2f121876bedc9890e6f1338cc30f5b08d7b5cf261cf87d5bb69bff WHIRLPOOL 710826936318099a562c7503653ce002c60256055e5f34d7328e7bc5397805c5790670efcc746a11f5abb5a2ff1b6590c888a3ccf02048f260f83a6ea855f28a
 DIST lldpd-0.7.9.tar.gz 1496740 SHA256 7ac9abb7de51203cd3a88f8f032baef272474523bfb9c3fcc5c585e5c0c8dac1 SHA512 f8808dc6f0c57c48b62221b25c71e6b92f84500d850f8db75e53ba36a79e6937dcb49c9403fcd0363aa99af84bd3d6e1725f38890173d58b2866da0aaa5f2aa6 WHIRLPOOL ea1a7d8d1bc379b7a8751e2ccd50efc1bd9cd79c3285ecae803184e9f8009b6d871a9dba2912351d9a387bce018d6d7bd1544f39346b91c3d657b7a94f0f3e4a
-EBUILD lldpd-0.7.11-r1.ebuild 2409 SHA256 ea18b0e92d950469107ef8e98c76b896792cd473de0a341ccd1c335290082006 SHA512 05721872abfd2912cd34e41dca623722f20c186724961ae8699340593d7a28fb7cf63f529b86c2fc48814631a49892a041c0a0eaa016c21bd790edc45fa1753e WHIRLPOOL d6cf447bf453e1f1f6820451f89b82d5f20d89daa676b24e719fa0cffd951004083a8ccb38e6bb316d8970f018f5fb5539e0e088220a3581eaccb8f31bfa817d
-EBUILD lldpd-0.7.11-r2.ebuild 2455 SHA256 b90bc7eabfaa5bbe154585a574f727bb80eae602822cfd67afadc812b76dd8c4 SHA512 02b3b77eb9ae9c8988ac2b6e50ac51f1d5517b44cc57466be84ace09b38adff1fee6cb345b38eef93d29cf228db1a6681bef1f7b936ba1c270dfde37bde4675b WHIRLPOOL 8888d3750d753bb3f22863a6738643f76c40bae8983e9a244b8f95954dfc95ebd94bcf056afb527e2e2f87ca7e5d177cdaaaf38e8027a953a44aa043c033dde1
+EBUILD lldpd-0.7.11-r3.ebuild 2455 SHA256 7c2b43e3bceb97ea659fc52bbd0ff2a165b60c4702357b7740e1a37bbbc30958 SHA512 9360b9d663723d7457ccda3d3af7ef8380855a0dec4c2ce802b7cfbb6205e229f5bbe2d64d35941597a9b2bf431b7f92ff0934a5acae70678296ffdcb0073314 WHIRLPOOL 8044034e2455e6781b47d9d8ea4fdc2392ce7411102e133b8e40e19a3acb8b5711151316f2f3f489455094b1861e5547c712dd58b12483244274bdcc84865768
 EBUILD lldpd-0.7.9-r3.ebuild 2132 SHA256 6409b59690e240bca19ca76d0450b174ec07ed037f972f3dbbfed0a137869064 SHA512 3cb144c6c164fea560525655c1af6d7ff4eccbfa76d81294e6c13704e451f6c35c1f9b54439dd8f18962734db11930e2b771e82e6600f03b5deb7795bad8a032 WHIRLPOOL 74536f94e158f2d5bb68e0e8d2e4b7cbd51654d9c469ca6a719beec3aa69da95c9f56167491ba6c73854974b940a1103ea0765fcd35e52a5ca35282e99f9e5d3
-MISC ChangeLog 5195 SHA256 2b9cf8a90daa92812b75b84080a8eb6594e1a5b2380c05bb86e7c24865b815a2 SHA512 c23d6f2a4b58302dce314f78f7a1f2451d931ec99bb37a76a6cf56aa86e6ad74c1f2baa8753d2d1eab5b981e12d0758b45c202169098fe2ee4856c85be6d1629 WHIRLPOOL 7694c9c9ac33c38707ce82bc4faa53c51463b7133afaea7c527491070f464200386d4e82d4da2cf75b8ea373ccf899ea59a9f67fd86e608ac8a1578819f5f40f
+MISC ChangeLog 5492 SHA256 be43487c67c4f2f0c6ea74afbab5a32d1dde8ceb1b8856d10151316f14b2cc5a SHA512 5ac4e677907d17546a9312de0f3d0d1019ec1aae96f8435b6ab91fda0efc0033471d41396e92137ea8a65035331ea8698f6c8ee0a535afd929dd66af98c93d05 WHIRLPOOL 5a757e83f49a6b37880e3090f62e7647b49109306d12df77b9a7bbb02ee941dcaa6563c234ab56e6430a1b55bf1904112cac020c6242d53123a9f88c77a3b81f
 MISC metadata.xml 2838 SHA256 9f121c4d95fe02236d939cdd7e3e13eb02cdecda8a401e637994c685f25d6688 SHA512 d5548a36c7cac67752035b06f1952875d8f2844f2b3e7cb3fed33a2f58ca65fe0ae449d4561a7415ccf6ed4d513cce5f109d82cc29f5d158f8f23f7830292861 WHIRLPOOL 3547d0d61e49f498c1df52402221efe9a1c4a9fdf440148242c8c71ea36261c74f049d39ea534f2d29af98e0d265db794abd33b7d5556133dd28b7161e80cd74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUUDK4AAoJEHy/RO9cNQiD8TMP/RlXACraItXogiJq5Eb8Jxa9
+N/B3TcPXTBpJGNPPZIrN0DsJlva2fFfqEuszikJshPQ8UMD2tYRhST+aK9cyMOrd
+teTUqAosoQckjQRA83nU7NL17ebqTVcW/tnEH7XcFIMP0xIDJSltlJ6aonsiSMfP
+nMxwnyxL8oYV09R3Amq/uS1TbG/crEzkMNJlP1ZcQWII9lWcJux5fgZ5jQRyxjPG
+S8fBSW1cCN6ZiXHW4I2T8GHO2ARyQVyENU5jOx8w7Q3zyf2/Y2jsmxBMNQgneRIs
+nxcQg/Z+spu+FIK28gp0Ynu9c6fF9+YbdXe7U1VC3cfJQfnETv6/iSjkdEUA89pH
+4u2Z0JRty1qYudEpFH1ZGABmYheCodImj5kceR52gD5RHzjxWRV3lHpnqxWPxLla
+mlsFe17cUbz09ddY7Ay1ead1ZJYh28cL48ATULJbYa7WMBv0O5XRWSCgcIbhIF2g
+W6rHus/vy7GTPhl00eF4ZxPYSi/41lKSL1HceN6F+tRCkOTQD7Yp+H2tODiTNJG6
+I7WYmBtLhVolEQttnZoeifffzXG7yv1iKqjLT7x6ur7YngHEO/PYzJVURdyquWoJ
+Ke7121uwrcAnjJ3bbN15046JtasFrlYv8YeobLxTv+Hwp6eCWp/DJvkhO5CN4Ba/
+qlW91fRX9OhPWmpW+0vC
+=9dv3
+-----END PGP SIGNATURE-----
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