Fix parallel make (bug #297988).

(Portage version: 2.2_rc67/cvs/Linux i686)

4 files changed, 154 insertions, 70 deletions

diff --git a/net-proxy/ufdbguard/ChangeLog b/net-proxy/ufdbguard/ChangeLog
index ad618b316015..594d35a407cc 100644
--- a/net-proxy/ufdbguard/ChangeLog
+++ b/net-proxy/ufdbguard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/ufdbguard
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.7 2010/05/07 02:07:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.8 2010/05/07 03:34:36 jer Exp $
+
+*ufdbguard-1.20 (07 May 2010)
+
+  07 May 2010; Jeroen Roovers <jer@gentoo.org> -ufdbguard-1.13.ebuild,
+  -ufdbguard-1.16.ebuild, +ufdbguard-1.20.ebuild,
+  +files/ufdbguard-1.20-parallel-make.patch:
+  Fix parallel make (bug #297988).
 
   07 May 2010; Jeroen Roovers <jer@gentoo.org> ufdbguard-1.13.ebuild,
   ufdbguard-1.16.ebuild:
diff --git a/net-proxy/ufdbguard/files/ufdbguard-1.20-parallel-make.patch b/net-proxy/ufdbguard/files/ufdbguard-1.20-parallel-make.patch
new file mode 100644
index 000000000000..71af7fb78415
--- /dev/null
+++ b/net-proxy/ufdbguard/files/ufdbguard-1.20-parallel-make.patch
@@ -0,0 +1,133 @@
+--- a/src/Makefile.in	2010-04-12 04:39:43.000000000 +0200
+--- b/src/Makefile.in	2010-05-07 05:26:03.000000000 +0200
+@@ -135,8 +135,8 @@
+ # Dependencies for installing
+ #
+ 
+-daemon:
+-	cd mtserver; make
++daemon: $(UFDBOBJS)
++	cd mtserver; $(MAKE)
+ 
+ ufdbhttpd: ufdbhttpd.o httpserver.o ufdbbase.o ufdblib.o sgLog.o crypt.o
+ 	$(LINK) ufdbhttpd.o httpserver.o ufdbbase.o ufdblib.o sgLog.o crypt.o $(LIBS)
+@@ -235,7 +235,7 @@
+ 	$(RM) $(bindir)/ufdbhttpd
+ 
+ install.mt::
+-	cd mtserver ; make
++	cd mtserver ; $(MAKE)
+ 	$(INSTALL_PROGRAM) mtserver/ufdbguardd $(bindir)/ufdbguardd
+ 	$(INSTALL_PROGRAM) mtserver/ufdbgclient $(bindir)/ufdbgclient
+ 
+@@ -272,8 +272,8 @@
+ 	$(RM) *~ *.bak core core.* *.log *.log.[0-9] *.error
+ 	$(RM) *.o y.tab.c y.tab.h ufdbGuard ufdbGenTable ufdbAnalyse ufdbPrintTable ufdbhttpd 
+ 	$(RM) ipv6 iptst lex.yy.c
+-	-@cd mtserver && make clean
+-	-@cd api 2>/dev/null && make clean
++	-@cd mtserver && $(MAKE) clean
++	-@cd api 2>/dev/null && $(MAKE) clean
+ 
+ realclean:: clean
+ 	@echo making $@ in `basename \`pwd\``
+@@ -286,11 +286,11 @@
+ distclean:: realclean
+ 	@echo making $@ in `basename \`pwd\``
+ 	$(RM) Makefile sg.h config.h ufdbUpdate ufdbGuard.conf
+-	-cd mtserver ; make distclean
++	-cd mtserver ; $(MAKE) distclean
+ 
+ apidistclean: distclean
+ 	@echo making $@ in `basename \`pwd\``
+-	-cd api ; make distclean
++	-cd api ; $(MAKE) distclean
+ 
+ grab: ufdbGrab
+ 	./ufdbGrab $(cfgdir) $(logdir)
+@@ -532,25 +532,25 @@
+ 	$(CC) --version
+ 
+ g2953:
+-	make clean 
+-	CC=/usr/local/gcc/2.95.3/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
++	$(MAKE) clean 
++	CC=/usr/local/gcc/2.95.3/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
+ 
+ g344:
+-	make clean 
+-	CC=/usr/local/gcc/3.4.4/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
++	$(MAKE) clean 
++	CC=/usr/local/gcc/3.4.4/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
+ 
+ g401:
+-	make clean 
+-	CC=/usr/local/gcc/4.0.1/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
++	$(MAKE) clean 
++	CC=/usr/local/gcc/4.0.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
+ 
+ g411:
+-	make clean 
+-	CC=/usr/local/gcc/4.1.1/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
++	$(MAKE) clean 
++	CC=/usr/local/gcc/4.1.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
+ 
+ qinst:
+ 	/etc/init.d/squid stop
+ 	/etc/init.d/ufdb stop
+-	make install
++	$(MAKE) install
+ 	/etc/init.d/ufdb start
+ 	/etc/init.d/squid start
+ 
+--- a/src/mtserver/Makefile.in	2010-04-12 02:56:20.000000000 +0200
+--- b/src/mtserver/Makefile.in	2010-05-07 05:26:03.000000000 +0200
+@@ -48,10 +48,10 @@
+ 	$(LINK) ufdbgclient.o -L. -lufdbd    $(SOLARIS_LIBS)
+ 
+ ../lex.yy.o:
+-	cd .. ; make lex.yy.o
++	cd .. ; $(MAKE) lex.yy.o
+ 
+ ../y.tab.o:
+-	cd .. ; make y.tab.o
++	cd .. ; $(MAKE) y.tab.o
+ 
+ $(MYLIB): ../crypt.o ../lex.yy.o ../sgDiv.o ../sgLog.o ../ufdbLookup.o \
+           ../ufdblib.o ../y.tab.o ../ufdbbase.o 
+@@ -60,7 +60,7 @@
+ 	               ../ufdblib.o ../y.tab.o ../ufdbbase.o 
+ 
+ ptmalloc3/libptmalloc3.a:
+-	cd ptmalloc3 ; make linux-pthread
++	cd ptmalloc3 ; $(MAKE) linux-pthread
+ 
+ $(MYLIBSSL): ../ufdbchkport.o ../httpsQueue.o ../ufdbHashtable.o
+ 	-@rm -f $(MYLIBSSL)
+@@ -102,7 +102,7 @@
+ 	./ufdbgclient -p $(PORT) -l . -d "www.sex.com" 10.1.1.1 kees
+ 
+ ../../test/blacklist/domains.ufdb: ../../test/blacklist/domains
+-	cd ../../test ; make blacklist/domains.ufdb
++	cd ../../test ; $(MAKE) blacklist/domains.ufdb
+ 
+ LEAKOPTS= --leak-check=full --show-reachable=yes
+ LEAKOPTS=
+@@ -382,7 +382,7 @@
+ 	time ./ufdbgclient -p $(PORT) -l . < ../100000 > /dev/null 2>&1
+ 
+ tt:
+-	make tp3
++	$(MAKE) tp3
+ 	sleep 3
+ 	kill -HUP `ps -ef | grep ufdbguardd | grep -v grep | head -1 | awk '{ print $$2 }'`
+ 
+@@ -455,6 +455,6 @@
+ 
+ 
+ g411:	
+-	make clean
+-	CC=/usr/local/gcc/4.1.1/bin/gcc make -e $(MAKEFLAGS) all
++	$(MAKE) clean
++	CC=/usr/local/gcc/4.1.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) all
+ 
diff --git a/net-proxy/ufdbguard/ufdbguard-1.13.ebuild b/net-proxy/ufdbguard/ufdbguard-1.13.ebuild
deleted file mode 100644
index dd6453f9322f..000000000000
--- a/net-proxy/ufdbguard/ufdbguard-1.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.13.ebuild,v 1.4 2010/05/07 02:07:53 jer Exp $
-
-inherit eutils
-DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy."
-HOMEPAGE="http://ufdbguard.sf.net"
-SRC_URI="mirror://sourceforge/ufdbguard/ufdbGuard-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/openssl
-	app-arch/bzip2
-	net-misc/wget
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-
-S="${WORKDIR}/ufdbGuard-${PV}"
-
-src_compile() {
-	#econf || die "econf failed"
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--with-ufdb-config=/etc/ufdbguard \
-		--with-ufdb-logdir=/var/log/ufdbguard \
-		--with-ufdb-dbhome=/etc/ufdbguard/blacklists \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodoc CHANGELOG INSTALL README README.multithreaded TODO
-	dodoc src/UFDB
-
-	dobin src/ufdbGenTable src/ufdbGuard src/mtserver/ufdbgclient \
-		src/mtserver/ufdbguardd src/ufdbGrab || die "dobin failed"
-
-	dodir /etc/ufdbguard/blacklists
-	insinto /etc/ufdbguard
-	doins src/ufdbGuard.conf
-
-	newconfd "${FILESDIR}"/ufdbguard.confd ufdbguard
-	newinitd "${FILESDIR}"/ufdbguard.initd ufdbguard
-
-}
-
-pkg_postinst() {
-	einfo "Add ufdbguard port to services:"
-	einfo 'echo "ufdbguardd      3977/tcp" >> /etc/services '
-	echo ""
-	ewarn "This version require a rebuild of binary list using ufdbGentable"
-	ewarn "and maybe some change in the conf file. Read the doc for more info."
-}
diff --git a/net-proxy/ufdbguard/ufdbguard-1.16.ebuild b/net-proxy/ufdbguard/ufdbguard-1.20.ebuild
index 7fa9f522549c..02d6dc3607f4 100644
--- a/net-proxy/ufdbguard/ufdbguard-1.16.ebuild
+++ b/net-proxy/ufdbguard/ufdbguard-1.20.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.16.ebuild,v 1.3 2010/05/07 02:07:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.20.ebuild,v 1.1 2010/05/07 03:34:36 jer Exp $
+
+EAPI="2"
 
 inherit eutils
+
 DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy."
 HOMEPAGE="http://ufdbguard.sf.net"
 SRC_URI="mirror://sourceforge/ufdbguard/ufdbGuard-${PV}.tar.gz"
@@ -23,10 +26,17 @@ DEPEND="
 	sys-devel/flex
 "
 
+src_prepare() {
+	for i in $(find . -name Makefile.in); do
+		cp -av $i $i.org
+	done
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+}
+
 S="${WORKDIR}/ufdbGuard-${PV}"
 
-src_compile() {
-	./configure \
+src_configure() {
+	econf \
 		--host=${CHOST} \
 		--prefix=/usr \
 		--with-ufdb-config=/etc/ufdbguard \
@@ -35,8 +45,6 @@ src_compile() {
 		--infodir=/usr/share/info \
 		--with-ufdb-images_dir=/usr/share/ufdbguard/images \
 		--mandir=/usr/share/man || die "./configure failed"
-
-	emake || die "emake failed"
 }
 
 src_install() {