[gentoo-commits] gentoo-x86 commit in games-strategy/wesnoth: ChangeLog wesnoth-1.8.ebuild

["Michael Sterrett (mr_bones_)" <mr_bones_@gentoo.org>]

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/wesnoth/ChangeLog?rev=1.177&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.177&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?r1=1.176&r2=1.177

Index: ChangeLog
===================================================================
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 <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
+  another attempt at sane boost handling
 
   07 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
   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/wesnoth/wesnoth-1.8.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild?r1=1.7&r2=1.8

Index: wesnoth-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,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.ebuild,v 1.7 2010/04/07 03:13:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.8 2010/04/07 19:44:58 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
@@ -22,8 +22,7 @@
 	!dedicated? (
 		dbus? ( sys-apps/dbus )
 	)
-	amd64? ( >=dev-libs/boost-1.35:0 )
-	!amd64? ( || ( dev-libs/boost:1.42 dev-libs/boost:1.41 >=dev-libs/boost-1.35:0 ) )
+	>=dev-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=1_35
-	else
-		has_version dev-libs/boost:0    && boost_ver=1_35
-		has_version dev-libs/boost:1.41 && boost_ver=1_41
-		has_version dev-libs/boost:1.42 && boost_ver=1_42
-	fi
+	local boost_ver=$(best_version ">=dev-libs/boost-1.35")
+
+	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() {