From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A8FF81388BF for ; Wed, 13 Jan 2016 06:34:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4934A21C00C; Wed, 13 Jan 2016 06:34:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E229221C00C for ; Wed, 13 Jan 2016 06:34:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1BAD2340A5C for ; Wed, 13 Jan 2016 06:34:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1391EA16 for ; Wed, 13 Jan 2016 06:34:19 +0000 (UTC) From: "Michael Sterrett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Sterrett" Message-ID: <1452666849.a1396d44cd994b3bd50139f461d1c3a68d1665b3.mr_bones_@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/widelands/widelands-0.17.ebuild X-VCS-Directories: games-strategy/widelands/ X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett X-VCS-Revision: a1396d44cd994b3bd50139f461d1c3a68d1665b3 X-VCS-Branch: master Date: Wed, 13 Jan 2016 06:34:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ac2c30b9-c8da-4f7b-9afb-cecc6b999f17 X-Archives-Hash: e95700bc37e356025cc6ae9a6cae1cbe commit: a1396d44cd994b3bd50139f461d1c3a68d1665b3 Author: Michael Sterrett gentoo org> AuthorDate: Wed Jan 13 06:34:09 2016 +0000 Commit: Michael Sterrett gentoo org> CommitDate: Wed Jan 13 06:34:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1396d44 games-strategy/widelands: add slot deps for dev-lang/lua and media-libs/libpng; tidy Package-Manager: portage-2.2.26 games-strategy/widelands/widelands-0.17.ebuild | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild index 9f32421..c27274c 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 toolchain-funcs flag-o-matic cmake-utils games +inherit eutils versionator 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 +DEPEND="dev-lang/lua:0 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 + media-libs/libpng:0 sys-libs/zlib media-libs/glew media-libs/sdl-ttf @@ -43,21 +43,6 @@ 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() {