Add monotone.eclass for magus. Improve mv_mozextension.eclass messages

3 files changed, 64 insertions, 302 deletions

diff --git a/games-rpg/magus/Manifest b/games-rpg/magus/Manifest
index a0ede7f0..c7141c3c 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 4308 RMD160 72c7b53398860efa38349d09340b050870ed0772 SHA1 bf9933b7e6b12b573584acbd6e438c4ed93738b9 SHA256 a3476324057b050b26e3a8cdef59240730b803a155f5f8e082c5029976887868
-EBUILD magus-99999999.ebuild 6176 RMD160 063e7bce4437730bc495010f76e35391fcf4edac SHA1 62a88adb5976d6fcdef5f45479b2c364bec81444 SHA256 9e1eb592ef58dc1c46c7622a28a0c7cce87519072e3789cd01f4dfcbd9221f79
+EBUILD magus-1.3.1.ebuild 4805 RMD160 47750af656b3ccc32ee9079c96db08ca937e43e7 SHA1 5e96cec508892166baaed4b3943bffc648a6d549 SHA256 58ba59c04c691d96f1a65cbe32df9fc7c7ab7950836ac41e95481adc251fff41
+EBUILD magus-99999999.ebuild 4805 RMD160 47750af656b3ccc32ee9079c96db08ca937e43e7 SHA1 5e96cec508892166baaed4b3943bffc648a6d549 SHA256 58ba59c04c691d96f1a65cbe32df9fc7c7ab7950836ac41e95481adc251fff41
 MISC ChangeLog 3210 RMD160 2c7e41a151b5b06e815b2fdba5199f9035c25dc4 SHA1 acf244a29a3140dab52d001a4f9392278b33881a SHA256 3bb15e8b40f958924e23789206b2ab54792363ded2ebe812b5ed97d9b9af352f
 MISC metadata.xml 740 RMD160 bccd3d44204e485633af464079e10830e43e6a1a SHA1 ebe28578b6af419e8a7c3e9f273b112374c21f9c SHA256 79bb6a5c6e33571bdd8309409b22aab6fb52004dbf4bc37ab0910bbcf8099654
diff --git a/games-rpg/magus/magus-1.3.1.ebuild b/games-rpg/magus/magus-1.3.1.ebuild
index c8034b1b..d6487128 100644..120000
--- a/games-rpg/magus/magus-1.3.1.ebuild
+++ b/games-rpg/magus/magus-1.3.1.ebuild
@@ -1,182 +1 @@
-# 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
-}
-
+magus-99999999.ebuild
\ No newline at end of file
diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild
index 999951df..230fb90c 100644
--- a/games-rpg/magus/magus-99999999.ebuild
+++ b/games-rpg/magus/magus-99999999.ebuild
@@ -2,17 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header $
 
-EAPI="2"
-inherit autotools
+EAPI="3"
+inherit autotools flag-o-matic
+
+case "${PV}" in
+9999*)
+	LIVE_VERSION=:
+	;;
+*)
+	LIVE_VERSION=false
+	;;
+esac
+
+${LIVE_VERSION} && inherit monotone
 
 DESCRIPTION="A character generator for the popular German role playing game Midgard"
 HOMEPAGE="http://midgard.berlios.de"
-SRC_URI=""
+SRC_URI="ftp://ftp.berlios.de/pub/midgard/Source/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+if ${LIVE_VERSION}
+then	PROPERTIES="live"
+	SRC_URI=""
+	EMTN_REPO_URI="petig-baender.dyndns.org"
+	KEYWORDS=""
+fi
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="firefox seamonkey kde pdf postgres"
-PROPERTIES="live"
 
 DEPENDCOMMON=">=dev-libs/libsigc++-2.0.1
 	>=dev-cpp/gtkmm-2.4.0
@@ -21,85 +37,28 @@ DEPENDCOMMON=">=dev-libs/libsigc++-2.0.1
 	!postgres? ( >=dev-db/sqlite-3 )"
 
 DEPEND="${DEPENDCOMMON}
-	media-gfx/pngcrush
-	dev-vcs/monotone
-	!games-rpg/magus-cvs
-	!games-rpg/magus-live"
+	media-gfx/pngcrush"
 
-RDEPEND="${DEPENDCOMMON}
+RDEPEND="${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 )"
 
