Fix cross compile issues, thanks to Bertrand Jacquin <beber at meleeweb dot net> (#266441).

(Portage version: 2.1.6.7/cvs/Linux x86_64)

7 files changed, 68 insertions, 394 deletions

diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index 33355324896a..54266f36512d 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-proxy/squidguard
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.33 2009/03/18 14:58:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.34 2009/04/25 09:58:43 mrness Exp $
+
+*squidguard-1.4-r2 (25 Apr 2009)
+
+  25 Apr 2009; Alin Năstac <mrness@gentoo.org>
+  -files/squidguard-1.3-autoheader.patch,
+  -files/squidguard-1.3-gentoo.patch, -files/squidguard-1.3-nolog.patch,
+  +files/squidguard-1.4-cross-compile.patch, -squidguard-1.3-r4.ebuild,
+  -squidguard-1.4.ebuild, +squidguard-1.4-r2.ebuild:
+  Fix cross compile issues, thanks to Bertrand Jacquin <beber at meleeweb dot
+  net> (#266441).
 
   18 Mar 2009; Brent Baude <ranger@gentoo.org> squidguard-1.4-r1.ebuild:
   stable ppc, bug 258841
diff --git a/net-proxy/squidguard/files/squidguard-1.3-autoheader.patch b/net-proxy/squidguard/files/squidguard-1.3-autoheader.patch
deleted file mode 100644
index 852d1004b22c..000000000000
--- a/net-proxy/squidguard/files/squidguard-1.3-autoheader.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nru squidGuard-1.3.orig/configure.in squidGuard-1.3/configure.in
---- squidGuard-1.3.orig/configure.in	2008-06-20 23:20:34.000000000 +0200
-+++ squidGuard-1.3/configure.in	2008-06-20 23:28:06.000000000 +0200
-@@ -58,18 +58,18 @@
-                 sg_dbhome=$withval)
- 
- if test -n "$sg_config"; then
--	AC_DEFINE(ACCONFIG)
-+	AC_DEFINE(ACCONFIG, 1, [Defined if you supply --with-sg-config])
- changequote(, )dnl
- 	sg_cfgdir=`echo $sg_config|sed "s%/[^/][^/]*$%%"`
- changequote([, ])dnl
- fi
- 
- if test -n "$sg_logdir"; then
--	AC_DEFINE(ACLOGDIR)
-+	AC_DEFINE(ACLOGDIR, 1, [Defined if you supply --with-sg-logdir])
- fi
- 
- if test -n "$sg_dbhome"; then
--	AC_DEFINE(ACDBHOME)
-+	AC_DEFINE(ACDBHOME, 1, [Defined if you supply --with-sg-dbhome])
- fi
- 
- CFLAGS="$CFLAGS $db_inc"
-@@ -126,7 +126,7 @@
- 	])
- fi
- if test "$with_ldap" = "yes"; then
--	AC_DEFINE(HAVE_LIBLDAP)
-+	AC_DEFINE(HAVE_LIBLDAP, 1, [Define if LDAP support should be compiled])
- 	AC_RUN_IFELSE([
-        #include <ldap.h>
-        int main()
-@@ -220,7 +220,7 @@
- 	], dbg2_ok_version=yes, dbg2_ok_version=no, dbg2_ok_version=no)
- 
- if test $dbg2_ok_version = yes; then
--	AC_DEFINE(DB_VERSION_GT2)
-+	AC_DEFINE(DB_VERSION_GT2, 1, [Define if you have dbversion greater than 3.2])
- fi
- 
- AC_RUN_IFELSE([
-@@ -238,7 +238,7 @@
-         ], dbg3_ok_version=yes, dbg3_ok_version=no, dbg3_ok_version=no)
- 
- if test $dbg3_ok_version = yes; then
--        AC_DEFINE(DB_VERSION_GT3)
-+        AC_DEFINE(DB_VERSION_GT3, 1, [Define if you have dbversion greater than 4.0])
- fi
- 
- 
diff --git a/net-proxy/squidguard/files/squidguard-1.3-gentoo.patch b/net-proxy/squidguard/files/squidguard-1.3-gentoo.patch
deleted file mode 100644
index 954dae601ae3..000000000000
--- a/net-proxy/squidguard/files/squidguard-1.3-gentoo.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Nru squidGuard-1.3.orig/configure.in squidGuard-1.3/configure.in
---- squidGuard-1.3.orig/configure.in	2007-05-10 18:39:44.000000000 +0300
-+++ squidGuard-1.3/configure.in	2008-02-17 09:52:03.000000000 +0200
-@@ -85,7 +85,7 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(db.h regex.h unistd.h)
- 
--+AC_CHECK_HEADER(db.h,,[
-+AC_CHECK_HEADER(db.h,,[
- 	echo
- 	echo "** No db.h found"
- 	echo "   The Berkley DB library is required for squidGuard"
-@@ -110,13 +110,24 @@
- dnl
- 
- dnl Check ldap
--AC_CHECK_LIB(ldap,ldap_init,,[
--               echo
--               echo "LDAP library not found"
--               echo
--               exit 1
--       ])
--AC_RUN_IFELSE([
-+AC_ARG_WITH(ldap,
-+  AC_HELP_STRING([--with-ldap], [use ldap (default=yes)]))
-+if test "$with_ldap" = "no" -o "$with_ldap" = "false"
-+then
-+  with_ldap=no
-+else
-+  AC_CHECK_LIB( ldap, ldap_init,
-+	[
-+	with_ldap=yes
-+	LIBS="$LIBS -lldap"
-+	],[
-+	AC_MSG_WARN([Cannot find LDAP libraries. LDAP support disabled])
-+	with_ldap=no
-+	])
-+fi
-+if test "$with_ldap" = "yes"; then
-+	AC_DEFINE(HAVE_LIBLDAP)
-+	AC_RUN_IFELSE([
-        #include <ldap.h>
-        int main()
-        {
-@@ -130,6 +141,7 @@
-                echo
-                exit 1
-        ],)
-+fi
- 
- dnl Check threads... ok if it fails
- AC_CHECK_LIB(pthread,pthread_create,,[
-@@ -141,15 +153,7 @@
-        ])
- 
- dnl Check DB
--AC_CHECK_LIB(db,db_version,,[
--       echo
--       echo "** The Berkley DB library is required for squidGuard"
--       echo "   to compile. Get it from http://www.sleepycat.com"
--       echo "   use --with-db=DIR or --with-db-lib=DIR to specify"
--       echo "   its location. (default is $dbprefix/BerkeleyDB)"
--       echo
--       exit 1
--       ])
-+LIBS="$LIBS -ldb"
- AC_RUN_IFELSE([
- 	#include <db.h>
- 	int main() 
-diff -Nru squidGuard-1.3.orig/Makefile.in squidGuard-1.3/Makefile.in
---- squidGuard-1.3.orig/Makefile.in	2007-07-01 18:37:14.000000000 +0300
-+++ squidGuard-1.3/Makefile.in	2008-02-17 09:52:03.000000000 +0200
-@@ -43,7 +43,7 @@
- # Dependencies for installing
- #	
- 
--install:	install-build install-conf
-+install:	install-build
- 
- install-conf:
- 	@echo Installing configuration file  ;
-@@ -80,10 +80,10 @@
- 
- install-build:
- 	@echo Installing squidGuard 
--	@if [ ! -d $(bindir) ]; then \
--		$(MKINSTALLDIRS) $(bindir) ; \
-+	@if [ ! -d "$(INSTDIR)"/$(bindir) ]; then \
-+		$(MKINSTALLDIRS) "$(INSTDIR)"/$(bindir) ; \
- 	fi ; \
--	cp src/squidGuard $(bindir) || exit 1 ;  \
-+	cp src/squidGuard "$(INSTDIR)"/$(bindir) || exit 1 ;  \
- 	echo Done. ;
- 
- clean::
-diff -Nru squidGuard-1.3.orig/src/Makefile.in squidGuard-1.3/src/Makefile.in
---- squidGuard-1.3.orig/src/Makefile.in	2007-05-10 18:39:44.000000000 +0300
-+++ squidGuard-1.3/src/Makefile.in	2008-02-17 09:52:19.000000000 +0200
-@@ -91,6 +91,8 @@
- 	mv -f y.tab.c y.tab.c.bison
- 	mv -f y.tab.h y.tab.h.bison
- 
-+sg.y sg.l:
-+
- #
- # Dependencies for installing
- #
-@@ -103,8 +105,8 @@
- 
- install.bin:: squidGuard
- 	@echo making $@ in `basename \`pwd\``
--	@$(MKDIR) $(bindir) $(logdir) $(cfgdir)
--	$(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard
-+	@$(MKDIR) "$(INSTDIR)"/$(bindir) "$(INSTDIR)"/$(logdir) "$(INSTDIR)"/$(cfgdir)
-+	$(INSTALL_PROGRAM) squidGuard "$(INSTDIR)"/$(bindir)/squidGuard
- 
- uninstall.bin::
- 	@echo making $@ in `basename \`pwd\``
-diff -Nru squidGuard-1.3.orig/src/sgDb.c squidGuard-1.3/src/sgDb.c
---- squidGuard-1.3.orig/src/sgDb.c	2007-11-03 15:59:49.000000000 +0200
-+++ squidGuard-1.3/src/sgDb.c	2008-02-17 09:52:03.000000000 +0200
-@@ -100,13 +100,21 @@
-     if(createdb)
-       flag = flag | DB_TRUNCATE;
-     if ((ret = 
-+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-+	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
-+#else
- 	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
-+#endif
-       (void) Db->dbp->close(Db->dbp, 0);
-       sgLogFatalError("Error db_open: %s", strerror(ret));
-     }
-   } else {
-     if ((ret = 
-+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-+	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
-+#else
- 	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
-+#endif
-       sgLogFatalError("Error db_open: %s", strerror(ret));
-     }
-   }
diff --git a/net-proxy/squidguard/files/squidguard-1.3-nolog.patch b/net-proxy/squidguard/files/squidguard-1.3-nolog.patch
deleted file mode 100644
index 04746c992f42..000000000000
--- a/net-proxy/squidguard/files/squidguard-1.3-nolog.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -Nru squidGuard-1.3.orig/configure.in squidGuard-1.3/configure.in
---- squidGuard-1.3/configure.in 	2007-05-10 21:39:44.000000000 +0600
-+++ squidGuard-1.3/configure.in         2008-07-06 14:11:01.000000000 +0600
-@@ -296,4 +296,4 @@
- AC_SUBST(ROBOTEXCEPTIONS)
- AC_SUBST(BLACKLISTS)
- 
--AC_OUTPUT(Makefile src/Makefile src/sg.h doc/Makefile test/Makefile test/test1.conf test/test2.conf samples/Makefile samples/sample.conf samples/squidGuard.cgi samples/squidGuard-simple.cgi contrib/Makefile contrib/squidGuardRobot/squidGuardRobot contrib/sgclean/sgclean contrib/hostbyname/hostbyname)
-+AC_OUTPUT(Makefile src/Makefile src/sg.h src/sg.y src/sgDiv.c doc/Makefile test/Makefile test/test1.conf test/test2.conf samples/Makefile samples/sample.conf samples/squidGuard.cgi samples/squidGuard-simple.cgi contrib/Makefile contrib/squidGuardRobot/squidGuardRobot contrib/sgclean/sgclean contrib/hostbyname/hostbyname)
-diff -Nru squidGuard-1.3.orig/src/sg.y.in squidGuard-1.3/src/sg.y.in
---- squidGuard-1.3/src/sg.y.in          2007-11-03 18:59:49.000000000 +0500
-+++ squidGuard-1.3/src/sg.y.in          2008-07-06 15:35:08.000000000 +0600
-@@ -185,7 +185,6 @@
- source_content:     DOMAIN domain
-                     | USER user 
-                     | USERLIST WORD { sgSourceUserList($2); } 
--@YACCLINE@
-                     | EXECUSERLIST EXECCMD { sgSourceExecUserList($2); }
-                     | USERQUOTA NUMBER NUMBER HOURLY { 
- 		      sgSourceUserQuota($2,$3,"3600");} 
-@@ -667,7 +666,7 @@
- */
- 
-   if(!ldap_is_ldap_url(url)) {
--    @NOLOG1@ sgLogError("%s: can't parse LDAP url %s",progname, url);  @NOLOG2@
-+    sgLogError("%s: can't parse LDAP url %s",progname, url);
-     return;
-   }
- 
-@@ -1832,7 +1831,7 @@
-     m = ((lastval - m) * 60) - lt->tm_sec;
-   if(m <= 0)
-     m = 30;
--@NOLOG1@  sgLogError("Info: recalculating alarm in %d seconds", (unsigned int)m); @NOLOG2@
-+  sgLogError("Info: recalculating alarm in %d seconds", (unsigned int)m);
-   alarm((unsigned int) m);
-   sgTimeCheck(lt,t);
-   sgTimeSetAcl();
-@@ -2275,16 +2274,12 @@
-       }
-     }
-   }
--@NOLOG1@
-   else {
-       if( globalDebug == 1 ) { sgLogError("source not found"); }
-        }
--@NOLOG2@
-   if(!found) {
-     acl = defaultAcl;
--@NOLOG1@
-     if( globalDebug == 1 ) { sgLogError("no ACL matching source, using default"); }
--@NOLOG2@
-   }
-   return acl;
- }
-@@ -2516,7 +2511,7 @@
- 
-                sgDbUpdate(src->userDb, ident, (char *) userinfo,
-                        sizeof(struct UserInfo));
--               @NOLOG1@ sgLogError("Added LDAP source: %s", ident); @NOLOG2@
-+               sgLogError("Added LDAP source: %s", ident);
- 
-                if(found) {
-                        *rval = userinfo;
-@@ -2684,12 +2679,12 @@
-                if (strncmp(key, "bindname=", 9) == 0)
-                {
-                        binddn = data;
--                       @NOLOG1@ sgLogError("Extracted binddn: %s", binddn); @NOLOG2@
-+                       sgLogError("Extracted binddn: %s", binddn);
-                }
-                else if (strncmp(key, "x-bindpass=", 11) == 0)
-                {
-                        bindpass = data;
--                       @NOLOG1@ sgLogError("Extracted x-bindpass: %s", bindpass); @NOLOG2@
-+                       sgLogError("Extracted x-bindpass: %s", bindpass);
-                }
-        }
- 
-@@ -2707,14 +2702,12 @@
-                lud->lud_attrs, 0, NULL, NULL, NULL, -1,
-                &ldapresult) != LDAP_SUCCESS) {
- 
--@NOLOG1@
-                sgLogError("%s: ldap_search_ext_s failed: %s "
- 
-                        "(params: %s, %d, %s, %s)",
-                        progname, ldap_err2string(get_ldap_errno(ld)),
-                        lud->lud_dn, lud->lud_scope, lud->lud_filter,
-                        lud->lud_attrs[0]);
--@NOLOG2@
- 
-                ldap_unbind(ld);
-                ldap_free_urldesc(lud);
-diff -Nru squidGuard-1.3.orig/src/sgDiv.c.in squidGuard-1.3/src/sgDiv.c.in
---- squidGuard-1.3.orig/src/sgDiv.c.in	2008-12-16 07:26:28.000000000 +0000
-+++ squidGuard-1.3/src/sgDiv.c.in	2008-12-16 07:31:50.000000000 +0000
-@@ -145,7 +145,7 @@
-          strncpy(p+ndx,p+ndx+1, sz);
-          p[ndx+sz] = '\0';
-           if(1 == report_once) {
--            @NOLOG1@ sgLogError("Warning: Possible bypass attempt. Found multiple slashes where only one is expected: %s", s->orig); @NOLOG2@
-+            sgLogError("Warning: Possible bypass attempt. Found multiple slashes where only one is expected: %s", s->orig);
-             report_once--;
-           }
-       }
-@@ -157,7 +157,7 @@
-          size_t sz = strlen(p+ndx+1);
-          strncpy(p+ndx,p+ndx+1, sz);
-          p[ndx+sz] = '\0';
--         @NOLOG1@ sgLogError("Warning: Possible bypass attempt. Found a trailing dot in the domain name: %s", s->orig); @NOLOG2@
-+         sgLogError("Warning: Possible bypass attempt. Found a trailing dot in the domain name: %s", s->orig);
-       }
-       else
-       {
diff --git a/net-proxy/squidguard/files/squidguard-1.4-cross-compile.patch b/net-proxy/squidguard/files/squidguard-1.4-cross-compile.patch
new file mode 100644
index 000000000000..ad397fef8a1f
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.4-cross-compile.patch
@@ -0,0 +1,51 @@
+diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in
+--- squidGuard-1.4.orig/configure.in	2009-01-03 20:04:30.000000000 +0000
++++ squidGuard-1.4/configure.in	2009-04-25 09:53:49.000000000 +0000
+@@ -201,7 +201,9 @@
+                echo "Unable to link to LDAP library."
+                echo
+                exit 1
+-       ],)
++       ],[
++               ac_status=0
++       ])
+ fi
+ 
+ dnl
+@@ -314,7 +316,8 @@
+ 			exit (0);
+ 		exit (1);
+ 	}	
+-	], db_ok_version=yes, db_ok_version=no, db_ok_version=no)
++	], db_ok_version=yes, db_ok_version=no, db_ok_version=yes)
++
+ 
+ if test $db_ok_version = no; then
+ 	echo
+@@ -345,7 +348,7 @@
+ 			exit (1);
+ 		exit (0);
+ 	}	
+-	], db_ok_version=yes, db_ok_version=no, db_ok_version=no)
++	], db_ok_version=yes, db_ok_version=no, db_ok_version=yes)
+ 
+ if test $db_ok_version = no; then
+ 	echo
+@@ -377,7 +380,7 @@
+ 			exit (0);
+ 		exit (1);
+ 	}	
+-	], dbg2_ok_version=yes, dbg2_ok_version=no, dbg2_ok_version=no)
++	], dbg2_ok_version=yes, dbg2_ok_version=no, dbg2_ok_version=yes)
+ 
+ if test $dbg2_ok_version = yes; then
+ 	AC_DEFINE(DB_VERSION_GT2)
+@@ -401,7 +404,7 @@
+                         exit (0);
+                 exit (1);
+         }
+-        ], dbg3_ok_version=yes, dbg3_ok_version=no, dbg3_ok_version=no)
++        ], dbg3_ok_version=yes, dbg3_ok_version=no, dbg3_ok_version=yes)
+ 
+ if test $dbg3_ok_version = yes; then
+         AC_DEFINE(DB_VERSION_GT3)
diff --git a/net-proxy/squidguard/squidguard-1.3-r4.ebuild b/net-proxy/squidguard/squidguard-1.3-r4.ebuild
deleted file mode 100644
index ca6c248b640b..000000000000
--- a/net-proxy/squidguard/squidguard-1.3-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.3-r4.ebuild,v 1.1 2008/12/16 07:38:24 mrness Exp $
-
-WANT_AUTOMAKE=none
-
-inherit eutils autotools
-
-DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
-HOMEPAGE="http://www.squidguard.org"
-SRC_URI="http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz
-	http://www.squidguard.org/Downloads/Patches/${PV}/squidGuard-${PV}-patch-20080714.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ldap"
-
-RDEPEND=">=sys-libs/db-2
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/squidGuard-${PV}"
-
-RESTRICT="test" # tests are currently broken
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	cp ../squidGuard-${PV}-patch-20080714/src/sgDb.c src/ || die "failed to replace sgDiv.c"
-	cp ../squidGuard-${PV}-patch-20080714/src/sgDiv.c.in src/ || die "failed to replace sgDiv.c.in"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-autoheader.patch"
-	epatch "${FILESDIR}/${P}-nolog.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with ldap) \
-		--with-sg-config=/etc/squidGuard/squidGuard.conf \
-		--with-sg-logdir=/var/log/squidGuard \
-		|| die "configure has failed"
-
-	emake || die "make has failed"
-}
-
-src_install() {
-	emake prefix="/usr" INSTDIR="${D}" install || die "emake install has failed"
-
-	keepdir /var/log/squidGuard
-	fowners squid:squid /var/log/squidGuard
-
-	insinto /etc/squidGuard/sample
-	doins "${FILESDIR}"/squidGuard.conf.*
-	insinto /etc/squidGuard/sample/db
-	doins "${FILESDIR}"/blockedsites
-
-	dodoc ANNOUNCE CHANGELOG README
-	dohtml doc/*.html
-	docinto text
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:"
-	einfo "    url_rewrite_program /usr/bin/squidGuard"
-	einfo "    url_rewrite_children 10"
-	einfo ""
-	einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!"
-	einfo "Examples can be found in /etc/squidGuard/sample/"
-}
diff --git a/net-proxy/squidguard/squidguard-1.4.ebuild b/net-proxy/squidguard/squidguard-1.4-r2.ebuild
index 492233d92e19..915e126d67a9 100644
--- a/net-proxy/squidguard/squidguard-1.4.ebuild
+++ b/net-proxy/squidguard/squidguard-1.4-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.4.ebuild,v 1.1 2009/01/10 13:24:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.4-r2.ebuild,v 1.1 2009/04/25 09:58:43 mrness Exp $
 
 WANT_AUTOMAKE=none
+EAPI="2"
 
 inherit eutils autotools
 
@@ -23,23 +24,20 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/squidGuard-${PV}"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-autoheader.patch"
+	epatch "${FILESDIR}/${P}-vsnprintf.patch"
+	epatch "${FILESDIR}/${P}-cross-compile.patch"
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_with ldap) \
 		--with-sg-config=/etc/squidGuard/squidGuard.conf \
 		--with-sg-logdir=/var/log/squidGuard \
 		|| die "configure has failed"
-
-	emake || die "make has failed"
 }
 
 src_install() {