fix parallel build problem, which renders nawk useless (bug #455786)

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 86 insertions, 58 deletions

diff --git a/sys-apps/nawk/ChangeLog b/sys-apps/nawk/ChangeLog
index f508da43eb40..3e7cfb1535a8 100644
--- a/sys-apps/nawk/ChangeLog
+++ b/sys-apps/nawk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/nawk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/ChangeLog,v 1.8 2013/02/06 03:29:55 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/ChangeLog,v 1.9 2013/02/07 16:57:28 ottxor Exp $
+
+*nawk-20121220-r2 (07 Feb 2013)
+
+  07 Feb 2013; Christoph Junghans <ottxor@gentoo.org>
+  +files/nawk-20121220-parallel-build.patch, +nawk-20121220-r2.ebuild,
+  -nawk-20110810-r1.ebuild, -nawk-20121220-r1.ebuild:
+  fix parallel build problem, which renders nawk useless (bug #455786)
 
 *nawk-20121220-r1 (06 Feb 2013)
 
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
index 724a01a5380f..a6b062702366 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST nawk-20110810.tar.gz 108035 SHA256 48af177922700c313aa9d22100d230d2d0280d56b8598d80f583d57b44bf63a8 SHA512 8f2d8e288b2bf6dca0067c87de38eb833c0fea0ef2ef75a3180e79c0a554bb00037985de389b85c23b875c6e64261182f782fd70f6a1c64f6015af997090d972 WHIRLPOOL 4fc4d1dd620f5df7334d04aa2bf624244e6166d745ee52d04ec235d4935a2d72be1251f8bdc7bc1707a5988c254b1ed46407098a1dbaf011c1bc56821a730727
+AUX nawk-20121220-parallel-build.patch 1654 SHA256 68f150d9cc166b94ccddd41648befc4c54ea7bf5995f71c7c6b9d0f4fc8466b0 SHA512 489e2723431e1c2f582a9d5ff0364038240e404ee8f0e0573f1f9f41c55ba84e0362d9d70704f43da73028b1d415d8100db0c55adc8593ed31fff2c7448e7b8b WHIRLPOOL 219c52ed693e4d98d008eae481b433b6ab357bb1df7333880312d57655e0f0f6defd193000080151a4156d10f3feda8137c59feb82c32a83dad59e4abcf7a766
 DIST nawk-20121220.tar.gz 88970 SHA256 8dc092165c5a4e1449f964286483d06d0dbfba4b0bd003cb5dab30de8f6d9b83 SHA512 1dd62e1aa4c8cfad7ce599b10d88e9b450ecae3217cf8327cc0f3ce77d0d0dcb731101b8f211066462d46dc4ef23e20ccd7f70d799d7d48940026abe8fa79d4f WHIRLPOOL 6d8effe600eaf49c9bce79b027732909992f606ba89e771ad041f5ef3b32a44e7b0fa41576fdeb3e220f1e4859e2701397946fa90cb0ee4a334eb0178fabee91
-EBUILD nawk-20110810-r1.ebuild 995 SHA256 5a70d677662e55dbc7a9e72bcb2051600d73b19a7ac9084a247b7f1883bf6869 SHA512 8a6c5e133d0262dcd0381fbe28b0a1a9990fb68268ce87425466b92c221197161c7c8ea194dac6e60734fdee862b223e00f7aaea8a19cb35fda29b4fc8205d05 WHIRLPOOL b58e7ab4129e35a91c42dfdbceef1961922df32e1622910d573029dc7d18b4e1a9fb05e9d7b0ea26fdee3d22063fbb971838b263e2bb1eb30103440b5e3ca9ad
-EBUILD nawk-20121220-r1.ebuild 1030 SHA256 94a3f4fdc299e3ffb6624bb8bc8df1a775898074489528a6a42619ec90802312 SHA512 3f0a89c49172f30a311d7d7af89a3c525e4d427b2a52f1dbde96a367f2d62cf30366f1d2f704970beb3467243d66667f6f12a0b1b4cd87493b58cc2aa6ce31e2 WHIRLPOOL cb8b34965f3ca0e422d874b189a685550770f6fab429ce772e43b7b90d650e837ab80d5d4d10175e1750daf76fe502488895f07e5e627e0c665952434b050b5b
-MISC ChangeLog 1279 SHA256 13e4c5393838e425551a666cd3b9b3bd4183e1597d2ee7d45f90a9894473c60c SHA512 d38c8b2a380ac92fdb84c8875a0d191772dcdba0b35e3f6b8942b0b472555f1d5b2a60a1a293ac6c3186ea7b3074980408e52a6490126488c778ea138db98926 WHIRLPOOL 07de52d2599077a1390f5b129f05694fda84cb53122064fe4b67badfb54cf91621a79dc287ed5c292113f138bc1ff34222a4bab305726e54e235305e4ab6e3ab
+EBUILD nawk-20121220-r2.ebuild 1121 SHA256 560382dd47cca982606200861c15faf3a323d93d01862f5bd42c2ce9ec76d116 SHA512 cae5211bfb76c3c26381b9f95b02ab316446d5a00386ad5ecc8adb6043986d41439d17b4c0a7af0535fc595be17750afb43d8a58ee59045811e33ebef0631aea WHIRLPOOL 1eb03507737908423ec77039ba9461d609f6e1e20ae5d9b476d75471dfce81cf4bf304116b73be38ac1f3ec970cfea1820fe65cda726952745f04258cc902a8e
+MISC ChangeLog 1563 SHA256 1343373e420ddee8b9bdd76020170632b5c5f1e955dcfd1c2c917ca42a4130c4 SHA512 f4092664b71f99c96cfb9c5f263b91b839e4274b3867446dd4b239f732d20d937f7774926dcaf320424741dd45188171d047e0e933c59af2a54893bd501ee267 WHIRLPOOL e86cdb775db586966863d333c1505f3dda6484f34e244643ed373e093336cb8d164fe0206ce553d45e692822a3e730ada24c65074153defdc38390c4b0c82c1d
 MISC metadata.xml 263 SHA256 a6d4c105d7146cdcbcf7d42ac9380a500a6e408268af602adf32fdeb0c114d48 SHA512 bd2a7f235f2a6a609fd441009487b1e1e4d1396b0805a8e704dc9e10d41b00927b5de5208dd9c5e9c935e8ccbee2f7a5b35ef994b4a9458602e36ee57044d4e3 WHIRLPOOL ac109b50cc474d20ea3bf3faf87ca3ac2c1faf582e1896d2e8e9dcc49a1a2c9ded234e50667b2e76dfce7cff0ad95380c69a56826ccf05d2b5394a6dbb325083
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJREc40AAoJEOeBhlrCAAWG0JYIAKwZAfaJpp3svnh4MqButMga
-Eh6LV3mTlpy3kvKRWZ/GJQoq01leeAartqHG+kxO5Pxrg/lqQdb0SUo676/NgWXd
-ny054FDpx1LxgTtwh8Y2/6V0TwzjWfJA3ObXDvJ6a9SJ1SwOr+BL7DpN86L9yHT/
-AWoNSwsW1siTN8ufz65+7/V5pPg37uZjSwjJCs6wI9lwQcvNq5yLYJDN3wEC096Q
-L2JyYHP5VxPTssz7pK99kynw2y2uTcNwvk6dooW8wpbDCoeBYqmB6PC932qO6rJN
-z3SRmm6+3i/0wyBuq0p0Re3/Mt6340nlQC/9FB+FyJwWG8D57LjOl97pI73uGaQ=
-=Hzv2
+iQEcBAEBCAAGBQJRE9z6AAoJEOeBhlrCAAWGgrMIAJNYQBYD8MHo8N0OpSPehOWK
+SE9lECmKl23V70JENxMpAhU1jQJHg0NOEOXakJK4suqnjW8yVlznFlvFKF0LDT7+
+6L5i5ekt0aV4Yp6xUP9v7eiC2RAU30s/SIJX9/t+gh6a6wCvN44h0MUF4R8SXh+X
+MFK3U8D0hQJaR8RsXmPTWMNH+JfPJAZuZlOHDP4rjJgma8KKpeFHjg9Hkn+OQAjl
+wt8YMUakmoTHcmn2jikVstBwumybl3SFGVNSJyZDfHDmzZdeijpYkygt4pUf7613
+ugmcILE2CT6WxGCGDd+s4oMgXHb83mKIveteCxhjyBoea5fv4Gqh80D5bzYuw3k=
+=76NK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/nawk/files/nawk-20121220-parallel-build.patch b/sys-apps/nawk/files/nawk-20121220-parallel-build.patch
new file mode 100644
index 000000000000..45a3e5624a40
--- /dev/null
+++ b/sys-apps/nawk/files/nawk-20121220-parallel-build.patch
@@ -0,0 +1,61 @@
+--- makefile.orig	2013-02-06 10:26:36.452829647 -0700
++++ makefile	2013-02-07 09:12:13.293898947 -0700
+@@ -44,7 +44,7 @@
+ LISTING = awk.h proto.h awkgram.y lex.c b.c main.c maketab.c parse.c \
+ 	lib.c run.c tran.c 
+ 
+-SHIP = README FIXES $(SOURCE) ytab[ch].bak makefile  \
++SHIP = README FIXES $(SOURCE) makefile  \
+ 	 awk.1
+ 
+ a.out:	ytab.o $(OFILES)
+@@ -52,11 +52,15 @@
+ 
+ $(OFILES):	awk.h ytab.h proto.h
+ 
+-ytab.o:	awk.h proto.h awkgram.y
++#Clear dependency for parallel build: (make -j)
++#YACC generated y.tab.c and y.tab.h at the same time
++#this needs to be a static pattern rules otherwise multiple target
++#are mapped onto multiple executions of yacc, which overwrite 
++#each others outputs.
++y%.c y%.h:	awk.h proto.h awkgram.y
+ 	$(YACC) $(YFLAGS) awkgram.y
+-	mv y.tab.c ytab.c
+-	mv y.tab.h ytab.h
+-	$(CC) $(CFLAGS) -c ytab.c
++	mv y.$*.c y$*.c
++	mv y.$*.h y$*.h
+ 
+ proctab.c:	maketab
+ 	./maketab >proctab.c
+@@ -64,23 +68,23 @@
+ maketab:	ytab.h maketab.c
+ 	$(CC) $(CFLAGS) maketab.c -o maketab
+ 
+-bundle:
++bundle: $(SHIP)
+ 	@cp ytab.h ytabh.bak
+ 	@cp ytab.c ytabc.bak
+-	@bundle $(SHIP)
++	@bundle $(SHIP) ytabh.bak ytabc.bak
+ 
+-tar:
++tar: $(SHIP)
+ 	@cp ytab.h ytabh.bak
+ 	@cp ytab.c ytabc.bak
+ 	@bundle $(SHIP) >awk.shar
+-	@tar cf awk.tar $(SHIP)
++	@tar cf awk.tar $(SHIP) ytabh.bak ytabc.bak
+ 	gzip awk.tar
+ 	ls -l awk.tar.gz
+-	@zip awk.zip $(SHIP)
++	@zip awk.zip $(SHIP) ytabh.bak ytabc.bak
+ 	ls -l awk.zip
+ 
+ names:
+ 	@echo $(LISTING)
+ 
+ clean:
+-	rm -f a.out *.o *.obj maketab maketab.exe *.bb *.bbg *.da *.gcov *.gcno *.gcda # proctab.c
++	rm -f a.out *.o *.obj maketab maketab.exe *.bb *.bbg *.da *.gcov *.gcno *.gcda ytab.c ytab.h # proctab.c
diff --git a/sys-apps/nawk/nawk-20110810-r1.ebuild b/sys-apps/nawk/nawk-20110810-r1.ebuild
deleted file mode 100644
index 8e5867154f87..000000000000
--- a/sys-apps/nawk/nawk-20110810-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/nawk-20110810-r1.ebuild,v 1.4 2013/02/06 03:19:35 ottxor Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Brian Kernighan's pattern scanning and processing language"
-HOMEPAGE="http://cm.bell-labs.com/cm/cs/awkbook/index.html"
-SRC_URI="mirror://gentoo.org/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-macos"
-IUSE=""
-
-RDEPEND="app-admin/eselect-awk"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-S="${WORKDIR}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" ALLOC="${LDFLAGS}" YACC=$(type -p yacc)
-}
-
-src_install() {
-	newbin a.out "${PN}"
-	sed -e 's/awk/nawk/g' \
-		-e 's/AWK/NAWK/g' \
-		-e 's/Awk/Nawk/g' \
-		awk.1 > "${PN}".1 || die "manpage patch failed"
-	doman "${PN}".1
-	dodoc README FIXES
-}
-
-pkg_postinst() {
-	eselect awk update ifunset
-}
-
-pkg_postrm() {
-	eselect awk update ifunset
-}
diff --git a/sys-apps/nawk/nawk-20121220-r1.ebuild b/sys-apps/nawk/nawk-20121220-r2.ebuild
index 4547c7aa522c..a840deab0f5e 100644
--- a/sys-apps/nawk/nawk-20121220-r1.ebuild
+++ b/sys-apps/nawk/nawk-20121220-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/nawk-20121220-r1.ebuild,v 1.1 2013/02/06 03:29:55 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/nawk-20121220-r2.ebuild,v 1.1 2013/02/07 16:57:28 ottxor Exp $
 
 EAPI="4"
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Brian Kernighan's pattern scanning and processing language"
 HOMEPAGE="http://cm.bell-labs.com/cm/cs/awkbook/index.html"
@@ -21,6 +21,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"
 
+src_prepare() {
+	rm -f ytab.[hc]
+	epatch "${FILESDIR}/${P}"-parallel-build.patch
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS=-DHAS_ISBLANK ALLOC="${LDFLAGS}" YACC=$(type -p yacc) YFLAGS="-d"
 }