From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1128354-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id AD687138335
for <garchives@archives.gentoo.org>; Sat, 7 Dec 2019 13:05:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 25942E0869;
Sat, 7 Dec 2019 13:05:21 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 37C7FE0864
for <gentoo-commits@lists.gentoo.org>; Sat, 7 Dec 2019 13:05:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0800534D86B
for <gentoo-commits@lists.gentoo.org>; Sat, 7 Dec 2019 13:05:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 22C9F8D2
for <gentoo-commits@lists.gentoo.org>; Sat, 7 Dec 2019 13:05:16 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1575723910.23ff5f3216bf61aa543bbcf49b2bc509cbdfe9aa.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/net-snmp/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild
X-VCS-Directories: net-analyzer/net-snmp/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 23ff5f3216bf61aa543bbcf49b2bc509cbdfe9aa
X-VCS-Branch: master
Date: Sat, 7 Dec 2019 13:05:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6f703729-0c09-4040-927e-d3610fc9f89a
X-Archives-Hash: fa5d9912db539b3a65e7165bf4c9fb20
commit: 23ff5f3216bf61aa543bbcf49b2bc509cbdfe9aa
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 7 13:02:22 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 13:05:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ff5f32
net-analyzer/net-snmp: Revise patches
- Add patch for bug net-snmp-config LDFLAGS/LIBS confusion
- Use PATCHES instead of eapply calls
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Closes: https://bugs.gentoo.org/693970
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild | 25 ++++++++++++------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild
index 9947bc40119..0704a753212 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild
@@ -28,6 +28,10 @@ IUSE="
X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ rpm? ( bzip2 zlib )
+"
COMMON_DEPEND="
bzip2? ( app-arch/bzip2 )
@@ -65,14 +69,15 @@ RDEPEND="
)
selinux? ( sec-policy/selinux-snmp )
"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- rpm? ( bzip2 zlib )
-"
S=${WORKDIR}/${P/_pre/.pre}
-
RESTRICT=test
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+ "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+ "${FILESDIR}"/${PN}-5.8-pcap.patch
+ "${FILESDIR}"/${PN}-5.8-tinfo.patch
+ "${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
@@ -82,17 +87,11 @@ src_prepare() {
# snmpconf generates config files with proper selinux context
use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
- eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
- eapply "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
- eapply "${FILESDIR}"/${PN}-5.8-pcap.patch
- eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch
- eapply "${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
-
mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
eapply "${WORKDIR}"/patches/*.patch
- eapply_user
+ default
eautoconf
}