From 6e544c64f4acc1df8f6e1ccb5789f35807ff45f3 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Wed, 12 May 2021 12:58:52 +0200
Subject: net-analyzer/sancp: Update LICENSE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QPL and QPL-1.0 are duplicates.

Bug: https://bugs.gentoo.org/789666
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 net-analyzer/sancp/sancp-1.6.1-r6.ebuild | 73 --------------------------------
 net-analyzer/sancp/sancp-1.6.1-r7.ebuild | 73 ++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 73 deletions(-)
 delete mode 100644 net-analyzer/sancp/sancp-1.6.1-r6.ebuild
 create mode 100644 net-analyzer/sancp/sancp-1.6.1-r7.ebuild

(limited to 'net-analyzer')

diff --git a/net-analyzer/sancp/sancp-1.6.1-r6.ebuild b/net-analyzer/sancp/sancp-1.6.1-r6.ebuild
deleted file mode 100644
index be00f2204c5c..000000000000
--- a/net-analyzer/sancp/sancp-1.6.1-r6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="collect network traffic statistics and store them in pcap format"
-HOMEPAGE="https://sourceforge.net/projects/sancp/"
-SRC_URI="
-	http://www.metre.net/files/${P}.tar.gz
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch
-"
-
-LICENSE="QPL GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sguil"
-
-RDEPEND="
-	acct-group/sancp
-	acct-user/sancp
-	net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-compiler.patch
-	"${FILESDIR}"/${PN}-1.6.1-gcc6.patch
-	"${FILESDIR}"/${PN}-1.6.1-extern.patch
-)
-
-src_prepare() {
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
-	# bug 138337
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
-	default
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake CFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sancp/
-	dodoc docs/CHANGES docs/fields.LIST docs/README docs/SETUP \
-		"${FILESDIR}"/sguil_sancp.conf etc/sancp/sancp.conf
-
-	insinto /etc/sancp
-	if use sguil ; then
-		newins "${FILESDIR}"/sguil_sancp.conf sancp.conf
-	else
-		doins etc/sancp/sancp.conf
-	fi
-
-	dobin sancp
-
-	newinitd "${FILESDIR}"/sancp.rc1 sancp
-	newconfd "${FILESDIR}"/sancp.confd sancp
-	if use sguil ; then
-		sed -i -e /^SANCP_OPTS/s:'sancp':"sguil":g \
-			-e s:'-d $LOGDIR/today':"-d /var/lib/sguil/$(hostname)/sancp": \
-			"${D}/etc/conf.d/sancp"
-	fi
-
-	fowners sancp:sancp /var/log/sancp
-	fperms 0770 /var/log/sancp
-}
diff --git a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
new file mode 100644
index 000000000000..e18588995cbb
--- /dev/null
+++ b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="collect network traffic statistics and store them in pcap format"
+HOMEPAGE="https://sourceforge.net/projects/sancp/"
+SRC_URI="
+	http://www.metre.net/files/${P}.tar.gz
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch
+"
+
+LICENSE="QPL-1.0 GPL-2"     # GPL-2 for init script
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sguil"
+
+RDEPEND="
+	acct-group/sancp
+	acct-user/sancp
+	net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-compiler.patch
+	"${FILESDIR}"/${PN}-1.6.1-gcc6.patch
+	"${FILESDIR}"/${PN}-1.6.1-extern.patch
+)
+
+src_prepare() {
+	eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
+	eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
+	# bug 138337
+	eapply "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
+	eapply "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
+	default
+}
+
+src_compile() {
+	tc-export CC CXX
+	emake CFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sancp/
+	dodoc docs/CHANGES docs/fields.LIST docs/README docs/SETUP \
+		"${FILESDIR}"/sguil_sancp.conf etc/sancp/sancp.conf
+
+	insinto /etc/sancp
+	if use sguil ; then
+		newins "${FILESDIR}"/sguil_sancp.conf sancp.conf
+	else
+		doins etc/sancp/sancp.conf
+	fi
+
+	dobin sancp
+
+	newinitd "${FILESDIR}"/sancp.rc1 sancp
+	newconfd "${FILESDIR}"/sancp.confd sancp
+	if use sguil ; then
+		sed -i -e /^SANCP_OPTS/s:'sancp':"sguil":g \
+			-e s:'-d $LOGDIR/today':"-d /var/lib/sguil/$(hostname)/sancp": \
+			"${D}/etc/conf.d/sancp"
+	fi
+
+	fowners sancp:sancp /var/log/sancp
+	fperms 0770 /var/log/sancp
+}
-- 
cgit v1.2.3-65-gdbad