Provide non-live version of magus. The live-version must be unmasked with **

6 files changed, 204 insertions, 6 deletions

diff --git a/games-rpg/magus-live/Manifest b/games-rpg/magus-live/Manifest
deleted file mode 100644
index bdefb901..00000000
--- a/games-rpg/magus-live/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD magus-live-1.3.1-r6.ebuild 6182 RMD160 2d7e965b44b021b280bea05c67a05859929b7a1a SHA1 2adfae3eb6ae8f287afc901b6b4b4bf08ef7b7c6 SHA256 aa5a30b6d48d4d8f292af178bbe74188815f9a7c85225aae49ae68e1ade8ead8
-MISC ChangeLog 2419 RMD160 3048b4e333963398c94cfaf9c5c68e73826c8c2c SHA1 20a4e1787721270ddcc0bad7b3adda3bdc2b904b SHA256 850697e4938b0712d466606b333d577722a78370805ed39a4529cd3604f1e695
-MISC metadata.xml 769 RMD160 010d93475dd540465e1cea8780f662397f92bdaa SHA1 59e77eb479dd6cbb3c7e7f930f88e48d41b823f8 SHA256 84724ab4904cf94ea23d6f0209ad22a3320fed5aef4f217af5f3d4bdd9d0a307
diff --git a/games-rpg/magus-live/ChangeLog b/games-rpg/magus/ChangeLog
index 2b60cb9d..03a1a5d9 100644
--- a/games-rpg/magus-live/ChangeLog
+++ b/games-rpg/magus/ChangeLog
@@ -2,6 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header $
 
+*magus-1.3.1 (03 May 2009)
+
+  31 Mar 2010; Martin Väth <martin@mvath.de> :
+  +magus-1.3.1.ebuild +magus-99999999.ebuild -magus-live-1.3.1-r6.ebuild:
+  Rename magus-live into magus: Since now some tarball is available and the
+  monotone repository is too often inaccessible, we do not install the
+  live-version by default. If you want to install the live version unmask
+  the magus-99999999 ebuild with
+  echo 'games-rpg/magus **' >>/etc/portage/package.keywords
+  Note that you can prevent the live version from fetching the monotone
+  repository by setting ESCM_OFFLINE=1 or EMTN_OFFLINE=1 (temporarily in the
+  environment or permanently in /etc/make.conf); the former will influence all
+  live ebuilds, the latter only those which use monotone (currently only magus)
+
 *magus-live-1.3.1 (03 May 2009)
 
   10 Mar 2010; Martin Väth <martin@mvath.de> :
