summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2011-07-20 15:26:53 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2011-07-20 15:26:53 +0000
commit751919b861ca9e2090b5910f18fc2f8df27c9ff5 (patch)
tree58a5b08d063330194e89b5053bfe4886e7391a9e /games-arcade
parentBump to new prerelease. Apply fix for bug #374671, upstream #39375. (diff)
downloadhistorical-751919b861ca9e2090b5910f18fc2f8df27c9ff5.tar.gz
historical-751919b861ca9e2090b5910f18fc2f8df27c9ff5.tar.bz2
historical-751919b861ca9e2090b5910f18fc2f8df27c9ff5.zip
respect compile flags (bug #375739)
Package-Manager: portage-2.1.10.3/cvs/Linux i686
Diffstat (limited to 'games-arcade')
-rw-r--r--games-arcade/criticalmass/ChangeLog6
-rw-r--r--games-arcade/criticalmass/Manifest5
-rw-r--r--games-arcade/criticalmass/criticalmass-1.0.2.ebuild5
-rw-r--r--games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch27
4 files changed, 38 insertions, 5 deletions
diff --git a/games-arcade/criticalmass/ChangeLog b/games-arcade/criticalmass/ChangeLog
index df379bc681a7..e51b88ba13ec 100644
--- a/games-arcade/criticalmass/ChangeLog
+++ b/games-arcade/criticalmass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/criticalmass
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.20 2011/05/06 18:21:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.21 2011/07/20 15:26:53 mr_bones_ Exp $
+
+ 20 Jul 2011; Michael Sterrett <mr_bones_@gentoo.org>
+ criticalmass-1.0.2.ebuild, +files/criticalmass-1.0.2-cflags.patch:
+ respect compile flags (bug #375739)
06 May 2011; Michael Sterrett <mr_bones_@gentoo.org>
+criticalmass-1.0.2.ebuild, +files/criticalmass-1.0.2-gcc43.patch,
diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest
index 3099d066ebd8..7296305de750 100644
--- a/games-arcade/criticalmass/Manifest
+++ b/games-arcade/criticalmass/Manifest
@@ -1,12 +1,13 @@
AUX criticalmass-1.0.0-gcc43.patch 3150 RMD160 b7071775f419ceecd2b138d8a1009697c819a090 SHA1 9ad1a20872759453a2fdf6bd3c7ce80df5121f72 SHA256 a7f74c031aa03fa2a4dd522b4c289f7b992e045b498e71700aed88aea397459c
AUX criticalmass-1.0.0-libpng14.patch 445 RMD160 a50541521001c8f14f8ccdab54b53baba3f8c5b2 SHA1 5ec3fe2e2e575f51b4576c502da3a3658d7099c9 SHA256 7f20895eceb0caafb3bd7315b99080731647677c7b938e512625b3b9885dfaf3
AUX criticalmass-1.0.0-system_curl.patch 964 RMD160 31f28f327e78142404ff9d1daee845af1bf5f6fa SHA1 cbaa1ea3a8c98e65c99f05e5a973a938c48f21c2 SHA256 0fc918bea78df003ba37370a83fc349bfec6d191959c0d443c1e33df96be409d
+AUX criticalmass-1.0.2-cflags.patch 864 RMD160 c5525b3d4f3ba01f4ee77f3e11b45f64f8d7d512 SHA1 d22974b312b366fea3b6d7f9428024f7cd451269 SHA256 e6c6698fc2ae2b96c2db6409de004adead248b5aa51e6a789a7e3dd0b978d035
AUX criticalmass-1.0.2-gcc43.patch 3150 RMD160 b7071775f419ceecd2b138d8a1009697c819a090 SHA1 9ad1a20872759453a2fdf6bd3c7ce80df5121f72 SHA256 a7f74c031aa03fa2a4dd522b4c289f7b992e045b498e71700aed88aea397459c
AUX criticalmass-1.0.2-libpng14.patch 445 RMD160 a50541521001c8f14f8ccdab54b53baba3f8c5b2 SHA1 5ec3fe2e2e575f51b4576c502da3a3658d7099c9 SHA256 7f20895eceb0caafb3bd7315b99080731647677c7b938e512625b3b9885dfaf3
AUX criticalmass-1.0.2-system_curl.patch 964 RMD160 31f28f327e78142404ff9d1daee845af1bf5f6fa SHA1 cbaa1ea3a8c98e65c99f05e5a973a938c48f21c2 SHA256 0fc918bea78df003ba37370a83fc349bfec6d191959c0d443c1e33df96be409d
DIST CriticalMass-1.0.0.tar.bz2 5092549 RMD160 33c7b60f1cb3cf6e887fe4bbc99928b17f97c047 SHA1 ce0de4fa9259f0586f8dfa7ee96978da21e57335 SHA256 94cedac39f9279faa63f6ce4098f2a778a8c8f9013ba8dd7d5b85766739e0858
DIST CriticalMass-1.0.2.tar.bz2 5122126 RMD160 6c0b6988f6a52c4b19fbca2525b1daec0202693d SHA1 d2d1f35183e9fbed76fd8da2a948745a4c89f20b SHA256 846db2d30d39e559612328594084a7aef980169948b2cfaee9fddec8ffdef724
EBUILD criticalmass-1.0.0-r1.ebuild 1043 RMD160 7bd52904b93cd11143bcbcc76d02b2420cd51636 SHA1 28451791557041a15a156a144ebbeb26e32e8d56 SHA256 5d367b85776ae1650af517077af9eacb8df59d864625c4b1816af721d03cc65f
-EBUILD criticalmass-1.0.2.ebuild 1023 RMD160 3015ab7be1e58f64675b00b77d3700496573a9ca SHA1 04c81af9e13838a7599124c79bd8cedea6fc8552 SHA256 eaf4db8e181833c1d013b25d60779c88c7ec364154535f106eb709838225d3c7
-MISC ChangeLog 4249 RMD160 36ee86d6197ff175ca31167576a04ea4a3586775 SHA1 03d5555f5b363082bf8355b1bd2a4d8643c53b26 SHA256 ed31834ca3a70a4fee70d1f131ab89580ae4d0d24596c63ae2020ad6f0000e04
+EBUILD criticalmass-1.0.2.ebuild 1059 RMD160 781185bfe9b9158113f265568a0fc19de18e2205 SHA1 dcf38f47950ee6de72e5911b9ab8ab9a25544fef SHA256 0894c5f69ece4ba5ceaf7f65b864c972e7980066b5fcfc13b0696f24c32282d5
+MISC ChangeLog 4412 RMD160 c167b86cd4fbf4778428b83268e234f0f609256c SHA1 976fa85f4cc6fa8c2b8598318daea41640fc47b4 SHA256 65245b442eb61c65d546db955e68939f55b72eb1141515779dd7a03cb62d257c
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2.ebuild
index 63c454c13860..d9d5ea2c5054 100644
--- a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild
+++ b/games-arcade/criticalmass/criticalmass-1.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/criticalmass-1.0.2.ebuild,v 1.1 2011/05/06 18:21:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/criticalmass-1.0.2.ebuild,v 1.2 2011/07/20 15:26:53 mr_bones_ Exp $
EAPI=2
inherit autotools eutils games
@@ -25,7 +25,8 @@ S=${WORKDIR}/CriticalMass-${PV}
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc43.patch \
"${FILESDIR}"/${P}-system_curl.patch \
- "${FILESDIR}"/${P}-libpng14.patch
+ "${FILESDIR}"/${P}-libpng14.patch \
+ "${FILESDIR}"/${P}-cflags.patch
rm -rf curl
eautoreconf
}
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
new file mode 100644
index 000000000000..8b801e51c2cb
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
@@ -0,0 +1,27 @@
+--- configure.in.orig 2011-07-20 11:23:19.849122541 -0400
++++ configure.in 2011-07-20 11:24:28.169713094 -0400
+@@ -35,9 +35,6 @@
+ AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE)
+ AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32)
+
+-CFLAGS=""
+-CXXFLAGS=""
+-
+ if test "x$GCC" = xyes; then
+ CFLAGS="$CFLAGS -W -Wall"
+ CXXFLAGS="$CXXFLAGS -W -Wall -fno-exceptions"
+@@ -51,14 +48,6 @@
+ CXXFLAGS="$CXXFLAGS -g"
+ fi
+
+-AC_ARG_ENABLE(optimize,
+-[ --enable-optimize=level Enable optimization [default=2]],
+- enable_optmize=$enableval, enable_optimize=2)
+-if test "x$enable_optimize" != "xno" ; then
+- CFLAGS="$CFLAGS -O$enable_optimize"
+- CXXFLAGS="$CXXFLAGS -O$enable_optimize"
+-fi
+-
+ AC_ARG_ENABLE(dyngl,
+ [ --enable-dyngl Load GL library dynamically [default=off]],
+ enable_dyngl=$enableval, enable_dyngl=off)