[gentoo-commits] repo/gentoo:master commit in: net-analyzer/net-snmp/files/, net-analyzer/net-snmp/

[Jeroen Roovers]

commit:     83fb218650770c9488f4623c7c5bbfa7e8469744
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 05:47:52 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 05:51:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83fb2186

net-analyzer/net-snmp: Remove libdir from net-snmp-config/pkg-config

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Bug: https://bugs.gentoo.org/686416
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../net-snmp-5.8.1-net-snmp-config-libdir.patch    | 37 ++++++++++++++++++++++
 .../net-snmp/files/net-snmp-5.8.1-pkg-config.patch | 12 ++++---
 net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild   |  1 +
 net-analyzer/net-snmp/net-snmp-5.8.1_rc1.ebuild    |  1 +
 net-analyzer/net-snmp/net-snmp-99999999.ebuild     |  1 +
 5 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch
new file mode 100644
index 00000000000..73d420531bb
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch
@@ -0,0 +1,37 @@
+--- a/net-snmp-config.in
++++ b/net-snmp-config.in
+@@ -193,10 +193,10 @@
+     #################################################### client lib
+     --libs)
+       # use this one == --netsnmp-libs + --external-libs
+-      echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
++      echo $NSC_SNMPLIBS $NSC_LIBS
+       ;;
+     --netsnmp-libs)
+-      echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS
++      echo $NSC_BASE_SNMP_LIBS
+       ;;
+     --external-libs)
+       echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
+@@ -210,10 +210,10 @@
+       ;;
+     --agent-libs)
+       # use this one == --netsnmp-agent-libs + --external-libs
+-      echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
++      echo $NSC_AGENTLIBS $NSC_LIBS
+       ;;
+     --netsnmp-agent-libs)
+-      echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS
++      echo $NSC_BASE_AGENT_LIBS
+       ;;
+     --external-agent-libs)
+       echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
+@@ -660,7 +660,7 @@
+         echo "Ack.  Can't create $tmpfile."
+ 	exit 1
+       fi
+-      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags"
++      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $ldflags $NSC_LDFLAGS $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS"
+       echo "running: $cmd"
+       echo `$cmd`
+       result=$?

diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch
index fd53973c2be..acda136a22c 100644
--- a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch
@@ -1,16 +1,20 @@
 --- a/netsnmp-agent.pc.in
 +++ b/netsnmp-agent.pc.in
-@@ -9,4 +9,4 @@
+@@ -8,5 +8,5 @@
+ URL: http://www.net-snmp.org
  Version: @PACKAGE_VERSION@
  Cflags: -I${includedir}
- Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
+-Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
 -Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
++Libs: -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
 +Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
 --- a/netsnmp.pc.in
 +++ b/netsnmp.pc.in
-@@ -9,4 +9,4 @@
+@@ -8,5 +8,5 @@
+ URL: http://www.net-snmp.org
  Version: @PACKAGE_VERSION@
  Cflags: -I${includedir}
- Libs: -L${libdir} -lnetsnmp
+-Libs: -L${libdir} -lnetsnmp
 -Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@
++Libs: -lnetsnmp
 +Libs.private: @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@

diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild
index 1418de67f9f..01b3f5ccf53 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.8-pcap.patch
 	"${FILESDIR}"/${PN}-5.8-tinfo.patch
 	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
 )
 
 pkg_setup() {

diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_rc1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_rc1.ebuild
index 4c3850d0345..885006e7fa2 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_rc1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8.1_rc1.ebuild
@@ -78,6 +78,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
 	"${FILESDIR}"/${PN}-5.8-pcap.patch
 	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
 	"${FILESDIR}"/${PN}-99999999-tinfo.patch
 )
 

diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index f1bee66a6ca..bc7fc206a2d 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
 	"${FILESDIR}"/${PN}-5.8-pcap.patch
 	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
 	"${FILESDIR}"/${PN}-99999999-tinfo.patch
 )