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

[Patrick McLean]

commit:     bf4a921867c41ac7e87b701ef95394cae6c4a605
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Aug 23 17:45:14 2019 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 17:46:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf4a9218

net-misc/lldpd: Remove old

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 net-misc/lldpd/Manifest                            |   2 -
 .../files/lldpd-0.7.11-zsh-completion-dir.patch    |   7 --
 net-misc/lldpd/lldpd-0.9.3-r1.ebuild               | 105 ---------------------
 net-misc/lldpd/lldpd-1.0.1-r1.ebuild               | 104 --------------------
 net-misc/lldpd/lldpd-1.0.1.ebuild                  | 103 --------------------
 net-misc/lldpd/metadata.xml                        |   1 -
 6 files changed, 322 deletions(-)

diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 0dca7523c58..d8c2fcca167 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,4 +1,2 @@
-DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283
-DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
 DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
 DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9

diff --git a/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch b/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch
deleted file mode 100644
index ff20d9aabc7..00000000000
--- a/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/src/client/Makefile.am b/src/client/Makefile.am
-index 454bdeb..fd391fd 100644
---- a/src/client/Makefile.am
-+++ b/src/client/Makefile.am
-@@ -46 +46 @@ dist_bashcompletion_DATA = lldpcli.bash-completion
--zshcompletiondir = $(datadir)/zsh/vendor-completions
-+zshcompletiondir = $(datadir)/zsh/site-functions

diff --git a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild b/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
deleted file mode 100644
index 4f8d9c61c91..00000000000
--- a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-	sanitizers seccomp sonmp snmp static-libs readline xml zsh-completion"
-
-RDEPEND="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5
-	sys-libs/readline:0=
-	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"
-	"${FILESDIR}/${PN}-0.9-seccomp-missing-syscalls.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	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_enable sanitizers) \
-		$(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 && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}

diff --git a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild b/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
deleted file mode 100644
index 4f6e234cb95..00000000000
--- a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 +lldpmed old-kernel sanitizers
-	seccomp sonmp snmp static-libs test readline xml zsh-completion"
-
-RDEPEND="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5:=
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	seccomp? ( sys-libs/libseccomp )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)
-	test? ( dev-libs/check )"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
-	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
-	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	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_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(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 && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}

diff --git a/net-misc/lldpd/lldpd-1.0.1.ebuild b/net-misc/lldpd/lldpd-1.0.1.ebuild
deleted file mode 100644
index 31d70bcb6cd..00000000000
--- a/net-misc/lldpd/lldpd-1.0.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 +lldpmed old-kernel sanitizers
-	seccomp sonmp snmp static-libs test readline xml zsh-completion"
-
-RDEPEND="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5:=
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	seccomp? ( sys-libs/libseccomp )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)
-	test? ( dev-libs/check )"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.5-seccomp-add-socket-ops.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	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_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(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 && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	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 83adab8a47e..1b100cd39ec 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/metadata.xml
@@ -25,7 +25,6 @@ lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Pro
 		<flag name="dot3">Enable Dot3 extension (PHY stuff)</flag>
 		<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="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>