[gentoo-commits] repo/gentoo:master commit in: net-misc/lldpd/files/, net-misc/lldpd/

[Patrick McLean]

commit:     a86853ded7192ddc43ad9bc4380aa2c160c6a332
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 22:48:52 2016 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 22:48:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86853de

net-misc/lldpd: Remove old

Package-Manager: portage-2.3.2

 net-misc/lldpd/Manifest                            |   3 -
 .../files/lldpd-0.7.11-bash-completion-dir.patch   |   9 --
 net-misc/lldpd/files/lldpd-initd-4                 |  20 ----
 net-misc/lldpd/lldpd-0.7.11-r3.ebuild              | 100 --------------------
 net-misc/lldpd/lldpd-0.7.13.ebuild                 | 101 ---------------------
 net-misc/lldpd/lldpd-0.9.1.ebuild                  | 101 ---------------------
 net-misc/lldpd/metadata.xml                        |   1 -
 7 files changed, 335 deletions(-)

diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 003cb86..80c7267 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,6 +1,3 @@
-DIST lldpd-0.7.11.tar.gz 1509215 SHA256 5257169e0de6037e81efb1bcb26f6dd5755e3efa0a025144d6763bdfaf982e6b SHA512 7f5454ef4255a4fae0e323703d607bd93254b8a511984e434539d0305de1298f8bcf481beb2f121876bedc9890e6f1338cc30f5b08d7b5cf261cf87d5bb69bff WHIRLPOOL 710826936318099a562c7503653ce002c60256055e5f34d7328e7bc5397805c5790670efcc746a11f5abb5a2ff1b6590c888a3ccf02048f260f83a6ea855f28a
-DIST lldpd-0.7.13.tar.gz 1523864 SHA256 bbba3ef922f6b6cc6d2c0f008066dc882750557661c54dd1b97ae7936678d92d SHA512 3fa476a3e06e2d5c15a29a3b46bfd2e147bdd55884fef4748f1197454cde45f82d33e4cc66eb70e559a1e3ad150577781d308b2f39c08f86d75412368099d4a5 WHIRLPOOL c641e0f9f21ce9510a7e30f14ccc0ab34c54251ccbec5317a30504f5b4bca4b64e88391d7a252340490a919bb1d13764627404d1f2c2b9d19057f5b4ca561a97
-DIST lldpd-0.9.1.tar.gz 1600504 SHA256 16ad6d513a6a0c6c201ce4941693c0e9d6fce83bbfa3733620354d1ac9a60908 SHA512 3a6ea3051ceac689a65045c06dac4f788071291f6ab826286de54175cad48143daadb13f44a2d7ff8a97269ec7c1bf9dc337d929b8cbf256fe135d33f965b3ad WHIRLPOOL b71310da3e7626893fb00b8fc5553c80bb4dbabdabe9cabe028cb72767cfe2f0a46a6c3d09c15fc7cb1b7379b73a8eb9a9e6683ace25492f76a032834db13ce0
 DIST lldpd-0.9.3.tar.gz 1601102 SHA256 cfa8a3245dd71efc1f5de064a72576a7c1afaaf0ccb5833238398b6dc612b127 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283 WHIRLPOOL c7be527cf48bd5623ad9b7b3ae684a5e223114d7ff57a71a33623e3e445f6bbb612a6db5353844644c6340f039bdf7caf435b7ae19cf231ae54acf1dad72b62a
 DIST lldpd-0.9.4.tar.gz 1604103 SHA256 eb1f5beff2ff5c13c5e0342b5b9da815ed4a63866262445e1168a79ee65c9079 SHA512 c9313d94044da1bd760f63a60c8215f69742d5e91ef3d43427571870e04254e9c251e40f69861f9bc27828f6905919582d965b6c796c4febbf4b1b2f87e91b9c WHIRLPOOL 8306400224a4a9726f08d79004fe1f82675ceddbafb53f4e40fc538e2eed0d63028a9e0fd5ca00918ce008f131b2a8cf3f50a396eafd820dbc8e05ac43d0422d
 DIST lldpd-0.9.5.tar.gz 1614052 SHA256 e9585c52f14808f03f6b6c3a9163c95b542a47b18abe002992b155d143a1a247 SHA512 ca1a0d07bab50e3d697bfe4e6d00a150b17255de5a4a4a9ec8b7d45b2b03ce70a2bfb3452562ffdc3e7542a854cb30e6412d5a3eb919ad9e8b1064fde1b344df WHIRLPOOL 6a8e31a180488f0f2c6bf9272ecdaa7acf4e7b325ef5aad63d52685a239dd60295ddce33941af778891c3112721ee5e45cc5bcb9b98caee14ffee04ea847eef6

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
deleted file mode 100644
index 9e2735d..00000000
--- a/net-misc/lldpd/files/lldpd-0.7.11-bash-completion-dir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-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/completions
-+dist_bashcompletion_DATA = lldpcli

diff --git a/net-misc/lldpd/files/lldpd-initd-4 b/net-misc/lldpd/files/lldpd-initd-4
deleted file mode 100644
index 2cd3fe1..00000000
--- a/net-misc/lldpd/files/lldpd-initd-4
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.11-r3.ebuild b/net-misc/lldpd/lldpd-0.7.11-r3.ebuild
deleted file mode 100644
index e6ccb75..00000000
--- a/net-misc/lldpd/lldpd-0.7.11-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://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
-}

diff --git a/net-misc/lldpd/lldpd-0.7.13.ebuild b/net-misc/lldpd/lldpd-0.7.13.ebuild
deleted file mode 100644
index 0ffa4dd..00000000
--- a/net-misc/lldpd/lldpd-0.7.13.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://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}"/${PN}-0.7.11-zsh-completion-dir.patch
-	"${FILESDIR}"/${PN}-0.7.11-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
-	elibtoolize
-}
-
-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.9.1.ebuild b/net-misc/lldpd/lldpd-0.9.1.ebuild
deleted file mode 100644
index 059d48b..00000000
--- a/net-misc/lldpd/lldpd-0.9.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://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 +lldpmed old-kernel
-	seccomp sonmp snmp static-libs readline xml zsh-completion"
-
-RDEPEND=">=dev-libs/libevent-2.0.5
-		dev-libs/libbsd
-		snmp? ( net-analyzer/net-snmp[extensible(+)] )
-		xml? ( dev-libs/libxml2 )
-		jansson? ( dev-libs/jansson )
-		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 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.11-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
-	elibtoolize
-}
-
-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 cdp) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_with jansson json) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(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-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dohtml -r doxygen/html/*
-
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}

diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml
index 4ca20a4..83adab8 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/metadata.xml
@@ -26,7 +26,6 @@ lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Pro
 		<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-c">Enable JSON output via json-c</flag>
 		<flag name="lldpmed">Enable LLDP-MED extension</flag>
 		<flag name="old-kernel">Enable compatibility with Linux kernel older than 2.6.39</flag>
 		<flag name="sanitizers">Enable code instrumentation with selected sanitizers</flag>