summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-12-21 17:57:13 -0500
committerMichael Sterrett <mr_bones_@gentoo.org>2015-12-21 17:57:13 -0500
commit0ee810ed8842319135f58a44e2d39b3b773b3a28 (patch)
treee5cab727b0faabd56db8c2b61cf966b151cc292b /games-strategy/widelands
parentmask games-fps/ut2004-ultraduel for removal (diff)
downloadgentoo-0ee810ed8842319135f58a44e2d39b3b773b3a28.tar.gz
gentoo-0ee810ed8842319135f58a44e2d39b3b773b3a28.tar.bz2
gentoo-0ee810ed8842319135f58a44e2d39b3b773b3a28.zip
Revert "mask games-fps/ut2004-ultraduel for removal"
This reverts commit cf00534e64f93c0992faf2584a970f1910afcc5a.
Diffstat (limited to 'games-strategy/widelands')
-rw-r--r--games-strategy/widelands/widelands-0.17.ebuild21
1 files changed, 18 insertions, 3 deletions
diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild
index c27274c02704..9f32421c6dbb 100644
--- a/games-strategy/widelands/widelands-0.17.ebuild
+++ b/games-strategy/widelands/widelands-0.17.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils versionator cmake-utils games
+inherit eutils versionator toolchain-funcs flag-o-matic cmake-utils games
MY_PV=build$(get_version_component_range 2)
MY_P=${PN}-${MY_PV}-src
@@ -16,13 +16,13 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
-DEPEND="dev-lang/lua:0
+DEPEND="dev-lang/lua
media-libs/libsdl[video]
media-libs/sdl-image[jpeg,png]
media-libs/sdl-mixer[vorbis]
media-libs/sdl-gfx
media-libs/sdl-net
- media-libs/libpng:0
+ media-libs/libpng
sys-libs/zlib
media-libs/glew
media-libs/sdl-ttf
@@ -43,6 +43,21 @@ src_prepare() {
sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die
sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die
sed -i -e '/Boost_USE_STATIC_LIBS/s:ON:OFF:' CMakeLists.txt || die
+
+ # how do I hate boost? Let me count the ways...
+ local boost_ver=$(best_version ">=dev-libs/boost-1.37")
+
+ boost_ver=${boost_ver/*boost-/}
+ boost_ver=${boost_ver%.*}
+ boost_ver=${boost_ver/./_}
+
+ einfo "Using boost version ${boost_ver}"
+ append-cxxflags \
+ -I/usr/include/boost-${boost_ver}
+ append-ldflags \
+ -L/usr/$(get_libdir)/boost-${boost_ver}
+ export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
+ export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
}
src_configure() {