summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2014-06-19 12:54:56 +0000
committerChris Reffett <creffett@gentoo.org>2014-06-19 12:54:56 +0000
commit189eed1c8d6a76fe63263a439b74e57ea13227b4 (patch)
tree166326f83ba8ebd0d51edb7ae06309327683e21c /games-simulation
parentAlways set up CC, CXX and friends for distutils builds, bug #513664. Thanks t... (diff)
downloadhistorical-189eed1c8d6a76fe63263a439b74e57ea13227b4.tar.gz
historical-189eed1c8d6a76fe63263a439b74e57ea13227b4.tar.bz2
historical-189eed1c8d6a76fe63263a439b74e57ea13227b4.zip
[QA] Respect LDFLAGS wrt bug 335095, credit to Christophe Lefebvre <chtof62@gmail.com> for the fix.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x28DB029C
Diffstat (limited to 'games-simulation')
-rw-r--r--games-simulation/micropolis/ChangeLog9
-rw-r--r--games-simulation/micropolis/Manifest32
-rw-r--r--games-simulation/micropolis/micropolis-1.0.ebuild14
3 files changed, 37 insertions, 18 deletions
diff --git a/games-simulation/micropolis/ChangeLog b/games-simulation/micropolis/ChangeLog
index 607dbb32735a..bb72657c5aa0 100644
--- a/games-simulation/micropolis/ChangeLog
+++ b/games-simulation/micropolis/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-simulation/micropolis
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/micropolis/ChangeLog,v 1.4 2010/03/09 12:23:23 abcd Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/micropolis/ChangeLog,v 1.5 2014/06/19 12:54:43 creffett Exp $
+
+ 19 Jun 2014; Chris Reffett <creffett@gentoo.org> micropolis-1.0.ebuild:
+ [QA] Respect LDFLAGS wrt bug 335095, credit to Christophe Lefebvre
+ <chtof62@gmail.com> for the fix.
09 Mar 2010; Jonathan Callen <abcd@gentoo.org> micropolis-1.0.ebuild:
QA: When not using an absolute path, you MUST NOT use a file extension
@@ -16,4 +20,3 @@
11 Jun 2008; Hanno Boeck <hanno@gentoo.org> +micropolis-1.0.ebuild:
Initial commit, based on the ebuilds from matsuu and Mike Gualtieri.
-
diff --git a/games-simulation/micropolis/Manifest b/games-simulation/micropolis/Manifest
index 4f27a062169e..b1f544ae4fb6 100644
--- a/games-simulation/micropolis/Manifest
+++ b/games-simulation/micropolis/Manifest
@@ -1,15 +1,27 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
-DIST micropolis-activity-source.tgz 7676438 RMD160 0a683d86b1b0b1ae743abf4488293005ad3da87d SHA1 fe5b47bc63cee6f17d199772d8d0d50996dcacbb SHA256 1b3c72dc3680a34b5fc5a740a6fb5cfc0b8775514da8ab7bb3b2965b20d4f8bc
-DIST micropolis_git.patch 83549 RMD160 3014255b9426bc2bfb25ae22631ff16701022303 SHA1 82ceb5c43c2c9a6121b02b64c5780eaa755106af SHA256 13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592
-EBUILD micropolis-1.0.ebuild 1256 RMD160 92b7b55eec174dea7c2536d94ed5b8f67585a89b SHA1 4425fe248fead09b765fdb68e88562dad1aadaf9 SHA256 cbe24b3483be11c097ee0fcbce4b560c759e353fd8d8d3c230c5633d9d8ea504
-MISC ChangeLog 815 RMD160 8442787f9c98657f529b53b2739292ad57ab7112 SHA1 a98fef6b57eb08118cae2af544bc584b4b14abca SHA256 9c8128f8fe6878f0dc681a7bbe242ab79ece37bac2d5e4090acba56ca260c4a3
-MISC metadata.xml 215 RMD160 6f1cd8dd52cf06aaac0dbdfffd8ae35d72f588de SHA1 87b668a7f8b650ea2ff5f976a23c0033a55b6db8 SHA256 1641652c5aaf8e7536564089ff72ee43e0f0620d2204574ec283fe8a8b503cfd
+DIST micropolis-activity-source.tgz 7676438 SHA256 1b3c72dc3680a34b5fc5a740a6fb5cfc0b8775514da8ab7bb3b2965b20d4f8bc SHA512 fe65966c43d044e01a63a3cfe3cad48466eb1e5ec8b13c03abb52d582395a8ab527332d4d04454a4f32e85b65e55d72fe5e4d53a3f37b422d90e9208f00d9976 WHIRLPOOL 2bc497ce79b9041a6e3a2dcd84b4e135c844652afe23d546ad7aa5c66dee3422151329a04bbbc105a199427b4ed0580f79d3232d0b13f09a89b013e006321f3e
+DIST micropolis_git.patch 83549 SHA256 13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592 SHA512 9d1801478a27184c48d327094cad8238f7972c2cf3624c7c196375f2dd20c3374575b393d44cb2fb99613e19d66c4cc4fb27ae52df9fddf4e42adb42523bdc17 WHIRLPOOL fde6ad3bf7395ef51f482aba816d99bb5af302f357e4d9cd218d9ba7e4a0d78f8927e33c76cf0e340c5ff3b9b5b16f5e26495b07b5d80f701f560a1a7c7730ad
+EBUILD micropolis-1.0.ebuild 1361 SHA256 90017618ea88ff65e840ce4918c00933df4e21a7af304f199ac7ed99269ac6f7 SHA512 9ba8241d8225d1013218fa4ebb7927ab5b4ff748ac4de7acbeef354d2c483ebb789efa5ae28ce77ab9e541f009020463469dfe2248f461ab34a20758bd50ab99 WHIRLPOOL 588df8cb72a6813bf74c5b8cbb398edbd8c2ca39b2e86a896734a5db37adb8128fb11d364aed2729c73b7800e9e267901ec77499497fc9f9cd8c6d9b67fa38bb
+MISC ChangeLog 997 SHA256 be439cf4e81b3ee1d690ceb3bb2a017007e52e6d39f71308c23a4af47aa18fa8 SHA512 45159ed77a24acedcc18f62692db2d57a0a10522baf3b485e584a0fd11db4e8bfbee07d22ddd3fb4ede5e715ec060bd699b9444be1f1122164eb16852751c894 WHIRLPOOL eb26350e37393b8ec0e470d71f14fbc1aedf8a2db357a8455e299fe63bdf70d9aed42661b0caf5ba8c4bbef58daf15fdf1f33138dbeb305c60355e596c58a497
+MISC metadata.xml 215 SHA256 1641652c5aaf8e7536564089ff72ee43e0f0620d2204574ec283fe8a8b503cfd SHA512 7a8cfc04c41dcbe5c94763a6eda87d7523ef4d5d7997ee6e48c9ad32de01e0711c762e17c9dcdf43d2f8959e136460604630ec4a389432b1390e2afeaf4eabd1 WHIRLPOOL f38693b0d0b487be0968e30c6d52e62d7240bbb920dde12508efb8b758bcc7996993a7ea02ddbd9ea54bbe1d69b478d482a7915218bce6051ecf27327729ffa6
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0
-iEYEARECAAYFAkuWPcEACgkQOypDUo0oQOqz2QCfdjKp1SsNN5LL2nOH6wV94P+P
-DqkAn3s0iemvtersJ2BMR/Wm1oMGQM3Z
-=Ehqb
+iQJ8BAEBCABmBQJTot2WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzgwNDhGMjg4MzhERTE1NTY2NjA4MkZE
+MUJBQjZCNTI4REIwMjlDAAoJENG6trUo2wKcx9oP/R6mptH73nep/pgMZP2tGLlB
+3rtCC6R6wyspxW7GikU9N/FmvGVOyk9/D7ZNkRCRwRqCWivmAYkkdCoxwTBcYnfb
+FNuxczi4L+Te+YJRfrskDQpRy865O7ONO5lbJv0cqCqVIyypefPeCLH50B49iDqY
+5fW0wItxIPASQC78JD/8i4zvt+FdS7aS/UMQI1MCoS3oM/WMjWaHjgU+WjRFbXrr
+JGPEVCZUL3jOBQmE7j3cbclGBzpggnzjxi6MD7h3Yk47Isjx7hVVw3m8mHhfSyTe
+jyYWDRS8NFTjL9xbiZIUOBNGB34uN7dB1gP8g5ZqZnzjy8htN1lp6N5w5c4i4reZ
+WfRnETeCb9PlNX1mUlmIix8OY5/ODvBZGJaxQ/ZRkiQcRiE6Jvx6nhS7iKuMkDBT
+7CjkfToOXvmPIFiV4CrrOpz5CTKMLO+J0C43ByPKOeS7QXNwpp6z04zGXZVOH6Ww
+pgIQTrfyb1tGks6t+xPtBJBncaRC9PbepCc+PA7x98v4anLqDaWXAhLUJF8giI9Q
+57zuSmiWoUX5YVDY2UuFvme/rKaFpybQRKWMW10yONMvOm3Zefhtdb1dao3/2bxw
+hJdCEWL38nGeev6Oz+YGpIKZEixNtzjVfwI9xM8PxVguRC+jRWY8OgMrpHg6kd1U
+q2x3fZkO2w4nV6AWS8nj
+=kNIL
-----END PGP SIGNATURE-----
diff --git a/games-simulation/micropolis/micropolis-1.0.ebuild b/games-simulation/micropolis/micropolis-1.0.ebuild
index e072cabe0321..d82ae5d8267d 100644
--- a/games-simulation/micropolis/micropolis-1.0.ebuild
+++ b/games-simulation/micropolis/micropolis-1.0.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/micropolis/micropolis-1.0.ebuild,v 1.6 2010/03/09 12:23:23 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/micropolis/micropolis-1.0.ebuild,v 1.7 2014/06/19 12:54:43 creffett Exp $
+EAPI=5
inherit eutils games
@@ -26,16 +27,19 @@ S="${WORKDIR}/${PN}-activity/"
dir="${GAMES_DATADIR}/${PN}"
src_unpack() {
- unpack "${PN}-activity-source.tgz"
- cd "${S}"
+ unpack ${PN}-activity-source.tgz
+}
+src_prepare() {
epatch "${DISTDIR}"/${PN}_git.patch
sed -i -e "s:-O3:${CFLAGS}:" \
src/tclx/config.mk src/{sim,tcl,tk}/makefile || die
+ sed -i -e "s:XLDFLAGS=:&${LDFLAGS}:" \
+ src/tclx/config.mk || die
}
src_compile() {
- emake -C src || die
+ emake -C src LDFLAGS="${LDFLAGS}" || die
}
src_install() {