summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2012-06-29 20:11:51 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2012-06-29 20:11:51 +0000
commitabe76f098eda0652aa8dde84e77a6d9d5e845268 (patch)
tree4f9afbbeaadf759d239098968d51391df993f531 /games-puzzle
parentVersion bump (diff)
downloadhistorical-abe76f098eda0652aa8dde84e77a6d9d5e845268.tar.gz
historical-abe76f098eda0652aa8dde84e77a6d9d5e845268.tar.bz2
historical-abe76f098eda0652aa8dde84e77a6d9d5e845268.zip
use the latest boost
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/pingus/ChangeLog5
-rw-r--r--games-puzzle/pingus/Manifest4
-rw-r--r--games-puzzle/pingus/pingus-0.7.6.ebuild22
3 files changed, 26 insertions, 5 deletions
diff --git a/games-puzzle/pingus/ChangeLog b/games-puzzle/pingus/ChangeLog
index a6575d757362..93e71cc13c63 100644
--- a/games-puzzle/pingus/ChangeLog
+++ b/games-puzzle/pingus/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-puzzle/pingus
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.40 2012/05/24 18:06:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.41 2012/06/29 20:11:51 mr_bones_ Exp $
+
+ 29 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> pingus-0.7.6.ebuild:
+ use the latest boost
24 May 2012; Michael Sterrett <mr_bones_@gentoo.org> pingus-0.7.6.ebuild:
Add strip-flags for bug #396149
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 1144e7606451..838fc67b88f1 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -1,4 +1,4 @@
DIST pingus-0.7.6.tar.bz2 12622268 RMD160 0b8377a5eddbdfeac5ec765e87902271a5c0c268 SHA1 b5f5a25d71beb197c9466fb8928018a377f56487 SHA256 759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460
-EBUILD pingus-0.7.6.ebuild 1121 RMD160 f2cb25b4adfa4ebab99fd2e8848246263e736587 SHA1 4458db9a2d2d532b3f5156a0a984b9a38599e0a7 SHA256 eefffae314b12a46a1315e6e0741bd991335fb8c0ca94e8832f7dda7f6445bb9
-MISC ChangeLog 6063 RMD160 6ec24a570fac6ceed92e5d8edfde2e74d03556c7 SHA1 b819b004a90d182e7f97878a8093735977e9411a SHA256 3ff20e2c4ece0472050506ee50a8b72a4b7941a6170e21693cb67bd6c0ab5a88
+EBUILD pingus-0.7.6.ebuild 1618 RMD160 c0b5b1e2587dfbc135d1a4d07a99da9430494af8 SHA1 67ca36d2720a2d984c6779828e60fd67916f2b58 SHA256 bef1b53373ec11a063ff12e5d1fcc48992afa394db69a532a6ad8b5c455af143
+MISC ChangeLog 6163 RMD160 fe104a9b5be97ee484be5c98842963d928649532 SHA1 ff977c9d471a14103cb6970caa4a3d47683326a5 SHA256 daf57c23cc157efc6b0428cc4cb3f33e5c3edcb0ac7dc598ab53ad7ccbef9c5d
MISC metadata.xml 1111 RMD160 ddc26c0d53726325b362684416d17da1cf233683 SHA1 69ceec92d0b0ef95a9afc8db8dd62e1f4f1da857 SHA256 a2b191d59e7491c2b434478e9f683fb533015b5400b9452b15b1ee3a2b36f06a
diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild b/games-puzzle/pingus/pingus-0.7.6.ebuild
index 999851092a97..8e725811d6cd 100644
--- a/games-puzzle/pingus/pingus-0.7.6.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.6.ebuild,v 1.5 2012/05/24 18:06:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.6.ebuild,v 1.6 2012/06/29 20:11:51 mr_bones_ Exp $
EAPI=2
inherit eutils flag-o-matic scons-utils toolchain-funcs games
@@ -21,8 +21,26 @@ DEPEND="media-libs/libsdl[joystick,opengl?,video]
media-libs/libpng
dev-libs/boost"
-src_compile() {
+src_prepare() {
+ # how do I hate boost? Let me count the ways...
+ local boost_ver=$(best_version ">=dev-libs/boost-1.36")
+
+ 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}"
+
strip-flags
+}
+
+src_compile() {
escons \
CXX="$(tc-getCXX)" \
CCFLAGS="${CXXFLAGS}" \