diff --git a/games-rpg/magus/Manifest b/games-rpg/magus/Manifest
new file mode 100644
index 00000000..c5037594
--- /dev/null
+++ b/games-rpg/magus/Manifest
@@ -0,0 +1,5 @@
+DIST magus-1.3.1.tar.bz2 7358580 RMD160 2a99db268e2d8802b948b1c88c57c53cfb1a5daf SHA1 36b7e33c37ece6482bb141b564c66dc83f6087c9 SHA256 f7f118dff53b53a45d612d870bc2c9fb151d9c3aeea6f006b74fc6ab41dcb4d6
+EBUILD magus-1.3.1.ebuild 4308 RMD160 72c7b53398860efa38349d09340b050870ed0772 SHA1 bf9933b7e6b12b573584acbd6e438c4ed93738b9 SHA256 a3476324057b050b26e3a8cdef59240730b803a155f5f8e082c5029976887868
+EBUILD magus-99999999.ebuild 6176 RMD160 063e7bce4437730bc495010f76e35391fcf4edac SHA1 62a88adb5976d6fcdef5f45479b2c364bec81444 SHA256 9e1eb592ef58dc1c46c7622a28a0c7cce87519072e3789cd01f4dfcbd9221f79
+MISC ChangeLog 3210 RMD160 78fe5883a8070757c07cb191a4517cd8e4bf6a54 SHA1 79f779fcd9a76e2a13d1a3b9eb6e95be88285cc2 SHA256 9884c0747409260e571d9155065811428fe1893ee87cbc72b6eca37ba0254ef9
+MISC metadata.xml 769 RMD160 010d93475dd540465e1cea8780f662397f92bdaa SHA1 59e77eb479dd6cbb3c7e7f930f88e48d41b823f8 SHA256 84724ab4904cf94ea23d6f0209ad22a3320fed5aef4f217af5f3d4bdd9d0a307
diff --git a/games-rpg/magus/magus-1.3.1.ebuild b/games-rpg/magus/magus-1.3.1.ebuild
new file mode 100644
index 00000000..c8034b1b
--- /dev/null
+++ b/games-rpg/magus/magus-1.3.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+EAPI="2"
+inherit autotools
+RESTRICT="mirror"
+
+DESCRIPTION="A character generator for the popular German role playing game Midgard"
+HOMEPAGE="http://midgard.berlios.de"
+SRC_URI="ftp://ftp.berlios.de/pub/midgard/Source/magus-1.3.1.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="firefox seamonkey kde pdf postgres"
+
+DEPENDCOMMON=">=dev-libs/libsigc++-2.0.1
+	>=dev-cpp/gtkmm-2.4.0
+	virtual/latex-base
+	postgres? ( virtual/postgresql-server )
+	!postgres? ( >=dev-db/sqlite-3 )"
+
+DEPEND="${DEPENDCOMMON}
+	media-gfx/pngcrush
+	!games-rpg/magus-cvs
+	!games-rpg/magus-live"
+
+RDEPEND="${DEPENDCOMMON}
+	firefox? ( || ( www-client/mozilla-firefox www-client/mozilla-firefox-bin ) )
+	seamonkey? ( www-client/seamonkey )
+	kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+	pdf? ( app-text/acroread )"
+
+src_sed() {
+	local short file ori ignore remove
+	ignore=false
+	remove=false
+	while case "${1}" in
+		-f) remove=true;;
+		-i) ignore=true;;
+		*) false;;
+	esac
+	do
+		shift
+	done
+	short="${1}"
+	file="${S}/${short}"
+	ori="${file}.ori"
+	test -e "${ori}" && ${ignore} && ori="${file}.ori-1" && remove=true
+	test -e "${ori}" && die "File ${ori} already exists"
+	if ! test -e "${file}"
+	then
+		die "Expected file ${short} does not exist"
+		return 0
+	fi
+	einfo "Patching ${short}"
+	mv -- "${file}" "${ori}"
+	shift
+	sed "${@}" -- "${ori}" >"${file}"
+	! ${ignore} && cmp -s -- "${ori}" "${file}" \
+			&& ewarn "Unneeded patching of ${short}"
+	${remove} && rm -- "${ori}"
+	return 0
+}
+
+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"
+
+	local browser="mozilla"
+	use seamonkey && browser="seamonkey"
+	use firefox && browser="firefox"
+	use kde && browser="konqueror"
+	[ "${browser}" = "mozilla" ] && return
+	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}#"
+}
+
+my_cd() {
+	cd -- "${S}/${1}" >/dev/null || die "cd ${1} failed"
+}
+
+my_autoreconf() {
+	einfo
+	einfo "eautoreconf ${1}:"
+	einfo
+	my_cd "${1}"
+	export AT_M4DIR
+	test -d macros && AT_M4DIR="macros" || AT_M4DIR=""
+	eautoreconf
+}
+
+src_prepare() {
+	src_patch
+	local i
+	for i in "${S}"/*
+	do
+		my_autoreconf "${i##*/}"
+	done
+}
+
+my_conf() {
+	einfo
+	einfo "configuring ${1}"
+	einfo
+	my_cd "${1}"
+	shift
+	if [ -z "${COMMON_CONF}" ]
+	then
+		COMMON_CONF="$(use_enable !postgres sqlite)"
+		COMMON_CONF="${COMMON_CONF} $(use_with postgres postgresdir /usr)"
+		COMMON_CONF="${COMMON_CONF} --disable-static"
+	fi
+	econf ${COMMON_CONF} "${@}"
+}
+
+my_make() {
+	einfo
+	einfo "making ${*}"
+	einfo
+	my_cd "${1}"
+	emake || die "emake in ${1} failed"
+}
+
+my_confmake() {
+	# It is unfortunate that we must build here,
+	# but some ./configure's require make in other directories_
+	my_make "GtkmmAddons" "(needed for configuring ManuProC_Widget and midgard)"
+	my_make "ManuProC_Base" "(needed for configuring ManuProC_Widget and midgard)"
+	my_conf "ManuProC_Widgets"
+	my_make "ManuProC_Widgets" "(needed for configuring midgard)"
+	my_conf "midgard"
+}
+
+src_configure() {
+	my_conf "ManuProC_Base"
+	my_conf "GtkmmAddons"
+	my_confmake
+}
+
+src_compile() {
+	my_make "midgard"
+}
+
+my_install() {
+	my_cd "${1}"
+	emake DESTDIR="${D}" install || die "make install in ${1} failed"
+}
+
+src_install() {
+	my_install "ManuProC_Base"
+	my_install "midgard"
+	find "${D}" -name "*.la" -type f -exec rm -v -- '{}' '+'
+
+	insinto "/usr/share/magus"
+
+	my_cd "midgard"
+
+	doins -r docs
+	#doins xml/*.xml src/*.png src/*.tex
+
+	local MYICON MYRES
+	for MYICON in pixmaps/desktop-icons/MAGUS-*.png
+	do
+		test -e "${MYICON}" || continue
+		MYRES="${MYICON##*/MAGUS?}"
+		MYRES="${MYRES%.png}"
+		insinto "/usr/share/icons/hicolor/${MYRES}/apps"
+		doins "${MYICON}"
+	done
+}
+
diff --git a/games-rpg/magus-live/magus-live-1.3.1-r6.ebuild b/games-rpg/magus/magus-99999999.ebuild
index 1eb5c1a4..999951df 100644
--- a/games-rpg/magus-live/magus-live-1.3.1-r6.ebuild
+++ b/games-rpg/magus/magus-99999999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://midgard.berlios.de"
 SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="firefox seamonkey kde pdf postgres"
 PROPERTIES="live"
 
@@ -23,8 +23,8 @@ DEPENDCOMMON=">=dev-libs/libsigc++-2.0.1
 DEPEND="${DEPENDCOMMON}
 	media-gfx/pngcrush
 	dev-vcs/monotone
-	!games-rpg/magus
-	!games-rpg/magus-cvs"
+	!games-rpg/magus-cvs
+	!games-rpg/magus-live"
 
 RDEPEND="${DEPENDCOMMON}
 	firefox? ( || ( www-client/mozilla-firefox www-client/mozilla-firefox-bin ) )
diff --git a/games-rpg/magus-live/metadata.xml b/games-rpg/magus/metadata.xml
index a7aa61bd..a7aa61bd 100644
--- a/games-rpg/magus-live/metadata.xml
+++ b/games-rpg/magus/metadata.xml