net-proxy/squirm: Fix build with GCC-5

Adding squid to DEPEND because squid user is expected at install

Gentoo-bug: 554800

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2887

diff --git a/net-proxy/squirm/files/squirm-1.26-gcc5.patch b/net-proxy/squirm/files/squirm-1.26-gcc5.patch
new file mode 100644 (file)
index 0000000..7106371
--- /dev/null
+++ b/net-proxy/squirm/files/squirm-1.26-gcc5.patch
@@ -0,0 +1,9 @@
+--- a/util.h
++++ b/util.h
+@@ -24,5 +24,5 @@
+   information.
+ */
+ 
+-inline void lower_case(char *str);
++extern inline void lower_case(char *str);
+ char *safe_strdup(const char *str);

diff --git a/net-proxy/squirm/squirm-1.26-r1.ebuild b/net-proxy/squirm/squirm-1.26-r1.ebuild
index e098e3060f5ea15f591c10a22c6310a6ecc46b4c..7892f71430f945dfad6c1b7f92a8b15884fe0f88 100644 (file)
--- a/net-proxy/squirm/squirm-1.26-r1.ebuild
+++ b/net-proxy/squirm/squirm-1.26-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A redirector for Squid"
 HOMEPAGE="http://squirm.foote.com.au"
@@ -16,17 +16,19 @@ KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND="net-proxy/squid"
+DEPEND="${RDEPEND}"
 
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=(
+       "${FILESDIR}"/${P}-gentoo.patch
+       "${FILESDIR}"/${P}-gcc5.patch
+)
 
 src_compile() {
        emake CC="$(tc-getCC)" LDOPTS="${LDFLAGS}"
 }
 
 src_install() {
-       emake PREFIX="${ED}/opt/squirm" install
+       emake PREFIX="${ED%/}/opt/squirm" install
 }
 
 pkg_postinst() {