From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NzbBO-0003Sa-RK for garchives@archives.gentoo.org; Wed, 07 Apr 2010 19:45:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73EE3E0A6B; Wed, 7 Apr 2010 19:45:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 38478E0A6B for ; Wed, 7 Apr 2010 19:45:01 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 18F751B4099 for ; Wed, 7 Apr 2010 19:45:00 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 665) id 28B7D2C04A; Wed, 7 Apr 2010 19:44:59 +0000 (UTC) From: "Michael Sterrett (mr_bones_)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mr_bones_@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in games-strategy/wesnoth: ChangeLog wesnoth-1.8.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog wesnoth-1.8.ebuild X-VCS-Directories: games-strategy/wesnoth X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett Content-Type: text/plain; charset=utf8 Message-Id: <20100407194459.28B7D2C04A@corvid.gentoo.org> Date: Wed, 7 Apr 2010 19:44:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ce6db518-2988-44e1-ac67-d755f8dc12bb X-Archives-Hash: 57edcced8b7a5d9d3bf8d6f644455d5b mr_bones_ 10/04/07 19:44:59 Modified: ChangeLog wesnoth-1.8.ebuild Log: another attempt at sane boost handling (Portage version: 2.1.7.17/cvs/Linux i686) Revision Changes Path 1.177 games-strategy/wesnoth/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wes= noth/ChangeLog?rev=3D1.177&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wes= noth/ChangeLog?rev=3D1.177&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wes= noth/ChangeLog?r1=3D1.176&r2=3D1.177 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- ChangeLog 7 Apr 2010 03:13:41 -0000 1.176 +++ ChangeLog 7 Apr 2010 19:44:58 -0000 1.177 @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/wesnoth # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.= 176 2010/04/07 03:13:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.= 177 2010/04/07 19:44:58 mr_bones_ Exp $ + + 07 Apr 2010; Michael Sterrett wesnoth-1.8.ebuil= d: + another attempt at sane boost handling =20 07 Apr 2010; Michael Sterrett wesnoth-1.8.ebuil= d: Expose the actual build commands to confirm proper behavior 1.8 games-strategy/wesnoth/wesnoth-1.8.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wes= noth/wesnoth-1.8.ebuild?rev=3D1.8&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wes= noth/wesnoth-1.8.ebuild?rev=3D1.8&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wes= noth/wesnoth-1.8.ebuild?r1=3D1.7&r2=3D1.8 Index: wesnoth-1.8.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebui= ld,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wesnoth-1.8.ebuild 7 Apr 2010 03:13:41 -0000 1.7 +++ wesnoth-1.8.ebuild 7 Apr 2010 19:44:58 -0000 1.8 @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.eb= uild,v 1.7 2010/04/07 03:13:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.eb= uild,v 1.8 2010/04/07 19:44:58 mr_bones_ Exp $ =20 EAPI=3D2 inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games @@ -22,8 +22,7 @@ !dedicated? ( dbus? ( sys-apps/dbus ) ) - amd64? ( >=3Ddev-libs/boost-1.35:0 ) - !amd64? ( || ( dev-libs/boost:1.42 dev-libs/boost:1.41 >=3Ddev-libs/boo= st-1.35:0 ) ) + >=3Ddev-libs/boost-1.35:0 sys-libs/zlib x11-libs/pango dev-lang/lua @@ -58,18 +57,19 @@ || die "sed failed" fi # how do I hate boost? Let me count the ways... - local boost_ver - if use amd64 ; then - boost_ver=3D1_35 - else - has_version dev-libs/boost:0 && boost_ver=3D1_35 - has_version dev-libs/boost:1.41 && boost_ver=3D1_41 - has_version dev-libs/boost:1.42 && boost_ver=3D1_42 - fi + local boost_ver=3D$(best_version ">=3Ddev-libs/boost-1.35") + + boost_ver=3D${boost_ver/*boost-/} + boost_ver=3D${boost_ver%.*} + boost_ver=3D${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=3D"/usr/include/boost-${boost_ver}" + export BOOST_LIBRARYDIR=3D"/usr/$(get_libdir)/boost-${boost_ver}" } =20 src_configure() {