magus: parallelize. aufs: block aufs{2,3} from the gentoo tree

6 files changed, 34 insertions, 20 deletions

diff --git a/games-rpg/magus/ChangeLog b/games-rpg/magus/ChangeLog
index 9e344dd7..c593a9dc 100644
--- a/games-rpg/magus/ChangeLog
+++ b/games-rpg/magus/ChangeLog
@@ -4,6 +4,9 @@
 
 *magus-1.3.3 (28 May 2011)
 
+  02 Aug 2012; Martin Väth <martin@mvath.de>
+  Parallelize patching and eautoreconf calls
+
   01 Jul 2012; Martin Väth <martin@mvath.de>
   Use prune_libtool_files --all
 
diff --git a/games-rpg/magus/Manifest b/games-rpg/magus/Manifest
index 83ba826e..09613c34 100644
--- a/games-rpg/magus/Manifest
+++ b/games-rpg/magus/Manifest
@@ -1 +1 @@
-DIST magus-1.3.3.tar.bz2 7417528 RMD160 c2dc25fa45523f18dcce511c7697463a004aa083 SHA1 4d61a814d92f69f2d562e4809268e7c0fd205520 SHA256 14d75aba616149e52252fe0f1d0bae796936295aacfb82f1f620d1efd20a8e86
+DIST magus-1.3.3.tar.bz2 7417528 SHA256 14d75aba616149e52252fe0f1d0bae796936295aacfb82f1f620d1efd20a8e86
diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild
index 0e2ec147..52c50eb8 100644
--- a/games-rpg/magus/magus-99999999.ebuild
+++ b/games-rpg/magus/magus-99999999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="4"
-inherit eutils autotools flag-o-matic
+inherit autotools eutils flag-o-matic multiprocessing
 RESTRICT="mirror"
 
 case ${PV} in
@@ -124,7 +124,7 @@ set_browser() {
 	einfo
 	if [ -z "${browser}" ]
 	then	browser="firefox"
-		einfo "Using default browser ${browser}:"
+		einfo "Patching for default browser ${browser}:"
 	elif [ "${browser}" = "mozilla" ]
 	then	einfo "Keeping upstream's default browser (mozilla)"
 			einfo
@@ -132,10 +132,12 @@ set_browser() {
 	else	einfo "USE=${browser} overrides default browser firefox:"
 	fi
 	einfo
-	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}#"
+	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_patch() {
@@ -144,15 +146,17 @@ src_patch() {
 	einfo
 	grep "saebel.png" midgard/src/Makefile.am && \
 		ewarn "Unneeded patching of midgard/src/Makefile.am"
-	src_sed  midgard/src/Makefile.am \
+	multijob_init
+	multijob_child_init src_sed midgard/src/Makefile.am \
 		-e 's/drache.png/Money-gray.png saebel.png drache.png/'
-	src_sed ManuProC_Widgets/configure.in \
-		-e 's/^[ 	]*AM_GNU_GETTEXT_VERSION/AM_GNU_GETTEXT_VERSION/'
-	src_sed -g 'AM_GNU_GETTEXT_VERSION' ManuProC_Base/configure.in \
+	multijob_child_init 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 \
 		-e '/AC_SUBST(GETTEXT_PACKAGE)/iAM_GNU_GETTEXT_VERSION([0.17])'
-#	src_cp ManuProC_Base/macros/petig.m4 ManuProC_Widgets/macros/petig.m4
-	src_sed midgard/src/table_lernschema.cc \
-		 '/case .*:$/{n;s/^[ 	]*\}/break;}/}'
+#	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 \
+		-e '/case .*:$/{n;s/^[[:space:]]*\}/break;}/}'
+	multijob_finish || die "basic patching failed"
 }
 
 my_cd() {
@@ -160,9 +164,6 @@ my_cd() {
 }
 
 my_autoreconf() {
-	einfo
-	einfo "eautoreconf ${1}:"
-	einfo
 	my_cd "${1}"
 	export AT_M4DIR
 	test -d macros && AT_M4DIR="macros" || AT_M4DIR=""
@@ -174,9 +175,14 @@ src_prepare() {
 	src_patch
 	epatch_user
 	set_browser
+	einfo
+	einfo "Calling eautoreconf for all subprojects:"
+	einfo
+	multijob_init
 	for i in "${S}"/*
-	do	my_autoreconf "${i##*/}"
+	do	multijob_child_init my_autoreconf "${i##*/}"
 	done
+	multijob_finish || die "some eautoreconf failed"
 }
 
 my_conf() {
diff --git a/sys-fs/aufs/ChangeLog b/sys-fs/aufs/ChangeLog
index 227ad5fd..d63772e6 100644
--- a/sys-fs/aufs/ChangeLog
+++ b/sys-fs/aufs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Jul 2012; Martin Väth <martin@mvath.de>
+  Block sys-fs/aufs{2,3} from the gentoo main tree
+
   12 May 2012; Martin Väth <martin@mvath.de>
   base->eutils
 
diff --git a/sys-fs/aufs/aufs-99999999.2.ebuild b/sys-fs/aufs/aufs-99999999.2.ebuild
index 36921b5e..10326295 100644
--- a/sys-fs/aufs/aufs-99999999.2.ebuild
+++ b/sys-fs/aufs/aufs-99999999.2.ebuild
@@ -25,7 +25,8 @@ KEYWORDS=""
 IUSE="kernel-patch all-patches"
 PROPERTIES="live"
 
-RDEPEND=""
+RDEPEND="!sys-fs/aufs2
+	!sys-fs/aufs3"
 DEPEND="dev-vcs/git[curl]"
 
 declare -a my_patchlist
diff --git a/sys-fs/aufs/aufs-99999999.3-r1.ebuild b/sys-fs/aufs/aufs-99999999.3-r1.ebuild
index 381f5e1e..d11862fe 100644
--- a/sys-fs/aufs/aufs-99999999.3-r1.ebuild
+++ b/sys-fs/aufs/aufs-99999999.3-r1.ebuild
@@ -25,7 +25,8 @@ KEYWORDS=""
 IUSE="kernel-patch all-patches"
 PROPERTIES="live"
 
-RDEPEND=""
+RDEPEND="!sys-fs/aufs2
+	!sys-fs/aufs3"
 DEPEND="dev-vcs/git[curl]"
 
 declare -a my_patchlist