From 24fc0c71beb9806f78f80461a66f0664d307a908 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Fri, 6 May 2016 08:05:20 +0200
Subject: net-proxy/havp: Fix patch and epatch call (bug #582044).

Package-Manager: portage-2.2.28
---
 .../files/havp-0.92a-pkg-config-libclamav.patch    | 66 ++++++++++++++++++++++
 .../files/havp-0.92a-r1-pkg-config-libclamav.patch | 66 ----------------------
 net-proxy/havp/havp-0.92a-r2.ebuild                |  4 +-
 3 files changed, 69 insertions(+), 67 deletions(-)
 create mode 100644 net-proxy/havp/files/havp-0.92a-pkg-config-libclamav.patch
 delete mode 100644 net-proxy/havp/files/havp-0.92a-r1-pkg-config-libclamav.patch

(limited to 'net-proxy/havp')

diff --git a/net-proxy/havp/files/havp-0.92a-pkg-config-libclamav.patch b/net-proxy/havp/files/havp-0.92a-pkg-config-libclamav.patch
new file mode 100644
index 000000000000..ea761f7e3476
--- /dev/null
+++ b/net-proxy/havp/files/havp-0.92a-pkg-config-libclamav.patch
@@ -0,0 +1,66 @@
+--- a/configure.in
++++ b/configure.in
+@@ -5,6 +5,7 @@
+ unset CDPATH
+ 
+ AC_PROG_CXX
++PKG_PROG_PKG_CONFIG
+ 
+ AC_PREFIX_DEFAULT(/usr/local)
+ 
+@@ -83,48 +84,15 @@
+ 	AC_DEFINE(SSLTUNNEL)
+ fi
+ 
+-AC_MSG_CHECKING(for ClamAV scanner library)
+-
+ if test "$enable_clamav" = "yes"
+ then
+-	clamprefix="`clamav-config --prefix 2>/dev/null`"
+-	clamversion="`clamav-config --version 2>/dev/null`"
+-
+-	if test "x$clamprefix" = "x"
+-	then
+-		AC_MSG_RESULT([clamav-config not found])
+-
+-		echo ""
+-		echo " Error finding ClamAV installation!"
+-		echo " Add ClamAV binaries path to PATH and run configure again."
+-		echo ""
+-		echo " To disable ClamAV library support, use --disable-clamav."
+-		echo ""
+-
+-		exit 1
+-	fi
+-
+-	for cl in `clamav-config --cflags 2>/dev/null`; do
+-		if test "x`echo $cl | perl -ne 'print if (/^-I/)' 2>/dev/null`" != "x"
+-		then
+-			CFLAGS="$CFLAGS $cl"
+-		fi
+-	done
+-
+-	for cl in `clamav-config --libs 2>/dev/null`; do
+-		if test "x`echo $cl | perl -ne 'print if (/(^-L|thread|c_r)/)' 2>/dev/null`" != "x"
+-		then
+-			LDFLAGS="$LDFLAGS $cl"
+-		fi
+-	done
+-	LDFLAGS="$LDFLAGS -lclamav"
+-
+-	SCANNEROBJECTS="clamlibscanner.o"
+-	AC_DEFINE(USECLAMLIB)
+-
+-	AC_MSG_RESULT([found $clamversion in $clamprefix])
+-else
+-	AC_MSG_RESULT([disabled :-(])
++	PKG_CHECK_MODULES(clamav, libclamav,
++		[CFLAGS="$clamav_CFLAGS $CFLAGS"
++		 LDFLAGS="$clamav_LIBS $LDFLAGS"
++
++		 SCANNEROBJECTS="clamlibscanner.o"
++		 AC_DEFINE(USECLAMLIB)
++		])
+ fi
+ 
+ AC_MSG_CHECKING(for Trend Micro scanner)
diff --git a/net-proxy/havp/files/havp-0.92a-r1-pkg-config-libclamav.patch b/net-proxy/havp/files/havp-0.92a-r1-pkg-config-libclamav.patch
deleted file mode 100644
index ea761f7e3476..000000000000
--- a/net-proxy/havp/files/havp-0.92a-r1-pkg-config-libclamav.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -5,6 +5,7 @@
- unset CDPATH
- 
- AC_PROG_CXX
-+PKG_PROG_PKG_CONFIG
- 
- AC_PREFIX_DEFAULT(/usr/local)
- 
-@@ -83,48 +84,15 @@
- 	AC_DEFINE(SSLTUNNEL)
- fi
- 
--AC_MSG_CHECKING(for ClamAV scanner library)
--
- if test "$enable_clamav" = "yes"
- then
--	clamprefix="`clamav-config --prefix 2>/dev/null`"
--	clamversion="`clamav-config --version 2>/dev/null`"
--
--	if test "x$clamprefix" = "x"
--	then
--		AC_MSG_RESULT([clamav-config not found])
--
--		echo ""
--		echo " Error finding ClamAV installation!"
--		echo " Add ClamAV binaries path to PATH and run configure again."
--		echo ""
--		echo " To disable ClamAV library support, use --disable-clamav."
--		echo ""
--
--		exit 1
--	fi
--
--	for cl in `clamav-config --cflags 2>/dev/null`; do
--		if test "x`echo $cl | perl -ne 'print if (/^-I/)' 2>/dev/null`" != "x"
--		then
--			CFLAGS="$CFLAGS $cl"
--		fi
--	done
--
--	for cl in `clamav-config --libs 2>/dev/null`; do
--		if test "x`echo $cl | perl -ne 'print if (/(^-L|thread|c_r)/)' 2>/dev/null`" != "x"
--		then
--			LDFLAGS="$LDFLAGS $cl"
--		fi
--	done
--	LDFLAGS="$LDFLAGS -lclamav"
--
--	SCANNEROBJECTS="clamlibscanner.o"
--	AC_DEFINE(USECLAMLIB)
--
--	AC_MSG_RESULT([found $clamversion in $clamprefix])
--else
--	AC_MSG_RESULT([disabled :-(])
-+	PKG_CHECK_MODULES(clamav, libclamav,
-+		[CFLAGS="$clamav_CFLAGS $CFLAGS"
-+		 LDFLAGS="$clamav_LIBS $LDFLAGS"
-+
-+		 SCANNEROBJECTS="clamlibscanner.o"
-+		 AC_DEFINE(USECLAMLIB)
-+		])
- fi
- 
- AC_MSG_CHECKING(for Trend Micro scanner)
diff --git a/net-proxy/havp/havp-0.92a-r2.ebuild b/net-proxy/havp/havp-0.92a-r2.ebuild
index 60fd0c143ede..65e9cc837bb4 100644
--- a/net-proxy/havp/havp-0.92a-r2.ebuild
+++ b/net-proxy/havp/havp-0.92a-r2.ebuild
@@ -26,9 +26,11 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-0.92a-run.patch \
-		"${FILESDIR}"/${PF}-pkg-config-libclamav.patch
+		"${FILESDIR}"/${P}-pkg-config-libclamav.patch
+
 	sed -i configure.in -e '/^CFLAGS=/d' || die
 	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
-- 
cgit v1.2.3-65-gdbad