diff options
| author |   Martin Väth <martin@mvath.de> | 2015-08-05 23:36:40 +0200 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2015-10-11 10:49:24 +0200 |
| commit | dbf4b322af3b2d614866a1e383a8c56198f672cc (patch) | |
| tree | 16a8aa6770d08a5800707c91b9931e12534ca2ec /games-rpg/magus | |
| parent | Bump mv_perl (diff) | |
| download | mv-dbf4b322af3b2d614866a1e383a8c56198f672cc.tar.gz mv-dbf4b322af3b2d614866a1e383a8c56198f672cc.tar.bz2 mv-dbf4b322af3b2d614866a1e383a8c56198f672cc.zip | |
magus: Fix build errors. Bump noscript
Diffstat (limited to 'games-rpg/magus')
| -rw-r--r-- | games-rpg/magus/ChangeLog | 3 | ||||
| -rw-r--r-- | games-rpg/magus/magus-99999999.ebuild | 28 |
2 files changed, 14 insertions, 17 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() { |