| 1 |
mr_bones_ 10/04/02 15:27:11 |
| 2 |
|
| 3 |
Modified: ChangeLog wesnoth-1.8.ebuild |
| 4 |
Log: |
| 5 |
Clamp amd64 to the one version of boost that works for them. |
| 6 |
(Portage version: 2.1.7.17/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.175 games-strategy/wesnoth/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.175&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?rev=1.175&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/ChangeLog?r1=1.174&r2=1.175 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v |
| 18 |
retrieving revision 1.174 |
| 19 |
retrieving revision 1.175 |
| 20 |
diff -u -r1.174 -r1.175 |
| 21 |
--- ChangeLog 27 Mar 2010 22:34:46 -0000 1.174 |
| 22 |
+++ ChangeLog 2 Apr 2010 15:27:10 -0000 1.175 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for games-strategy/wesnoth |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.174 2010/03/27 22:34:46 mr_bones_ Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.175 2010/04/02 15:27:10 mr_bones_ Exp $ |
| 28 |
+ |
| 29 |
+ 02 Apr 2010; Michael Sterrett <mr_bones_@g.o> wesnoth-1.8.ebuild: |
| 30 |
+ Clamp amd64 to the one version of boost that works for them. |
| 31 |
|
| 32 |
27 Mar 2010; Michael Sterrett <mr_bones_@g.o> wesnoth-1.8.ebuild: |
| 33 |
correct boost:0 handling (bug #311635) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.5 games-strategy/wesnoth/wesnoth-1.8.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild?rev=1.5&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild?rev=1.5&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild?r1=1.4&r2=1.5 |
| 42 |
|
| 43 |
Index: wesnoth-1.8.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v |
| 46 |
retrieving revision 1.4 |
| 47 |
retrieving revision 1.5 |
| 48 |
diff -u -r1.4 -r1.5 |
| 49 |
--- wesnoth-1.8.ebuild 27 Mar 2010 22:34:46 -0000 1.4 |
| 50 |
+++ wesnoth-1.8.ebuild 2 Apr 2010 15:27:10 -0000 1.5 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2010 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.4 2010/03/27 22:34:46 mr_bones_ Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.5 2010/04/02 15:27:10 mr_bones_ Exp $ |
| 56 |
|
| 57 |
EAPI=2 |
| 58 |
inherit cmake-utils eutils toolchain-funcs flag-o-matic games |
| 59 |
@@ -22,7 +22,8 @@ |
| 60 |
!dedicated? ( |
| 61 |
dbus? ( sys-apps/dbus ) |
| 62 |
) |
| 63 |
- || ( dev-libs/boost:1.42 dev-libs/boost:1.41 >=dev-libs/boost-1.35:0 ) |
| 64 |
+ amd64? ( >=dev-libs/boost-1.35:0 ) |
| 65 |
+ !amd64? ( || ( dev-libs/boost:1.42 dev-libs/boost:1.41 >=dev-libs/boost-1.35:0 ) ) |
| 66 |
sys-libs/zlib |
| 67 |
x11-libs/pango |
| 68 |
dev-lang/lua |
| 69 |
@@ -57,9 +58,14 @@ |
| 70 |
|| die "sed failed" |
| 71 |
fi |
| 72 |
# how do I hate boost? Let me count the ways... |
| 73 |
- has_version dev-libs/boost:0 && boost_ver=1_35 |
| 74 |
- has_version dev-libs/boost:1.41 && boost_ver=1_41 |
| 75 |
- has_version dev-libs/boost:1.42 && boost_ver=1_42 |
| 76 |
+ local boost_ver |
| 77 |
+ if use amd64 ; then |
| 78 |
+ boost_ver=1_35 |
| 79 |
+ else |
| 80 |
+ has_version dev-libs/boost:0 && boost_ver=1_35 |
| 81 |
+ has_version dev-libs/boost:1.41 && boost_ver=1_41 |
| 82 |
+ has_version dev-libs/boost:1.42 && boost_ver=1_42 |
| 83 |
+ fi |
| 84 |
append-cxxflags \ |
| 85 |
-I/usr/include/boost-${boost_ver} |
| 86 |
append-ldflags \ |
Archives