diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-09-17 22:30:05 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-09-17 22:30:05 +0000 |
| commit | 4ce247407d6a51642d51fd4c4d06cd8a080df20d (patch) | |
| tree | b0dcda06b41a23e935312750d46b80bc690cf2ab /games-strategy | |
| parent | reorder deps so konsole isn't default (not everyone uses kde) (diff) | |
| download | gentoo-2-4ce247407d6a51642d51fd4c4d06cd8a080df20d.tar.gz gentoo-2-4ce247407d6a51642d51fd4c4d06cd8a080df20d.tar.bz2 gentoo-2-4ce247407d6a51642d51fd4c4d06cd8a080df20d.zip | |
fix some flags/dependencies, also wrt #435286
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/megaglest/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/megaglest/megaglest-3.6.0.3.ebuild | 17 | ||||
| -rw-r--r-- | games-strategy/megaglest/metadata.xml | 2 |
3 files changed, 13 insertions, 12 deletions
diff --git a/games-strategy/megaglest/ChangeLog b/games-strategy/megaglest/ChangeLog index da1fdd5d7089..a4bddc2b62b2 100644 --- a/games-strategy/megaglest/ChangeLog +++ b/games-strategy/megaglest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/megaglest # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.5 2012/09/08 21:49:44 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.6 2012/09/17 22:30:05 hasufell Exp $ + + 17 Sep 2012; Julian Ospald <hasufell@gentoo.org> megaglest-3.6.0.3.ebuild, + metadata.xml: + fix some flags/dependencies, also wrt #435286 08 Sep 2012; Julian Ospald <hasufell@gentoo.org> megaglest-3.6.0.3.ebuild: fix various compilation issues thanks to Arfrever diff --git a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild b/games-strategy/megaglest/megaglest-3.6.0.3.ebuild index 8485bf982262..7c0eff0583ca 100644 --- a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild +++ b/games-strategy/megaglest/megaglest-3.6.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.6.0.3.ebuild,v 1.5 2012/09/08 21:49:44 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.6.0.3.ebuild,v 1.6 2012/09/17 22:30:05 hasufell Exp $ EAPI=4 VIRTUALX_REQUIRED="manual" @@ -13,13 +13,14 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug +editor freetype +ftgl sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer" +IUSE="debug +editor sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer" RDEPEND=" >=dev-lang/lua-5.1 dev-libs/icu dev-libs/libxml2 media-libs/fontconfig + media-libs/freetype media-libs/libsdl[X,audio,joystick,opengl,video] media-libs/libvorbis media-libs/openal @@ -31,17 +32,16 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXext editor? ( x11-libs/wxGTK:2.8[X,opengl] ) - freetype? ( media-libs/freetype ) model-viewer? ( x11-libs/wxGTK:2.8[X] ) !static? ( - dev-libs/xerces-c + dev-libs/xerces-c[icu] + media-libs/ftgl media-libs/glew media-libs/libogg media-libs/libpng:0 net-libs/miniupnpc net-misc/curl virtual/jpeg - ftgl? ( media-libs/ftgl ) )" DEPEND="${RDEPEND} sys-apps/help2man @@ -49,14 +49,14 @@ DEPEND="${RDEPEND} editor? ( ${VIRTUALX_DEPEND} ) model-viewer? ( ${VIRTUALX_DEPEND} ) static? ( - dev-libs/xerces-c[static-libs] + dev-libs/xerces-c[icu,static-libs] + media-libs/ftgl[static-libs] media-libs/glew[static-libs] media-libs/libogg[static-libs] media-libs/libpng:0[static-libs] net-libs/miniupnpc[static-libs] net-misc/curl[static-libs] virtual/jpeg[static-libs] - ftgl? ( media-libs/ftgl[static-libs] ) )" PDEPEND="~games-strategy/${PN}-data-${PV}" @@ -98,8 +98,7 @@ src_configure() { -DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}" # icons are used at runtime, wrong default location share/pixmaps -DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}" - $(cmake-utils_use_use freetype FREETYPEGL) - $(cmake-utils_use_use ftgl FTGL) + -DUSE_FTGL=ON $(cmake-utils_use_want static STATIC_LIBS) $(cmake-utils_use_want streflop STREFLOP) -DWANT_SVN_STAMP=off diff --git a/games-strategy/megaglest/metadata.xml b/games-strategy/megaglest/metadata.xml index 445ba745b994..cea582a3be2b 100644 --- a/games-strategy/megaglest/metadata.xml +++ b/games-strategy/megaglest/metadata.xml @@ -13,8 +13,6 @@ </upstream> <use> <flag name='editor'>Build map editor</flag> - <flag name='freetype'>Use Freetype-GL for on-screen fonts</flag> - <flag name='ftgl'>Use FTGL for on-screen fonts</flag> <flag name='streflop'>Use the library streflop. Out of synchs may occur if not enabled.</flag> <flag name='tools'>Build model import/export tools</flag> |