Bump magus

4 files changed, 38 insertions, 13 deletions

diff --git a/games-rpg/magus/ChangeLog b/games-rpg/magus/ChangeLog
index d93617dd..6ad56203 100644
--- a/games-rpg/magus/ChangeLog
+++ b/games-rpg/magus/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+*magus-1.3.3 (28 May 2011)
+
+  28 May 2011; Martin Väth <martin@mvath.de>
+  Version bump and patch for missing autopoint support.
+  Remove old ebuild.
+
 *magus-1.3.1 (10 Mar 2010)
 
   03 Jan 2011; Martin Väth <martin@mvath.de>
diff --git a/games-rpg/magus/Manifest b/games-rpg/magus/Manifest
index 1526b103..3aee3573 100644
--- a/games-rpg/magus/Manifest
+++ b/games-rpg/magus/Manifest
@@ -1,5 +1,5 @@
-DIST magus-1.3.1.tar.bz2 7358580 RMD160 2a99db268e2d8802b948b1c88c57c53cfb1a5daf SHA1 36b7e33c37ece6482bb141b564c66dc83f6087c9 SHA256 f7f118dff53b53a45d612d870bc2c9fb151d9c3aeea6f006b74fc6ab41dcb4d6
-EBUILD magus-1.3.1.ebuild 4842 RMD160 1de5618d611b23d7c4a00bd5b70082a02b8a0c0a SHA1 c5fddb8fca712f4167987f08609a065574b46f91 SHA256 c2139173f49c6780c70bd64fde78f9cafa409854b15333288e3a419bcfa83af3
-EBUILD magus-99999999.ebuild 4842 RMD160 1de5618d611b23d7c4a00bd5b70082a02b8a0c0a SHA1 c5fddb8fca712f4167987f08609a065574b46f91 SHA256 c2139173f49c6780c70bd64fde78f9cafa409854b15333288e3a419bcfa83af3
-MISC ChangeLog 3520 RMD160 2a3027e86584efcaa2760ef88b83e5aafe84d62e SHA1 75d814d8b24d4eb3b49a22db6c6833a3ac8f1d29 SHA256 21b9018f5a1a3adc057e351539b6370fd6f44ffe59ac7019fe5b58dc6823c250
+DIST magus-1.3.3.tar.bz2 7417528 RMD160 c2dc25fa45523f18dcce511c7697463a004aa083 SHA1 4d61a814d92f69f2d562e4809268e7c0fd205520 SHA256 14d75aba616149e52252fe0f1d0bae796936295aacfb82f1f620d1efd20a8e86
+EBUILD magus-1.3.3.ebuild 5263 RMD160 5b1eb61ba33bfa603a2b735538ca952c597b025d SHA1 56c225cc9228aa64499994ca25623a771f1a89ee SHA256 939d07340ec63c79016392d5c57c9c55988cf83cd2d8c3a7cd47dccd484546c2
+EBUILD magus-99999999.ebuild 5263 RMD160 5b1eb61ba33bfa603a2b735538ca952c597b025d SHA1 56c225cc9228aa64499994ca25623a771f1a89ee SHA256 939d07340ec63c79016392d5c57c9c55988cf83cd2d8c3a7cd47dccd484546c2
+MISC ChangeLog 3690 RMD160 d4a6eeb72b212cbf307ea7a663629d1ae2b7220c SHA1 1575436797c66b283ecd618ce634f83b30a66ac6 SHA256 cd2e3d912096a97777b05f5289e4f7ea486f267c66460fd538c0e865fac97261
 MISC metadata.xml 764 RMD160 1ad76763bf7957a7670d2687db95aee30cc31d3a SHA1 d88e606be5c43297666ed67cdd9a50bee3cc5ae7 SHA256 abda9737ebb13a3ee0438f2ab02f00623298c2a5c85d143199c7c1b5c80bb797
diff --git a/games-rpg/magus/magus-1.3.1.ebuild b/games-rpg/magus/magus-1.3.3.ebuild
index d6487128..d6487128 120000
--- a/games-rpg/magus/magus-1.3.1.ebuild
+++ b/games-rpg/magus/magus-1.3.3.ebuild
diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild
index 6ca8e0f3..5c2d6793 100644
--- a/games-rpg/magus/magus-99999999.ebuild
+++ b/games-rpg/magus/magus-99999999.ebuild
@@ -38,6 +38,7 @@ DEPENDCOMMON=">=dev-libs/libsigc++-2.0.1
 	!postgres? ( >=dev-db/sqlite-3 )"
 
 DEPEND="${DEPENDCOMMON}
+	>=sys-devel/gettext-0.17
 	media-gfx/pngcrush"
 
 RDEPEND="${RDEPEND}
@@ -60,6 +61,19 @@ src_unpack() {
 }
 fi
 
+src_cp() {
+	einfo "cp ${1} ${2}"
+	test -f "${1}" || {
+		ewarn "File ${1} does not exist"
+		return 0
+	}
+	if ! test -e "${2}" || diff -q -- "${1}" "${2}" >/dev/null 2>&1
+	then	ewarn "cp ${1} ${2} appears no longer necessary"
+		return 0
+	fi
+	cp -- "${1}" "${2}"
+}
+
 src_sed() {
 	local short file ori ignore remove
 	ignore=false
@@ -94,16 +108,16 @@ src_patch() {
 	einfo
 	einfo "Various patches:"
 	einfo
-	src_sed midgard/tools/translate/translate.cc -e "1i#include <cstdlib>"
-	src_sed midgard/libmagus/MidgardBasicElement.cc -e "1i#include <cstdio>"
-	src_sed ManuProC_Base/src/Makefile.am \
-		-e "s/ \$(includedir)/ \$(DESTDIR)\$(includedir)/"
-	grep "^LIB" midgard/libmagus/Makefile.am && \
-		ewarn "Unneeded patching of midgard/libmagus/Makefile.am"
-	src_sed midgard/libmagus/Makefile.am -e "2iLIBS=-lManuProC_Base"
+	grep "saebel.png" midgard/src/Makefile.am && \
+		ewarn "Unneeded patching of midgard/src/Makefile.am"
+	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_cp ManuProC_Base/macros/petig.m4 ManuProC_Widgets/macros/petig.m4
 
 	for i in konqueror icecat seamonkey firefox mozilla
-	do	use "${i}" && browser="${i}" &&	break
+	do	use "${i}" && browser="${i}" && break
 	done
 	[ "${browser}" = "mozilla" ] && return
 	src_sed midgard/docs/BMod_Op.html -e "s#mozilla#${browser}#"
@@ -123,6 +137,10 @@ my_autoreconf() {
 	my_cd "${1}"
 	export AT_M4DIR
 	test -d macros && AT_M4DIR="macros" || AT_M4DIR=""
+	if grep -q 'AM_GNU_GETTEXT' configure.in
+	then	einfo "Running autopoint --force"
+		autopoint --force >/dev/null || die "autopoint failed"
+	fi
 	eautoreconf
 }
 
@@ -185,8 +203,9 @@ my_install() {
 src_install() {
 	local myicon myres
 	my_install "ManuProC_Base"
-	rm -rf -- "${ED}"/usr/include
+	my_install "ManuProC_Widgets"
 	my_install "midgard"
+	rm -rf -- "${ED}"/usr/include
 	find "${ED}" -name "*.la" -type f -exec rm -v -- '{}' '+'
 
 	insinto "/usr/share/magus"