Revision bump, make sure the bash-completion script installs to the right place.

4 files changed, 119 insertions, 21 deletions

diff --git a/net-misc/lldpd/ChangeLog b/net-misc/lldpd/ChangeLog
index 5ac0b6bf0e60..3afa1b58d4fe 100644
--- a/net-misc/lldpd/ChangeLog
+++ b/net-misc/lldpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2014/10/13 18:06:06 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/ChangeLog,v 1.23 2014/10/14 17:16:53 chutzpah Exp $
+
+*lldpd-0.7.11-r2 (14 Oct 2014)
+
+  14 Oct 2014; Patrick McLean <chutzpah@gentoo.org> +lldpd-0.7.11-r2.ebuild,
+  +files/lldpd-0.7.11-bash-completion-dir.patch:
+  Revision bump, make sure the bash-completion script installs to the right
+  place.
 
 *lldpd-0.7.11-r1 (13 Oct 2014)
 
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 9d1d62216683..86c10c38a265 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX lldpd-0.7.11-bash-completion-dir.patch 362 SHA256 ab9f0d777e939d1de60bcab67ac805011fcabc9184afe60711a7526a5db0f942 SHA512 fb3cb89dc4586f4690ba0425a2a330d48646e3ae84349d80c983b46c09e84973fd1bcb688a403af881b1e7b76a15fc6664780028676a533e4a844906f7ea6696 WHIRLPOOL d4869bae1346f5d4e0bff6ef7d135abfa688452a7725f6b5512c22a6d5e2b97ca3a4b9353eaeca4b78c3336e5521605a7c05ff047e7a7cc8849ccaee93d56c24
 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
@@ -11,23 +9,7 @@ AUX lldpd.service 205 SHA256 a8434a8092ae95de991c4af83a96bbeacb0daae816cde127a3f
 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 3725a25eeb353b47637b6c27277f122eb53da070dba34cabb85dabd168c832d1 SHA512 152dcf993291365fc0b3ecc5e8bc445940e96c4927404e121efddab7f56d1285ea6f027bc92c2179f97f60aeecd6892d9786273e70e71ba3f35870ff927e5cb2 WHIRLPOOL e74d19d8acfeae8b0f41aabfcfd5e86af1282e3d591bdfa8a81b81a677022a13911120f27877ba87bac2f733052ae8592587d3fe3cccf7b6b859508bb32f5da9
 EBUILD lldpd-0.7.9-r3.ebuild 2132 SHA256 6409b59690e240bca19ca76d0450b174ec07ed037f972f3dbbfed0a137869064 SHA512 3cb144c6c164fea560525655c1af6d7ff4eccbfa76d81294e6c13704e451f6c35c1f9b54439dd8f18962734db11930e2b771e82e6600f03b5deb7795bad8a032 WHIRLPOOL 74536f94e158f2d5bb68e0e8d2e4b7cbd51654d9c469ca6a719beec3aa69da95c9f56167491ba6c73854974b940a1103ea0765fcd35e52a5ca35282e99f9e5d3
 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
-
-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.11-bash-completion-dir.patch b/net-misc/lldpd/files/lldpd-0.7.11-bash-completion-dir.patch
new file mode 100644
index 000000000000..f77ef0923afc
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.7.11-bash-completion-dir.patch
@@ -0,0 +1,9 @@
+diff --git a/src/client/Makefile.am b/src/client/Makefile.am
+index 454bdeb..f1580a0 100644
+--- a/src/client/Makefile.am
++++ b/src/client/Makefile.am
+@@ -44,2 +44,2 @@ endif
+-bashcompletiondir = $(sysconfdir)/bash_completion.d
+-dist_bashcompletion_DATA = lldpcli.bash-completion
++bashcompletiondir = $(datadir)/bash_completion
++dist_bashcompletion_DATA = lldpcli
diff --git a/net-misc/lldpd/lldpd-0.7.11-r2.ebuild b/net-misc/lldpd/lldpd-0.7.11-r2.ebuild
new file mode 100644
index 000000000000..917dceea7bad
--- /dev/null
+++ b/net-misc/lldpd/lldpd-0.7.11-r2.ebuild
@@ -0,0 +1,100 @@
+# 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 $
+
+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
+	"${FILESDIR}"/${P}-bash-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
+}