Fix compilation issues on systems with uclibc++ (#134197).

Package-Manager: portage-2.0.54-r2

7 files changed, 177 insertions, 19 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 3d5984a35baf..1ebeb3504409 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.19 2006/05/30 18:58:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.20 2006/05/31 21:18:35 mrness Exp $
+
+  31 May 2006; Alin Nastac <mrness@gentoo.org>
+  +files/dansguardian-2.8.0.6-ctime.patch,
+  +files/dansguardian-2.9.7.0-ctime.patch,
+  +files/dansguardian-2.9.7.0-lm.patch, dansguardian-2.8.0.6-r1.ebuild,
+  dansguardian-2.9.7.0_alpha.ebuild:
+  Fix compilation issues on systems with uclibc++ (#134197).
 
 *dansguardian-2.9.7.0_alpha (30 May 2006)
 
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index 948b319efb5c..2416ac747144 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -1,12 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b97cd2c678b748615a8a586d8e0c7ba0 ChangeLog 7720
-MD5 731f8b248c22fd1b51895c8ee7b94d4c dansguardian-2.8.0.6-r1.ebuild 1239
+MD5 3ef8ae90fd8e2d2a06a932b4f87cbb68 ChangeLog 8024
+MD5 d6d7a39faf1eacef321056bd39afeb5f dansguardian-2.8.0.6-r1.ebuild 1308
 MD5 acff886bb73804227167b8b5a360aed4 dansguardian-2.9.6.2_alpha.ebuild 2892
-MD5 9d339978cbb5e0e1859f4d0637d1d9fb dansguardian-2.9.7.0_alpha.ebuild 2928
+MD5 5e2984d5a8ad01c16b8d6e26f3273271 dansguardian-2.9.7.0_alpha.ebuild 3052
+MD5 4cd610be71861580b479fb9971ae80cf files/dansguardian-2.8.0.6-ctime.patch 2367
 MD5 0cf459b33bd205ff0e5d270cf1db72e0 files/dansguardian-2.8.0.6-gentoo.patch 886
 MD5 93283d75c26fd46c00412d8c67f6f56d files/dansguardian-2.9.6.2_alpha-gentoo.patch 471
+MD5 a1f6ef090b26987a2328c17ab27ec2e9 files/dansguardian-2.9.7.0-ctime.patch 2339
+MD5 8604b0e68582ea37742a7c18a44d342f files/dansguardian-2.9.7.0-lm.patch 550
 MD5 1ce9c47a63b69f83aacacdc0f9622b6e files/dansguardian-2.9.7.0_alpha-gentoo.patch 471
 MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
 MD5 89d1e03feed0f074cadb635f786c3f32 files/dansguardian.init 826
@@ -18,7 +21,7 @@ MD5 30b14eaf02c479d70f60157c1a29a294 metadata.xml 568
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEfJXijG8pv1lIUX4RAkIAAKCuv7Y82CBTIQZGK/T3/AfsRyhysACdGYJ7
-0qse0IqkV42mwo152kXuTE4=
-=9vsw
+iD8DBQFEfgg7jG8pv1lIUX4RAsprAKCEq5bR+4Kn7Skm93tTehCJDINkRQCgojSP
+h7xSiUKowWSjWhgGzTFuNjQ=
+=8+8p
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild b/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild
index 42d2ed15d117..8f9c77b39754 100644
--- a/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.8.0.6-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/dansguardian/dansguardian-2.8.0.6-r1.ebuild,v 1.6 2006/02/07 20:53:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild,v 1.7 2006/05/31 21:18:35 mrness Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Web content filtering via proxy"
 HOMEPAGE="http://dansguardian.org"
@@ -12,15 +12,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
-DEPEND="!net-proxy/dansguardian-dgav
-	virtual/libc"
+DEPEND="!net-proxy/dansguardian-dgav"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	cd "${S}"
+	epatch "${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff"
+	epatch "${FILESDIR}/${P}-ctime.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 }
 
 src_compile() {
@@ -30,16 +30,16 @@ src_compile() {
 		--mandir=/usr/share/man/ \
 		--cgidir=/var/www/localhost/cgi-bin/ \
 		--logrotatedir="${D}/etc/logrotate.d" || die "./configure failed"
-	emake OPTIMISE="${CFLAGS}" || die "emake failed"
+	emake CPP=$(tc-getCXX) OPTIMISE="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
 	make install || die "make install failed"
 
-	newinitd ${FILESDIR}/dansguardian.init dansguardian
+	newinitd "${FILESDIR}/dansguardian.init" dansguardian
 
 	insinto /etc/logrotate.d
-	newins ${FILESDIR}/dansguardian.logrotate dansguardian
+	newins "${FILESDIR}/dansguardian.logrotate" dansguardian
 
 	doman dansguardian.8
 	dodoc README
diff --git a/net-proxy/dansguardian/dansguardian-2.9.7.0_alpha.ebuild b/net-proxy/dansguardian/dansguardian-2.9.7.0_alpha.ebuild
index 821060bdedaa..1942ef980533 100644
--- a/net-proxy/dansguardian/dansguardian-2.9.7.0_alpha.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.9.7.0_alpha.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/dansguardian/dansguardian-2.9.7.0_alpha.ebuild,v 1.1 2006/05/30 18:58:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.9.7.0_alpha.ebuild,v 1.2 2006/05/31 21:18:35 mrness Exp $
 
-inherit eutils
+inherit eutils autotools
 
 MY_P=${P/_alpha/}
 
@@ -43,7 +43,12 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
+	epatch "${FILESDIR}/${P%_alpha}-ctime.patch"
+	epatch "${FILESDIR}/${P%_alpha}-lm.patch"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	cd "${S}"
+	eautoreconf
 }
 
 src_compile() {
diff --git a/net-proxy/dansguardian/files/dansguardian-2.8.0.6-ctime.patch b/net-proxy/dansguardian/files/dansguardian-2.8.0.6-ctime.patch
new file mode 100644
index 000000000000..a142d971ca79
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.8.0.6-ctime.patch
@@ -0,0 +1,66 @@
+diff -ru dansguardian-2.8.0.6.orig/ConnectionHandler.cpp dansguardian-2.8.0.6/ConnectionHandler.cpp
+--- dansguardian-2.8.0.6.orig/ConnectionHandler.cpp	2006-05-24 11:06:32 +0000
++++ dansguardian-2.8.0.6/ConnectionHandler.cpp	2006-05-24 11:08:53 +0000
+@@ -36,6 +36,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <cstdio>
++#include <ctime>
+ #include <algorithm>
+ #include <iostream>
+ #include <netdb.h>
+diff -ru dansguardian-2.8.0.6.orig/DynamicURLList.cpp dansguardian-2.8.0.6/DynamicURLList.cpp
+--- dansguardian-2.8.0.6.orig/DynamicURLList.cpp	2006-05-24 11:06:32 +0000
++++ dansguardian-2.8.0.6/DynamicURLList.cpp	2006-05-24 11:09:06 +0000
+@@ -19,6 +19,7 @@
+ 
+ #include <syslog.h>
+ #include <algorithm>
++#include <ctime>
+ #include "DynamicURLList.hpp"
+ #include "OptionContainer.hpp"
+ #include <sys/stat.h>
+diff -ru dansguardian-2.8.0.6.orig/FatController.cpp dansguardian-2.8.0.6/FatController.cpp
+--- dansguardian-2.8.0.6.orig/FatController.cpp	2006-05-24 11:06:32 +0000
++++ dansguardian-2.8.0.6/FatController.cpp	2006-05-24 11:09:47 +0000
+@@ -21,6 +21,7 @@
+ #include <syslog.h>
+ #include "FatController.hpp"
+ #include <csignal>
++#include <ctime>
+ #ifdef __BSD
+ 	#include <sys/wait.h>
+ #else
+diff -ru dansguardian-2.8.0.6.orig/ListContainer.cpp dansguardian-2.8.0.6/ListContainer.cpp
+--- dansguardian-2.8.0.6.orig/ListContainer.cpp	2006-05-24 11:06:32 +0000
++++ dansguardian-2.8.0.6/ListContainer.cpp	2006-05-24 11:10:13 +0000
+@@ -24,6 +24,7 @@
+ #include "RegExp.hpp"
+ #include <cstdlib>
+ #include <cstdio>
++#include <ctime>
+ #include <unistd.h>
+ #include "String.hpp"
+ #include <iostream>
+diff -ru dansguardian-2.8.0.6.orig/ListManager.cpp dansguardian-2.8.0.6/ListManager.cpp
+--- dansguardian-2.8.0.6.orig/ListManager.cpp	2006-05-24 11:06:32 +0000
++++ dansguardian-2.8.0.6/ListManager.cpp	2006-05-24 11:10:27 +0000
+@@ -22,6 +22,7 @@
+ #include "ListManager.hpp"
+ #include "RegExp.hpp"
+ #include <sys/stat.h>
++#include <ctime>
+ 
+ extern bool isDaemonised;
+ 
+diff -ru dansguardian-2.8.0.6.orig/dansguardian.cpp dansguardian-2.8.0.6/dansguardian.cpp
+--- dansguardian-2.8.0.6.orig/dansguardian.cpp	2006-05-24 11:06:32 +0000
++++ dansguardian-2.8.0.6/dansguardian.cpp	2006-05-24 11:10:50 +0000
+@@ -24,6 +24,7 @@
+ #include <iostream>
+ #include <arpa/inet.h>
+ #include <cstdio>
++#include <ctime>
+ #include <string>
+ #include <unistd.h>
+ #include <cerrno>
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.7.0-ctime.patch b/net-proxy/dansguardian/files/dansguardian-2.9.7.0-ctime.patch
new file mode 100644
index 000000000000..80a7b2a79475
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.7.0-ctime.patch
@@ -0,0 +1,66 @@
+diff -ru dansguardian-2.9.7.0.orig/src/ConnectionHandler.cpp dansguardian-2.9.7.0/src/ConnectionHandler.cpp
+--- dansguardian-2.9.7.0.orig/src/ConnectionHandler.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.0/src/ConnectionHandler.cpp	2006-05-30 21:38:25 +0000
+@@ -32,6 +32,7 @@
+ #include <syslog.h>
+ #include <cerrno>
+ #include <cstdio>
++#include <ctime>
+ #include <algorithm>
+ #include <netdb.h>
+ #include <cstdlib>
+diff -ru dansguardian-2.9.7.0.orig/src/DynamicURLList.cpp dansguardian-2.9.7.0/src/DynamicURLList.cpp
+--- dansguardian-2.9.7.0.orig/src/DynamicURLList.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.0/src/DynamicURLList.cpp	2006-05-30 21:38:52 +0000
+@@ -25,6 +25,7 @@
+ 
+ #include <syslog.h>
+ #include <algorithm>
++#include <ctime>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ 
+diff -ru dansguardian-2.9.7.0.orig/src/FatController.cpp dansguardian-2.9.7.0/src/FatController.cpp
+--- dansguardian-2.9.7.0.orig/src/FatController.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.0/src/FatController.cpp	2006-05-30 21:39:28 +0000
+@@ -33,6 +33,7 @@
+ 
+ #include <syslog.h>
+ #include <csignal>
++#include <ctime>
+ #include <sys/stat.h>
+ #include <pwd.h>
+ #include <cerrno>
+diff -ru dansguardian-2.9.7.0.orig/src/ListContainer.cpp dansguardian-2.9.7.0/src/ListContainer.cpp
+--- dansguardian-2.9.7.0.orig/src/ListContainer.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.0/src/ListContainer.cpp	2006-05-30 21:39:57 +0000
+@@ -29,6 +29,7 @@
+ #include "RegExp.hpp"
+ #include <cstdlib>
+ #include <cstdio>
++#include <ctime>
+ #include <unistd.h>
+ #include "String.hpp"
+ #include <iostream>
+diff -ru dansguardian-2.9.7.0.orig/src/ListManager.cpp dansguardian-2.9.7.0/src/ListManager.cpp
+--- dansguardian-2.9.7.0.orig/src/ListManager.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.0/src/ListManager.cpp	2006-05-30 21:40:25 +0000
+@@ -25,6 +25,7 @@
+ 
+ #include <syslog.h>
+ #include <sys/stat.h>
++#include <ctime>
+ 
+ 
+ // GLOBALS
+diff -ru dansguardian-2.9.7.0.orig/src/dansguardian.cpp dansguardian-2.9.7.0/src/dansguardian.cpp
+--- dansguardian-2.9.7.0.orig/src/dansguardian.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.0/src/dansguardian.cpp	2006-05-30 21:41:24 +0000
+@@ -27,6 +27,7 @@
+ 
+ #include <iostream>
+ #include <cstdio>
++#include <ctime>
+ #include <unistd.h>
+ #include <cerrno>
+ #include <syslog.h>
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.7.0-lm.patch b/net-proxy/dansguardian/files/dansguardian-2.9.7.0-lm.patch
new file mode 100644
index 000000000000..81deed6ab853
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.7.0-lm.patch
@@ -0,0 +1,11 @@
+diff -Nru dansguardian-2.9.7.0.orig/configure.ac dansguardian-2.9.7.0/configure.ac
+--- dansguardian-2.9.7.0.orig/configure.ac	2006-05-08 14:57:53.000000000 +0300
++++ dansguardian-2.9.7.0/configure.ac	2006-06-01 00:08:39.953911500 +0300
+@@ -135,6 +135,7 @@
+ AC_CHECK_FUNCS([dup2 gettimeofday memset select])
+ AC_CHECK_FUNCS([strerror strstr strtol])
+ AC_CHECK_FUNCS([setuid setgid umask seteuid setreuid setlocale strdup])
++AC_SEARCH_LIBS([floor], [m])
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_SEARCH_LIBS([socket], [socket], [], [
+ 	AC_CHECK_LIB(