public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in games-strategy/wesnoth: ChangeLog wesnoth-1.8.ebuild
@ 2010-03-26  6:50 Michael Sterrett (mr_bones_)
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-03-26  6:50 UTC (permalink / raw
  To: gentoo-commits

mr_bones_    10/03/26 06:50:00

  Modified:             ChangeLog wesnoth-1.8.ebuild
  Log:
  Doesn't work with some boost versions so build/link against specific versions
  (Portage version: 2.1.7.17/cvs/Linux i686)

Revision  Changes    Path
1.173                games-strategy/wesnoth/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.173&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.173&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?r1=1.172&r2=1.173

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- ChangeLog	25 Mar 2010 16:20:33 -0000	1.172
+++ ChangeLog	26 Mar 2010 06:50:00 -0000	1.173
@@ -1,6 +1,10 @@
 # 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.172 2010/03/25 16:20:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.173 2010/03/26 06:50:00 mr_bones_ Exp $
+
+  26 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
+  Doesn't work with some boost versions so build/link against specific
+  versions
 
 *wesnoth-1.8 (25 Mar 2010)
 



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

Index: wesnoth-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wesnoth-1.8.ebuild	25 Mar 2010 16:20:33 -0000	1.1
+++ wesnoth-1.8.ebuild	26 Mar 2010 06:50:00 -0000	1.2
@@ -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.1 2010/03/25 16:20:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.2 2010/03/26 06:50:00 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils toolchain-funcs flag-o-matic games
@@ -22,7 +22,7 @@
 	!dedicated? (
 		dbus? ( sys-apps/dbus )
 	)
-	>=dev-libs/boost-1.35
+	|| ( dev-libs/boost:1.42 dev-libs/boost:1.41 dev-libs/boost:1.37 dev-libs/boost:1.35 )
 	sys-libs/zlib
 	x11-libs/pango
 	dev-lang/lua
@@ -56,6 +56,15 @@
 			doc/CMakeLists.txt \
 			|| die "sed failed"
 	fi
+	# how do I hate boost? Let me count the ways...
+	has_version dev-libs/boost:1.35 && boost_ver=1_35
+	has_version dev-libs/boost:1.37 && boost_ver=1_37
+	has_version dev-libs/boost:1.41 && boost_ver=1_41
+	has_version dev-libs/boost:1.42 && boost_ver=1_42
+	append-cxxflags \
+		-I/usr/include/boost-${boost_ver}
+	append-ldflags \
+		-L/usr/$(get_libdir)/boost-${boost_ver}
 }
 
 src_configure() {






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in games-strategy/wesnoth: ChangeLog wesnoth-1.8.ebuild
@ 2010-03-27 22:34 Michael Sterrett (mr_bones_)
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-03-27 22:34 UTC (permalink / raw
  To: gentoo-commits

mr_bones_    10/03/27 22:34:46

  Modified:             ChangeLog wesnoth-1.8.ebuild
  Log:
  correct boost:0 handling (bug #311635)
  (Portage version: 2.1.7.17/cvs/Linux i686)

Revision  Changes    Path
1.174                games-strategy/wesnoth/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.174&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.174&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?r1=1.173&r2=1.174

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- ChangeLog	26 Mar 2010 06:50:00 -0000	1.173
+++ ChangeLog	27 Mar 2010 22:34:46 -0000	1.174
@@ -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.173 2010/03/26 06:50:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.174 2010/03/27 22:34:46 mr_bones_ Exp $
+
+  27 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
+  correct boost:0 handling (bug #311635)
 
   26 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
   Doesn't work with some boost versions so build/link against specific



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

Index: wesnoth-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wesnoth-1.8.ebuild	26 Mar 2010 07:43:49 -0000	1.3
+++ wesnoth-1.8.ebuild	27 Mar 2010 22:34:46 -0000	1.4
@@ -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.3 2010/03/26 07:43:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.4 2010/03/27 22:34:46 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils toolchain-funcs flag-o-matic games
@@ -22,7 +22,7 @@
 	!dedicated? (
 		dbus? ( sys-apps/dbus )
 	)
-	|| ( dev-libs/boost:1.42 dev-libs/boost:1.41 dev-libs/boost:1.35 )
+	|| ( dev-libs/boost:1.42 dev-libs/boost:1.41 >=dev-libs/boost-1.35:0 )
 	sys-libs/zlib
 	x11-libs/pango
 	dev-lang/lua
@@ -57,7 +57,7 @@
 			|| die "sed failed"
 	fi
 	# how do I hate boost? Let me count the ways...
-	has_version dev-libs/boost:1.35 && boost_ver=1_35
+	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
 	append-cxxflags \






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in games-strategy/wesnoth: ChangeLog wesnoth-1.8.ebuild
@ 2010-04-02 15:27 Michael Sterrett (mr_bones_)
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-04-02 15:27 UTC (permalink / raw
  To: gentoo-commits

mr_bones_    10/04/02 15:27:11

  Modified:             ChangeLog wesnoth-1.8.ebuild
  Log:
  Clamp amd64 to the one version of boost that works for them.
  (Portage version: 2.1.7.17/cvs/Linux i686)

Revision  Changes    Path
1.175                games-strategy/wesnoth/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.175&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.175&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?r1=1.174&r2=1.175

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- ChangeLog	27 Mar 2010 22:34:46 -0000	1.174
+++ ChangeLog	2 Apr 2010 15:27:10 -0000	1.175
@@ -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.174 2010/03/27 22:34:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.175 2010/04/02 15:27:10 mr_bones_ Exp $
+
+  02 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
+  Clamp amd64 to the one version of boost that works for them.
 
   27 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
   correct boost:0 handling (bug #311635)



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

Index: wesnoth-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wesnoth-1.8.ebuild	27 Mar 2010 22:34:46 -0000	1.4
+++ wesnoth-1.8.ebuild	2 Apr 2010 15:27:10 -0000	1.5
@@ -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.4 2010/03/27 22:34:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.5 2010/04/02 15:27:10 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils toolchain-funcs flag-o-matic games
@@ -22,7 +22,8 @@
 	!dedicated? (
 		dbus? ( sys-apps/dbus )
 	)
-	|| ( dev-libs/boost:1.42 dev-libs/boost:1.41 >=dev-libs/boost-1.35:0 )
+	amd64? ( >=dev-libs/boost-1.35:0 )
+	!amd64? ( || ( dev-libs/boost:1.42 dev-libs/boost:1.41 >=dev-libs/boost-1.35:0 ) )
 	sys-libs/zlib
 	x11-libs/pango
 	dev-lang/lua
@@ -57,9 +58,14 @@
 			|| die "sed failed"
 	fi
 	# how do I hate boost? Let me count the ways...
-	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
+	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
 	append-cxxflags \
 		-I/usr/include/boost-${boost_ver}
 	append-ldflags \






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in games-strategy/wesnoth: ChangeLog wesnoth-1.8.ebuild
@ 2010-04-07  3:13 Michael Sterrett (mr_bones_)
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-04-07  3:13 UTC (permalink / raw
  To: gentoo-commits

mr_bones_    10/04/07 03:13:41

  Modified:             ChangeLog wesnoth-1.8.ebuild
  Log:
  Expose the actual build commands to confirm proper behavior
  (Portage version: 2.1.7.17/cvs/Linux i686)

Revision  Changes    Path
1.176                games-strategy/wesnoth/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.176&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.176&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?r1=1.175&r2=1.176

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- ChangeLog	2 Apr 2010 15:27:10 -0000	1.175
+++ ChangeLog	7 Apr 2010 03:13:41 -0000	1.176
@@ -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.175 2010/04/02 15:27:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.176 2010/04/07 03:13:41 mr_bones_ Exp $
+
+  07 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
+  Expose the actual build commands to confirm proper behavior
 
   02 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
   Clamp amd64 to the one version of boost that works for them.



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

Index: wesnoth-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wesnoth-1.8.ebuild	3 Apr 2010 23:44:52 -0000	1.6
+++ wesnoth-1.8.ebuild	7 Apr 2010 03:13:41 -0000	1.7
@@ -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.6 2010/04/03 23:44:52 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.7 2010/04/07 03:13:41 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
@@ -98,6 +98,7 @@
 		$(cmake-utils_use_enable nls NLS)
 		$(cmake-utils_use_enable dbus NOTIFICATIONS)
 		"-DGUI=$(use tinygui && echo tiny || echo normal)"
+		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
 		"-DENABLE_FRIBIDI=FALSE"
 		"-DENABLE_STRICT_COMPILATION=FALSE"
 		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in games-strategy/wesnoth: ChangeLog wesnoth-1.8.ebuild
@ 2010-04-07 19:44 Michael Sterrett (mr_bones_)
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-04-07 19:44 UTC (permalink / raw
  To: gentoo-commits

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() {






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in games-strategy/wesnoth: ChangeLog wesnoth-1.8.ebuild
@ 2010-04-09 23:51 Michael Sterrett (mr_bones_)
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-04-09 23:51 UTC (permalink / raw
  To: gentoo-commits

mr_bones_    10/04/09 23:51:12

  Modified:             ChangeLog wesnoth-1.8.ebuild
  Log:
  Don't force the boost slot to 0 (bug #311635)
  (Portage version: 2.1.7.17/cvs/Linux i686)

Revision  Changes    Path
1.178                games-strategy/wesnoth/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.178&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.178&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?r1=1.177&r2=1.178

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- ChangeLog	7 Apr 2010 19:44:58 -0000	1.177
+++ ChangeLog	9 Apr 2010 23:51:11 -0000	1.178
@@ -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.177 2010/04/07 19:44:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.178 2010/04/09 23:51:11 mr_bones_ Exp $
+
+  09 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
+  Don't force the boost slot to 0 (bug #311635)
 
   07 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
   another attempt at sane boost handling



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

Index: wesnoth-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wesnoth-1.8.ebuild	7 Apr 2010 19:44:58 -0000	1.8
+++ wesnoth-1.8.ebuild	9 Apr 2010 23:51:11 -0000	1.9
@@ -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.8 2010/04/07 19:44:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.9 2010/04/09 23:51:11 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
@@ -22,7 +22,7 @@
 	!dedicated? (
 		dbus? ( sys-apps/dbus )
 	)
-	>=dev-libs/boost-1.35:0
+	>=dev-libs/boost-1.35
 	sys-libs/zlib
 	x11-libs/pango
 	dev-lang/lua






^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-04-09 23:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-07 19:44 [gentoo-commits] gentoo-x86 commit in games-strategy/wesnoth: ChangeLog wesnoth-1.8.ebuild Michael Sterrett (mr_bones_)
  -- strict thread matches above, loose matches on Subject: below --
2010-04-09 23:51 Michael Sterrett (mr_bones_)
2010-04-07  3:13 Michael Sterrett (mr_bones_)
2010-04-02 15:27 Michael Sterrett (mr_bones_)
2010-03-27 22:34 Michael Sterrett (mr_bones_)
2010-03-26  6:50 Michael Sterrett (mr_bones_)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox