diff options
author | 2012-05-17 23:33:03 +0200 | |
---|---|---|
committer | 2015-10-11 10:48:07 +0200 | |
commit | 9f8a5f6849c8fea45a2e10d76e9fdc3042da3e74 (patch) | |
tree | a9e7a088eb532bf6ff568bd3ac14825d64fdc9a0 /games-rpg/magus | |
parent | Bump kernel (diff) | |
download | mv-9f8a5f6849c8fea45a2e10d76e9fdc3042da3e74.tar.gz mv-9f8a5f6849c8fea45a2e10d76e9fdc3042da3e74.tar.bz2 mv-9f8a5f6849c8fea45a2e10d76e9fdc3042da3e74.zip |
Remove REQUIRED_USE
Diffstat (limited to 'games-rpg/magus')
-rw-r--r-- | games-rpg/magus/ChangeLog | 3 | ||||
-rw-r--r-- | games-rpg/magus/magus-99999999.ebuild | 42 | ||||
-rw-r--r-- | games-rpg/magus/metadata.xml | 7 |
3 files changed, 32 insertions, 20 deletions
diff --git a/games-rpg/magus/ChangeLog b/games-rpg/magus/ChangeLog index aa98b344..f96cc6d8 100644 --- a/games-rpg/magus/ChangeLog +++ b/games-rpg/magus/ChangeLog @@ -4,6 +4,9 @@ *magus-1.3.3 (28 May 2011) + 17 May 2012; Martin Väth <martin@mvath.de> + Remove REQUIRED_USE; default to firefox + 12 May 2012; Martin Väth <martin@mvath.de> base->eutils diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild index 46701fc8..514d1405 100644 --- a/games-rpg/magus/magus-99999999.ebuild +++ b/games-rpg/magus/magus-99999999.ebuild @@ -8,11 +8,9 @@ RESTRICT="mirror" case ${PV} in 9999*) - LIVE_VERSION=: -;; + LIVE_VERSION=:;; *) - LIVE_VERSION=false -;; + LIVE_VERSION=false;; esac ${LIVE_VERSION} && inherit monotone @@ -29,7 +27,7 @@ then PROPERTIES="live" fi LICENSE="GPL-2" SLOT="0" -IUSE="+acroread firefox icecat konqueror postgres pngcrush seamonkey" +IUSE="+acroread icecat konqueror postgres pngcrush seamonkey" DEPENDCOMMON="dev-libs/libsigc++:2 dev-cpp/gtkmm:2.4 @@ -43,15 +41,19 @@ DEPEND="${DEPENDCOMMON} pngcrush? ( media-gfx/pngcrush )" RDEPEND="${DEPENDCOMMON} - firefox? ( || ( www-client/firefox www-client/firefox-bin ) ) + !icecat? ( + !seamonkey? ( + !konqueror? ( + || ( www-client/firefox www-client/firefox-bin ) + ) + ) + ) icecat? ( www-client/icecat ) seamonkey? ( www-client/seamonkey ) konqueror? ( kde-base/konqueror ) acroread? ( app-text/acroread ) virtual/libintl" -REQUIRED_USE="^^ ( firefox icecat seamonkey konqueror )" - if ${LIVE_VERSION} then src_unpack() { @@ -111,8 +113,17 @@ src_sed() { return 0 } +set_browser() { + einfo "Using browser ${browser}" + [ "${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}#" +} + src_patch() { - local browser i + local i einfo einfo "Various patches:" einfo @@ -128,14 +139,13 @@ src_patch() { 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 + for i in icecat seamonkey konqueror + do if use "${i}" + then set_browser "${i}" + return + fi done - [ "${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}#" + set_browser "firefox" } my_cd() { diff --git a/games-rpg/magus/metadata.xml b/games-rpg/magus/metadata.xml index b3923915..25035951 100644 --- a/games-rpg/magus/metadata.xml +++ b/games-rpg/magus/metadata.xml @@ -20,11 +20,10 @@ </upstream> <use> <flag name="acroread">Depend on acroread (otherwise you are responsible to install/configure a pdf viewer)</flag> - <flag name="firefox">Depend on firefox browser (without a browser useflag you are responsible to install and configure a browser)</flag> - <flag name="icecat">Depend on icecat browser</flag> - <flag name="konqueror">Depend on konqueror browser</flag> + <flag name="icecat">Depend on icecat browser instead of firefox</flag> + <flag name="konqueror">Depend on konqueror browser instead of firefox</flag> <flag name="postgres">Use postgresql instead of sqlite</flag> - <flag name="seamonkey">Depend on seamonkey browser</flag> + <flag name="seamonkey">Depend on seamonkey browser instead of firefox</flag> <flag name="pngcrush">Use pngcrush for opimizing png before installation</flag> </use> </pkgmetadata> |