Fix parallel make (bug #297988).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

5 files changed, 158 insertions, 75 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/Manifest b/net-proxy/ufdbguard/Manifest
index dc031ea5f57c..95c52df6aa41 100644
--- a/net-proxy/ufdbguard/Manifest
+++ b/net-proxy/ufdbguard/Manifest
@@ -1,12 +1,11 @@
+AUX ufdbguard-1.20-parallel-make.patch 3889 RMD160 faf5efa264b7264e5e7dad84a9a324e898c351a8 SHA1 97b3222a194b826191241e267448b3f5631eb2a5 SHA256 e657a4be2f6764f00456a43b354794fb828667118093f7b95256f52cd03e49f5
 AUX ufdbguard.confd 402 RMD160 2cd60b4733d49f77884dcf5f6b424698b6676277 SHA1 09c56de3e2112fce23fc71418303e3e74f7f978f SHA256 f39e7a716c65043e78cfb1e928a656115a9a3e545d8f36a05eabba499f5316a1
 AUX ufdbguard.initd 1021 RMD160 7d4c5e63dcce32db5e4db24bdb35c8aa71611ac7 SHA1 d785bfe9b72b647e36998e39bc7a2ba9fbc6c929 SHA256 129db96a03b132eee27cb65c90e5fea36481d3230309e9d19c126a0c060b4618
 AUX ufdbhttpd.confd 292 RMD160 37e1b7ba717652918856dd1af399613485a067d1 SHA1 47265a838193178641183ecdccdbdfd68238b904 SHA256 2ef748832a479ba7e7610745a19773fc18fb7f278687d98532612e524d140d6e
 AUX ufdbhttpd.initd 683 RMD160 162b1947d8deb82cf1a06b2cf797f676bb43f035 SHA1 f481aebdb7d31c102e9da6daf1b13f1999c668bc SHA256 a3b101c854a9694d38dac967a9436e3d40d1b9a9703a708723baf255bfecc7af
 DIST ufdbGuard-1.11.tar.gz 586455 RMD160 bf5386f65283a41de2263566b812f0f20c22a9fe SHA1 675c0c18b8b37570fd5e163f5e475f2c370dcfa4 SHA256 5ce227a5cc23c2f6b6f5ccac3e59711386feaa751ff56a922890e4cb240528f3
-DIST ufdbGuard-1.13.tar.gz 670476 RMD160 c8c70a918cdf7be6d349b5a701b8baabb76b130b SHA1 51a5bc0f461c02e7219781eb73a587ea81b3c60f SHA256 8ddbef562cf741aee6d8574fbab30de067187f992975a2d58f75cf9a39fad875
-DIST ufdbGuard-1.16.tar.gz 765012 RMD160 7f66e249c778eefb09edd0894c02ee7962891eb4 SHA1 6f14a5d6f77336bab851887b47f2c24025ed4cc7 SHA256 510ea3f61caeb2e2e9a6d108da0755f41b0a44098ad8661133230b672c779ece
+DIST ufdbGuard-1.20.tar.gz 681981 RMD160 b789de2d27c4e1834bdd1b7a1625f22210446889 SHA1 d16b3849d3ec05d1b0db73f2261ae111792f4203 SHA256 ef9ce77f7614cb1004fcbe4bf6bf8f54f44a2a7cedab0fdab61e6d2a580949da
 EBUILD ufdbguard-1.11.ebuild 1449 RMD160 ab72eddf685fe820661107c123ce02855cd31132 SHA1 b8c060fa78bc04e45a578b7bd83934c799e0fd65 SHA256 95fb89dcc517861b01f7a3af5da8593f96acfac5756d2ada0f18761a77532f86
-EBUILD ufdbguard-1.13.ebuild 1636 RMD160 de1d63399a31adcb876247ad27e489f486c8b7f1 SHA1 b97b53fbcb42ae834078df564b81cff43e602d36 SHA256 efd5e4a8a2bbd967f958a68cdb0d3a92a5cf24c54ad76eb5160278d4f6c264b1
-EBUILD ufdbguard-1.16.ebuild 1699 RMD160 162e1f60841ddaf1cfebaab0ab6b56a144eb75ff SHA1 e1e9a42381bb12aeab7f6b710381aace1a5dad3e SHA256 d755fe75e206afeb405f5ac0e6c5bf0722539e8d4c9576fcfed24c867296fe3f
-MISC ChangeLog 1294 RMD160 e809d9eed38f11e1d5e97f416394f2dd1188674e SHA1 4a3b5c42f24dd86007d43c19410b3893acd323f7 SHA256 3aa8b41eb24b414668b7407e4ad7716024b28d4b7469e5442c8b3345f64079cf
+EBUILD ufdbguard-1.20.ebuild 1809 RMD160 41f1a09a29b508e21fc224fa79f4a182932305ee SHA1 abbccb9e4bdaa405a3a84c04bb67b5c64890fd3d SHA256 b882308e992ec909b851a440dfa186f50213cb308d3cf5a9a222d4302b7731ba
+MISC ChangeLog 1527 RMD160 4b3320c0249dbd279901ed39fc1f8264a0641828 SHA1 c9c60c3e6b5dc51a1b7d89b4c7b59189bd11cf1a SHA256 811b4d8d9e1a0323eb7ba74dbc6bf0a3b14d9bc5d6decfae64f700e7a0fce90c
 MISC metadata.xml 480 RMD160 0fdde361e5387cfb2309ac143af25bafa90c85a7 SHA1 3cf13af5230506504ace227a6bcffad632ec213c SHA256 578bc2eca5799022f63aa1adf4d4f67b73e53d8c3b4e9ee9393d8484c82eb500
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() {