summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2012-02-12 14:14:36 +0100
committerMartin Väth <martin@mvath.de>2015-10-11 10:47:17 +0200
commit267729968a9e18b345c871ade27265d51de7c721 (patch)
treeb74b8a4843034e33135d988e36594a72896bb3b2 /games-rpg
parentsquashfs-tools: Rename USE lzma->xz and other changes from gentoo main tree (diff)
downloadmv-267729968a9e18b345c871ade27265d51de7c721.tar.gz
mv-267729968a9e18b345c871ade27265d51de7c721.tar.bz2
mv-267729968a9e18b345c871ade27265d51de7c721.zip
Add fixes for current magus live ebuild. Update checksums
Diffstat (limited to 'games-rpg')
-rw-r--r--games-rpg/magus/magus-99999999.ebuild25
1 files changed, 17 insertions, 8 deletions
diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild
index d9433692..29a8ed1c 100644
--- a/games-rpg/magus/magus-99999999.ebuild
+++ b/games-rpg/magus/magus-99999999.ebuild
@@ -78,25 +78,30 @@ src_cp() {
}
src_sed() {
- local short file ori ignore remove
+ local short file ori ignore remove grep opt
ignore=false
remove=false
- while case "${1}" in
- -f) remove=true;;
- -i) ignore=true;;
- *) false;;
- esac
- do shift
+ grep=''
+ OPTIND=1
+ while getopts 'fig:' opt
+ do case "${opt}" in
+ f) remove=:;;
+ i) ignore=:;;
+ g) grep="${OPTARG}";;
+ esac
done
+ shift $(( ${OPTIND} - 1 ))
short="${1}"
file="${S}/${short}"
ori="${file}.ori"
- test -e "${ori}" && ${ignore} && ori="${file}.ori-1" && remove=true
+ test -e "${ori}" && ${ignore} && ori="${file}.ori-1" && remove=:
test -e "${ori}" && die "File ${ori} already exists"
if ! test -e "${file}"
then die "Expected file ${short} does not exist"
fi
einfo "Patching ${short}"
+ [ -n "${grep}" ] && grep -q -- "${grep}" "${file}" \
+ && ewarn "Redundant patching of ${short}"
mv -- "${file}" "${ori}"
shift
sed "${@}" -- "${ori}" >"${file}"
@@ -117,7 +122,11 @@ src_patch() {
-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 \
+ -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;}/}'
for i in konqueror icecat seamonkey firefox mozilla
do use "${i}" && browser="${i}" && break