Fix configure.in db detection (#147940).

Package-Manager: portage-2.1.1

4 files changed, 53 insertions, 21 deletions

diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index 811b9ada804b..965a1b47e3d5 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/squidguard
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.4 2006/09/06 20:16:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.5 2006/09/17 18:04:44 mrness Exp $
+
+  17 Sep 2006; Alin Nastac <mrness@gentoo.org>
+  files/squidguard-1.2.0-db4.patch, squidguard-1.2.0-r1.ebuild:
+  Fix configure.in db detection (#147940).
 
   06 Sep 2006; Alin Nastac <mrness@gentoo.org>
   files/squidguard-1.2.0-db4.patch, -files/squidguard-1.2.0-db41.patch,
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index bc3ae8bcd7f9..f6d9592ee903 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -13,19 +13,19 @@ AUX squidGuard.conf.minimal 61 RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b S
 MD5 0c3ba4835c98256ad8ee4bf3336eb277 files/squidGuard.conf.minimal 61
 RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b files/squidGuard.conf.minimal 61
 SHA256 7070372be0dca55ade0a1beea8ac8d0461c38a8f5ef9d0a71ab47a9678f8f5df files/squidGuard.conf.minimal 61
-AUX squidguard-1.2.0-db4.patch 1003 RMD160 f311b9e6a42c102e665df18fd2a19c44a9903f31 SHA1 9881bd515a3a4e9289a9711c36bfabd4f0abc5eb SHA256 a73a887642fe68277d751ccd039f0b9c0113e1d1c11f2674c1f81eca0390e858
-MD5 748a0b4ec590ccfbfcf75887a631f0f1 files/squidguard-1.2.0-db4.patch 1003
-RMD160 f311b9e6a42c102e665df18fd2a19c44a9903f31 files/squidguard-1.2.0-db4.patch 1003
-SHA256 a73a887642fe68277d751ccd039f0b9c0113e1d1c11f2674c1f81eca0390e858 files/squidguard-1.2.0-db4.patch 1003
+AUX squidguard-1.2.0-db4.patch 1756 RMD160 363f3299f83ae318719618a8aa6167b882976f49 SHA1 00d7f25d50bc381001a1a3d8ebbb2b1e8c719c47 SHA256 bb8c327ee367d656c8a598bda57a3b253dcb9320871ac8e90829337f4c8e82e8
+MD5 2934b894c1c9934e4e1ededec79c6bfa files/squidguard-1.2.0-db4.patch 1756
+RMD160 363f3299f83ae318719618a8aa6167b882976f49 files/squidguard-1.2.0-db4.patch 1756
+SHA256 bb8c327ee367d656c8a598bda57a3b253dcb9320871ac8e90829337f4c8e82e8 files/squidguard-1.2.0-db4.patch 1756
 DIST squidGuard-1.2.0.tar.gz 1852737 RMD160 7c8d0f612b4e6bf459bf367fa56f309ce5cfe6e3 SHA1 8eb27b6eb85a3f8ed073b12a593a2c9ad97d7478 SHA256 6e88025d2906d635d170c53bf6ae7cc13e06839dfa2a6e5d92b5e6bb38e6ec6d
-EBUILD squidguard-1.2.0-r1.ebuild 1751 RMD160 b22a621a3e0dd2723f1bd7401ad23119562ea33f SHA1 0c15b007c1fd301482abf7995898eb26825d6327 SHA256 a27e884dd4188013b424c23d3615be2d368d4c8243e2aac720a80b456decc586
-MD5 c5aaaff11bb5012968d5f4e6b47e0c12 squidguard-1.2.0-r1.ebuild 1751
-RMD160 b22a621a3e0dd2723f1bd7401ad23119562ea33f squidguard-1.2.0-r1.ebuild 1751
-SHA256 a27e884dd4188013b424c23d3615be2d368d4c8243e2aac720a80b456decc586 squidguard-1.2.0-r1.ebuild 1751
-MISC ChangeLog 3131 RMD160 187f436b5f7fae18fee1688edf1700134de6fba9 SHA1 ab9d2a68f433e0bb67b5ee1d8ca72edcd29a6941 SHA256 04ec3f4151cb05b87148689cf93c010f39f0c494b7925c009f448340112e37e3
-MD5 2a7b10c7e22d3d8c33dcdaf5d85413d1 ChangeLog 3131
-RMD160 187f436b5f7fae18fee1688edf1700134de6fba9 ChangeLog 3131
-SHA256 04ec3f4151cb05b87148689cf93c010f39f0c494b7925c009f448340112e37e3 ChangeLog 3131
+EBUILD squidguard-1.2.0-r1.ebuild 1787 RMD160 82ee59841cb99227911ee54d45dc6270faeb5901 SHA1 8a14b404846768ba1da11a6b4370b341a58d8227 SHA256 07f2180984b34828e61857848755334c2553b397ecddb68a159ae4f7a60e22ac
+MD5 63aab59315dd82b70713969484b86fea squidguard-1.2.0-r1.ebuild 1787
+RMD160 82ee59841cb99227911ee54d45dc6270faeb5901 squidguard-1.2.0-r1.ebuild 1787
+SHA256 07f2180984b34828e61857848755334c2553b397ecddb68a159ae4f7a60e22ac squidguard-1.2.0-r1.ebuild 1787
+MISC ChangeLog 3286 RMD160 79b23bef1d5d0ac9b7f71b33d2c72484980713d6 SHA1 38344b3f7d535a8113d923a45f2ce2aad72a3125 SHA256 d43572ae45440934e80082574907794e9c526c2b7376f76c88b938c4c1b5c35a
+MD5 9da7eaa8e880ebf5da54edd72d979c5b ChangeLog 3286
+RMD160 79b23bef1d5d0ac9b7f71b33d2c72484980713d6 ChangeLog 3286
+SHA256 d43572ae45440934e80082574907794e9c526c2b7376f76c88b938c4c1b5c35a ChangeLog 3286
 MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
 MD5 35bcd0f162808937c8e8dcfa3ffca0c4 metadata.xml 264
 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 metadata.xml 264
@@ -36,7 +36,7 @@ SHA256 8dece5394be00ae9f361a1cfc8f6ab43ad2f8c03cd499810f55038ca4821f435 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/yyo3sf9c6kjmR8RAqb1AJ4ok6uIfCwyOi9B9LOJb1i5NbY9aQCfbDjW
-WXcXbWhsfEnDoqAmLPPVU+s=
-=aGpk
+iD8DBQFFDY5K3sf9c6kjmR8RAtQAAJ9CoX6PmjLkkRiHuLudA1aDC8AMkACfWTxj
+zPDwCGJvyKvo6C5I9wrcxU0=
+=Vtkz
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch
index d5ef5540fa66..1519a3bbb536 100644
--- a/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch
+++ b/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch
@@ -1,6 +1,32 @@
+diff -Nru squidGuard-1.2.0.orig/configure.in squidGuard-1.2.0/configure.in
+--- squidGuard-1.2.0.orig/configure.in	2006-09-17 20:52:13.000000000 +0300
++++ squidGuard-1.2.0/configure.in	2006-09-17 20:52:52.219168250 +0300
+@@ -65,21 +65,7 @@
+ 	AC_DEFINE(ACDBHOME)
+ fi
+ 
+-CFLAGS="$CFLAGS $db_inc"
+-CPPFLAGS="$CPPFLAGS $db_inc"
+-LDFLAGS="$LDFLAGS $db_lib"
+-
+-dnl Checks for libraries.
+-
+-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"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
 diff -Nru squidGuard-1.2.0.orig/src/sgDb.c squidGuard-1.2.0/src/sgDb.c
---- squidGuard-1.2.0.orig/src/sgDb.c	2001-05-14 16:40:12.000000000 +0300
-+++ squidGuard-1.2.0/src/sgDb.c	2006-09-06 23:07:49.756347000 +0300
+--- squidGuard-1.2.0.orig/src/sgDb.c	2006-09-17 20:52:13.000000000 +0300
++++ squidGuard-1.2.0/src/sgDb.c	2006-09-17 20:52:25.685510000 +0300
 @@ -98,13 +98,21 @@
      if(createdb)
        flag = flag | DB_TRUNCATE;
diff --git a/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild b/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild
index f2b292e2db77..49256c0d3d9e 100644
--- a/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild,v 1.4 2006/09/06 20:16:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild,v 1.5 2006/09/17 18:04:44 mrness Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
 HOMEPAGE="http://www.squidguard.org"
@@ -23,8 +23,10 @@ S="${WORKDIR}/squidGuard-${PV}"
 
 src_unpack() {
 	unpack ${A} || die "unpack problem"
-
+#die
+	cd "${S}"
 	epatch "${FILESDIR}/${P}-db4.patch"
+	eautoconf
 }
 
 src_compile() {