-mtn_fetch() {
-	if ! test -d "${MTN_TOP_DIR}"
-	then
-		addwrite /foobar
-		addwrite /
-		mkdir -p -- "/${MTN_TOP_DIR}"
-		export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
-	fi
-	cd -P -- "${MTN_TOP_DIR}" >/dev/null || die "cannot cd to ${MTN_TOP_DIR}"
-	MTN_TOP_DIR="${PWD}"
-	addwrite "${MTN_TOP_DIR}"
-
-	if ! test -e "${MTN_DB}"
-	then
-		mtn -d "${MTN_DB}" db init || die "mtn init failed"
-		mtn -d "${MTN_DB}" pull "petig-baender.dyndns.org" "*" || \
-			die "mtn pull failed"
-	else
-		mtn -d "${MTN_DB}" pull || die "mtn pull failed"
-	fi
+if ${LIVE_VERSION}
+then
+src_unpack () {
+	monotone_fetch
+	monotone_co "" "manuproc.berlios.de/ManuProC_Base"
+	monotone_co "" "manuproc.berlios.de/GtkmmAddons"
+	monotone_co "" "manuproc.berlios.de/ManuProC_Widgets"
+	monotone_co "" "midgard.berlios.de/midgard"
+	monotone_finish
 }
+fi
 
-mtn_co_module() {
-	local p m r
-	p="${1}"
-	m="${1##*/}"
-	shift
-	if [ ${#} -gt 0 ]
-	then
-		[ "${1}" = '--' ] || m="${1}"
-		shift
-	fi
-	if [ ${#} -eq 0 ]
-	then
-		r=`mtn -d "${MTN_DB}" automate heads "${p}" | tail -n1`
-		set -- -r "${r}"
-	fi
-	test -d "${m}" && rm -rf -- "${m}"
-	mtn -d "${MTN_DB}" -b "${p}" co "${@}" "${m}" || \
-		die "mtn -d ${MTN_DB} -b ${p} co ${*} ${m} failed"
-}
-
-mtn_co() {
-	einfo "Copying database ${MTN_DB_FULL} ..."
-	test -d "${S}" || mkdir -p -- "${S}" || die "mkdir ${S} failed"
-	cd -- "${S}" >/dev/null
-	cp -p -- "${MTN_DB_FULL}" "${MTN_DB}"
-	einfo "Checking out from temporary ${MTN_DB} ..."
-	mtn_co_module "manuproc.berlios.de/ManuProC_Base"
-	mtn_co_module "manuproc.berlios.de/GtkmmAddons"
-	mtn_co_module "manuproc.berlios.de/ManuProC_Widgets"
-	mtn_co_module "midgard.berlios.de/midgard"
-	rm -- "${MTN_DB}" || die "cannot remove temporary ${MTN_DB}"
-}
-
-mtn_src_unpack() {
-	: ${EMTN_OFFLINE:="${ESCM_OFFLINE}"}
-	case "${EMTN_OFFLINE:-0}" in
-		n*|N*|f*|F*|0)
-			mtn_fetch || die "mtn fetch failed."
-			;;
-		*)	test -e "${MTN_DB_FULL}" || \
-			die "Offline mode specified, but database ${MTN_DB_FULL} not found. Aborting."
-			;;
-	esac
-}
-
-src_sed() {
+src_sed () {
 	local short file ori ignore remove
 	ignore=false
 	remove=false
@@ -108,8 +67,7 @@ src_sed() {
 		-i) ignore=true;;
 		*) false;;
 	esac
-	do
-		shift
+	do	shift
 	done
 	short="${1}"
 	file="${S}/${short}"
@@ -117,9 +75,7 @@ src_sed() {
 	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
+	then	die "Expected file ${short} does not exist"
 	fi
 	einfo "Patching ${short}"
 	mv -- "${file}" "${ori}"
@@ -131,19 +87,8 @@ src_sed() {
 	return 0
 }
 
-mtn_unpack() {
-	local MTN_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/mtn-src"
-	local MTN_DB="magus.db"
-	local MTN_DB_FULL="${MTN_TOP_DIR}/${MTN_DB}"
-	mtn_src_unpack
-	mtn_co "${MTN_DB}"
-}
-
-src_unpack() {
-	mtn_unpack
-}
-
-src_patch() {
+src_patch () {
+	local browser
 	einfo
 	einfo "Various patches:"
 	einfo
@@ -155,7 +100,7 @@ src_patch() {
 		ewarn "Unneeded patching of midgard/libmagus/Makefile.am"
 	src_sed midgard/libmagus/Makefile.am -e "2iLIBS=-lManuProC_Base"
 
-	local browser="mozilla"
+	browser="mozilla"
 	use seamonkey && browser="seamonkey"
 	use firefox && browser="firefox"
 	use kde && browser="konqueror"
@@ -166,11 +111,11 @@ src_patch() {
 	src_sed midgard/src/table_optionen_glade.cc -e "s#mozilla#${browser}#"
 }
 
-my_cd() {
+my_cd () {
 	cd -- "${S}/${1}" >/dev/null || die "cd ${1} failed"
 }
 
-my_autoreconf() {
+my_autoreconf () {
 	einfo
 	einfo "eautoreconf ${1}:"
 	einfo
@@ -180,31 +125,29 @@ my_autoreconf() {
 	eautoreconf
 }
 
-src_prepare() {
-	src_patch
+src_prepare () {
 	local i
+	src_patch
 	for i in "${S}"/*
-	do
-		my_autoreconf "${i##*/}"
+	do	my_autoreconf "${i##*/}"
 	done
 }
 
-my_conf() {
+my_conf () {
 	einfo
 	einfo "configuring ${1}"
 	einfo
 	my_cd "${1}"
 	shift
 	if [ -z "${COMMON_CONF}" ]
-	then
-		COMMON_CONF="$(use_enable !postgres sqlite)"
+	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() {
+my_make () {
 	einfo
 	einfo "making ${*}"
 	einfo
@@ -212,7 +155,7 @@ my_make() {
 	emake || die "emake in ${1} failed"
 }
 
-my_confmake() {
+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)"
@@ -222,22 +165,24 @@ my_confmake() {
 	my_conf "midgard"
 }
 
-src_configure() {
+src_configure () {
+	filter-flags -flto -fwhole-program
 	my_conf "ManuProC_Base"
 	my_conf "GtkmmAddons"
 	my_confmake
 }
 
-src_compile() {
+src_compile () {
 	my_make "midgard"
 }
 
-my_install() {
+my_install () {
 	my_cd "${1}"
 	emake DESTDIR="${D}" install || die "make install in ${1} failed"
 }
 
-src_install() {
+src_install () {
+	local myicon myres
 	my_install "ManuProC_Base"
 	my_install "midgard"
 	find "${D}" -name "*.la" -type f -exec rm -v -- '{}' '+'
@@ -249,14 +194,12 @@ src_install() {
 	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}"
+	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
 }