net-libs/libpcap: Update live ebuild

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch b/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch
index 9bcbfe92ee0adb2856e75ed231c83e880781b50e..5ac34fd46485f1a3090271d5fbb20f506d6e9cb0 100644 (file)
--- a/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch
+++ b/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch
@@ -1,13 +1,12 @@
 Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
-Check for bluetooth/mgmt.h before use
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1271,7 +1267,7 @@
+@@ -1860,7 +1860,7 @@
        if test "$enable_universal" != "no"; then
                case "$host_os" in
  
--              darwin[0-7].*)
+-              darwin[[0-7]].*)
 +              darwin**)
                        #
                        # Pre-Tiger.  Build only for 32-bit PowerPC; no

diff --git a/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch
new file mode 100644 (file)
index 0000000..358cb12
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch
@@ -0,0 +1,35 @@
+Prefix' Solaris uses GNU ld
+
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -415,7 +415,7 @@
+           aix*)
+                   ;;
+ 
+-          freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*)
++          freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*|solaris*)
+                   #
+                   # Platforms where the linker is the GNU linker
+                   # or accepts command-line arguments like
+@@ -429,10 +429,10 @@
+                   PIC_OPT=-fpic
+                   case "$host_cpu" in
+ 
+-                  sparc64*)
++                  sparc64*|sparcv9*)
+                       case "$host_os" in
+ 
+-                      freebsd*|openbsd*)
++                      freebsd*|solaris*|openbsd*)
+                           PIC_OPT=-fPIC
+                           ;;
+                       esac
+@@ -497,7 +497,7 @@
+                   V_SHLIB_OPT="-G -bnoentry -bexpall"
+                   ;;
+ 
+-          freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
++          freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
+                   #
+                   # "cc" is GCC.
+                   #

diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index ad1d9345153022a4ac84531d26fe233cef03d88f..45652829cdd0b136820aed10f3ab467f75b4f4cb 100644 (file)
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,8 +30,8 @@ DEPEND="
 "
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
        "${FILESDIR}"/${PN}-9999-prefix-darwin.patch
+       "${FILESDIR}"/${PN}-9999-prefix-solaris.patch
 )
 
 src_prepare() {