magus: Fix build errors. Bump noscript

5 files changed, 21 insertions, 19 deletions

diff --git a/games-rpg/magus/ChangeLog b/games-rpg/magus/ChangeLog
index ed83e83b..4422bda3 100644
--- a/games-rpg/magus/ChangeLog
+++ b/games-rpg/magus/ChangeLog
@@ -4,6 +4,9 @@
 
 *magus-1.3.1 (28 Dec 2014)
 
+  06 Aug 2015; Martin Väth <martin@mvath.de>:
+  Remove multiprocessing to avoid strange build errors
+
   02 Jan 2015; Martin Väth <martin@mvath.de>:
   Update postgresql dependency
 
diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild
index f9d48240..c0efa05a 100644
--- a/games-rpg/magus/magus-99999999.ebuild
+++ b/games-rpg/magus/magus-99999999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-inherit autotools eutils flag-o-matic multiprocessing
+inherit autotools eutils flag-o-matic
 RESTRICT="mirror"
 
 FETCH_RESTRICT=false
@@ -140,12 +140,10 @@ set_browser() {
 	else	einfo "USE=${browser} overrides default browser firefox:"
 	fi
 	einfo
-	multijob_init
-	multijob_child_init src_sed midgard/docs/BMod_Op.html -e "s#mozilla#${browser}#"
-	multijob_child_init src_sed midgard/libmagus/Magus_Optionen.cc -e "s#mozilla#${browser}#"
-	multijob_child_init src_sed midgard/midgard.glade -e "s#mozilla#${browser}#"
-	multijob_child_init src_sed midgard/src/table_optionen_glade.cc -e "s#mozilla#${browser}#"
-	multijob_finish || die "patching of browser failed"
+	src_sed midgard/docs/BMod_Op.html -e "s#mozilla#${browser}#"
+	src_sed midgard/libmagus/Magus_Optionen.cc -e "s#mozilla#${browser}#"
+	src_sed midgard/midgard.glade -e "s#mozilla#${browser}#"
+	src_sed midgard/src/table_optionen_glade.cc -e "s#mozilla#${browser}#"
 }
 
 src_patch() {
@@ -154,17 +152,15 @@ src_patch() {
 	einfo
 	grep "saebel.png" midgard/src/Makefile.am && \
 		ewarn "Unneeded patching of midgard/src/Makefile.am"
-	multijob_init
-	multijob_child_init src_sed midgard/src/Makefile.am \
+	src_sed midgard/src/Makefile.am \
 		-e 's/drache.png/Money-gray.png saebel.png drache.png/'
-	multijob_child_init src_sed ManuProC_Widgets/configure.in \
+	src_sed ManuProC_Widgets/configure.in \
 		-e 's/^[[:space:]]*AM_GNU_GETTEXT_VERSION/AM_GNU_GETTEXT_VERSION/'
-	multijob_child_init src_sed -g 'AM_GNU_GETTEXT_VERSION' ManuProC_Base/configure.in \
+	src_sed -g 'AM_GNU_GETTEXT_VERSION' ManuProC_Base/configure.in \
 		-e '/AC_SUBST(GETTEXT_PACKAGE)/iAM_GNU_GETTEXT_VERSION([0.17])'
-#	multijob_child_init src_cp ManuProC_Base/macros/petig.m4 ManuProC_Widgets/macros/petig.m4
-	multijob_child_init src_sed midgard/src/table_lernschema.cc \
+#	src_cp ManuProC_Base/macros/petig.m4 ManuProC_Widgets/macros/petig.m4
+	src_sed midgard/src/table_lernschema.cc \
 		-e '/case .*:$/{n;s/^[[:space:]]*\}/break;}/}'
-	multijob_finish || die "basic patching failed"
 	find . -name configure.in -exec sh -c 'for i
 	do	mv -- "${i}" "${i%in}ac"
 	done' sh '{}' +
@@ -189,11 +185,9 @@ src_prepare() {
 	einfo
 	einfo "Calling eautoreconf for all subprojects:"
 	einfo
-	multijob_init
 	for i in "${S}"/*
-	do	multijob_child_init my_autoreconf "${i##*/}"
+	do	my_autoreconf "${i##*/}"
 	done
-	multijob_finish || die "some eautoreconf failed"
 }
 
 my_conf() {
diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
index 2bc93375..2f51ece0 100644
--- a/www-plugins/noscript/ChangeLog
+++ b/www-plugins/noscript/ChangeLog
@@ -2,7 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*noscript-2.6.9.33 (33 Jul 2015)
+*noscript-2.6.9.34 (05 Aug 2015)
+
+  05 Aug 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*noscript-2.6.9.33 (31 Jul 2015)
 
   31 Jul 2015; Martin Väth <martin@mvath.de>:
   Version bump, remove old ebuild
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index f39e91c1..c4fd7e29 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1 +1 @@
-DIST noscript-2.6.9.33.xpi 548866 SHA256 f8c890fecc3373a311f06eacb8c87f2006cca0cf01eacc92921ce1571de65018 SHA512 72ee4bbc45b7fe4edb552dfbcf9b6c510c32980fcb501f065cabaf70f8f8906c377422f51e80303c0b43eed1ef1d7cb8ac5fcff91f4b38fa9204bc18804191bb WHIRLPOOL 79c3a667ead7b8b97651c6b88fe8d2679c467b7243016725453849aafdc2ce12908b912de7568e0c68d67ae79d55657e2e4605f1e929cd1873ca57d9f140d060
+DIST noscript-2.6.9.34.xpi 548893 SHA256 32d79e8df0348a0cd26a84eaed1d8fb4daad5eeface2949f815eda7576eee3e3 SHA512 9e83d28d6f2d4b8b87549dbdc14ab9465e3ede7881865be917b38fd38a3ff61a61de61973dba0cd99a90f30a3355bb72174c92756c7f659a067dc4867ab2e31a WHIRLPOOL 7f156764ab4e7338dc0c876fccfd6d5f6b7b28f1184aff469ea7841ebcaa9122e7f3871b72f1e251edbbd1343769d2cbc1c4bf6735b03e114c25af9427eef343
diff --git a/www-plugins/noscript/noscript-2.6.9.33.ebuild b/www-plugins/noscript/noscript-2.6.9.34.ebuild
index 82dc8b3b..82dc8b3b 100644
--- a/www-plugins/noscript/noscript-2.6.9.33.ebuild
+++ b/www-plugins/noscript/noscript-2.6.9.34.ebuild