diff options
| -rw-r--r-- | games-rpg/magus/ChangeLog | 6 | ||||
| -rw-r--r-- | games-rpg/magus/magus-99999999.ebuild | 27 | ||||
| -rw-r--r-- | games-rpg/magus/metadata.xml | 1 | ||||
| -rw-r--r-- | profiles/use.local.desc | 1 |
4 files changed, 20 insertions, 15 deletions
diff --git a/games-rpg/magus/ChangeLog b/games-rpg/magus/ChangeLog index fb935c3e..33ba029d 100644 --- a/games-rpg/magus/ChangeLog +++ b/games-rpg/magus/ChangeLog @@ -1,9 +1,13 @@ # ChangeLog for games-rpg/magus -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header $ *magus-1.3.3 (28 May 2011) + 13 Mar 2012; Martin Väth <martin@mvath.de> + Fix dependency on dev-cpp/gtkmm: slot 3 is not (yet?) supported upstream. + Introduce pngcrush useflag. + 30 Sep 2011; Martin Väth <martin@mvath.de> Fix dependencies, in particular do not require optional media-gfx/pngcrush diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild index 29a8ed1c..cbaaf6cf 100644 --- a/games-rpg/magus/magus-99999999.ebuild +++ b/games-rpg/magus/magus-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header $ @@ -6,7 +6,7 @@ EAPI="4" inherit autotools flag-o-matic RESTRICT="mirror" -case "${PV}" in +case ${PV} in 9999*) LIVE_VERSION=: ;; @@ -29,21 +29,20 @@ then PROPERTIES="live" fi LICENSE="GPL-2" SLOT="0" -IUSE="+acroread firefox icecat konqueror postgres seamonkey" +IUSE="+acroread firefox icecat konqueror postgres pngcrush seamonkey" DEPENDCOMMON=">=dev-libs/libsigc++-2.0.1 - >=dev-cpp/gtkmm-2.4.0 + >=dev-cpp/gtkmm-2.4.0:2.4 >=sys-devel/gettext-0.17 virtual/latex-base postgres? ( virtual/postgresql-server ) !postgres? ( >=dev-db/sqlite-3 ) || ( media-libs/netpbm media-gfx/graphicsmagick media-gfx/imagemagick )" -# media-gfx/pngcrush is supported but not strictly required -DEPEND="${DEPENDCOMMON}" +DEPEND="${DEPENDCOMMON} + pngcrush? ( media-gfx/pngcrush )" -RDEPEND="${RDEPEND} - ${DEPENDCOMMON} +RDEPEND="${DEPENDCOMMON} firefox? ( || ( www-client/firefox www-client/firefox-bin ) ) icecat? ( www-client/icecat ) seamonkey? ( www-client/seamonkey ) @@ -84,14 +83,14 @@ src_sed() { grep='' OPTIND=1 while getopts 'fig:' opt - do case "${opt}" in + do case ${opt} in f) remove=:;; i) ignore=:;; - g) grep="${OPTARG}";; + g) grep=${OPTARG};; esac done shift $(( ${OPTIND} - 1 )) - short="${1}" + short=${1} file="${S}/${short}" ori="${file}.ori" test -e "${ori}" && ${ignore} && ori="${file}.ori-1" && remove=: @@ -129,7 +128,7 @@ src_patch() { '/case .*:$/{n;s/^[ ]*\}/break;}/}' 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}#" @@ -233,8 +232,8 @@ src_install() { for myicon in pixmaps/desktop-icons/MAGUS-*.png do test -e "${myicon}" || continue - myres="${myicon##*/MAGUS?}" - myres="${myres%.png}" + myres=${myicon##*/MAGUS?} + myres=${myres%.png} insinto "/usr/share/icons/hicolor/${myres}/apps" doins "${myicon}" done diff --git a/games-rpg/magus/metadata.xml b/games-rpg/magus/metadata.xml index 6b33539e..f4d15705 100644 --- a/games-rpg/magus/metadata.xml +++ b/games-rpg/magus/metadata.xml @@ -13,5 +13,6 @@ <flag name="konqueror">Depend on konqueror browser</flag> <flag name="postgres">Use postgresql instead of sqlite</flag> <flag name="seamonkey">Depend on seamonkey browser</flag> + <flag name="pngcrush">Use pngcrush for opimizing png before installation</flag> </use> </pkgmetadata> diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 9590dcdb..ad76e030 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -15,6 +15,7 @@ games-rpg/magus:acroread - Depend on acroread (otherwise you are responsible to games-rpg/magus:firefox - Depend on firefox browser (without a browser useflag you are responsible to install and configure a browser) games-rpg/magus:icecat - Depend on icecat browser games-rpg/magus:konqueror - Depend on konqueror browser +games-rpg/magus:pngcrush - Use pngcrush for opimizing png before installation games-rpg/magus:postgres - Use postgresql instead of sqlite games-rpg/magus:seamonkey - Depend on seamonkey browser net-misc/sshstart:keychain - Pull in keychain as dependency. Not required, but recommended for smoother operation. |