summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2012-11-07 10:29:25 +0000
committerAlfredo Tupone <tupone@gentoo.org>2012-11-07 10:29:25 +0000
commit58285b193c0e4c85b9e3fbf03054658489d6fb07 (patch)
tree06b9cf02246858d6c39ba9bd2c580b3b06e3e50b /games-strategy
parentAdding missing dep (diff)
downloadhistorical-58285b193c0e4c85b9e3fbf03054658489d6fb07.tar.gz
historical-58285b193c0e4c85b9e3fbf03054658489d6fb07.tar.bz2
historical-58285b193c0e4c85b9e3fbf03054658489d6fb07.zip
scons configure done at configure phase. Bug #440032
Package-Manager: portage-2.1.11.31/cvs/Linux i686 Manifest-Sign-Key: 0x0145142D
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/glob2/ChangeLog6
-rw-r--r--games-strategy/glob2/Manifest10
-rw-r--r--games-strategy/glob2/glob2-0.9.4.4.ebuild20
3 files changed, 23 insertions, 13 deletions
diff --git a/games-strategy/glob2/ChangeLog b/games-strategy/glob2/ChangeLog
index fa8a84871d2b..af8ec9e6f8b0 100644
--- a/games-strategy/glob2/ChangeLog
+++ b/games-strategy/glob2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/glob2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.54 2012/07/20 15:15:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.55 2012/11/07 10:29:13 tupone Exp $
+
+ 07 Nov 2012; Tupone Alfredo <tupone@gentoo.org> glob2-0.9.4.4.ebuild:
+ Migration to EAPI 4
+ scons configure done at configure phase. Bug #440032 by Diego
20 Jul 2012; Jeroen Roovers <jer@gentoo.org> glob2-0.9.4.4.ebuild:
Drop HPPA keywording.
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
index 93c9e921d1f7..9f0072b99c40 100644
--- a/games-strategy/glob2/Manifest
+++ b/games-strategy/glob2/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
AUX glob2-0.9.4.4-gcc44.patch 256 SHA256 053cf0dc887340c9ded2e012e7e9dd87763fe5a6e4134e61baa791d6e8e6494c SHA512 3030cc72d80aabb0ef199b4ce86df80be9f4be4165d72cfb65bb9ea663314976f3783b911f3cb3150bdf733e54b4badbb35ba520f0e33357fe72d9d73ad9a905 WHIRLPOOL 1548598d85c326f6cf6e37ece8d801590fbeeda275a71c1e0710d332b2b29aedf85f1124afb17f0e71e7ddf0a84d0acb1206eac26cfba6ecaec40b7ec3254a66
AUX glob2-0.9.4.4-scons-blows.patch 975 SHA256 9e9146dd8e7ee3f23c9ebbd2c3cf3d16cf4b271c75cb6cd16a9161759e6fd45b SHA512 8cc48405b8baaf753f6c290c00bd3c4e790e86386fa9c594477d2c0a28594d3080d51d2220b87a56f8e44861f3141e0c3d1f351841ea0c6e705830ecb0ed7822 WHIRLPOOL 441cdaf9f3c31d04c5098aad5b8fc24dc17914f9570de968512765e5c4f75d5c9e3f0eb56a682e43a96687955efd19ad9330ae2628385a6d7b044d9bc7225ebe
DIST glob2-0.9.4.4.tar.gz 11338986 SHA256 0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8 SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca WHIRLPOOL d151bc9601eb283a366d98ae23bd5eb6b793024c5f9b9cf49ddc55910142885e5b2f89bfdce4f879190368466f2cc01e836a9178fd899d27d4342bee4c1f9a3a
-EBUILD glob2-0.9.4.4.ebuild 1254 SHA256 c5ee56758bed44a8bb4c4c00f4c2d8f3dbb387f09d06f123fa926150df53c565 SHA512 fd6d2e63f63da334ffeb8888df282075213b62e27ac9597f22420bb8c0a0a85a5872abd4fdadf932aa6d1eb89dd2e1aff3a5c88eb0618da3a46c666bf284a57f WHIRLPOOL ab7c465d10c3e0ae5ae285be9977ed0c9d57a39c6305e81ce27f9562f9860c491a54168f2455d911477f267047aa787a0047cec29f0707384bffabd6df225242
-MISC ChangeLog 6526 SHA256 3348c634481eed1d63c7a12a7130a18a3cef6e90608a25e255108bc9badec5a1 SHA512 8c50d64e3468ff9b19d8df6889305aae83756617b8295e4e07d76eeb152662fc13b761a3cbdd9faf3c96a26dfd6c02c542159c0efcb4a74b2a8a6f725299dfcf WHIRLPOOL 28118544595bbc8488771371402140ef8b8d716e0ec9481a9b8b7ee71ec5dd464a3c5ad71c2fd0430bcfb5332e75a2ab4981797768d17be977f866696d686651
+EBUILD glob2-0.9.4.4.ebuild 1257 SHA256 f867e1ac10ee8855ad61ab2e5819767b9704289ef22f8ab0814d272065bbb8aa SHA512 becb408e30a3827238fa0f92a2189c2997a9c42dd4172ce563b8e2f0451c94da3ef13ba49af7c29d07f00e862911df57b8e019dda653edb7cc1b9a8a0061060a WHIRLPOOL 919a491ff541cf461d05c71850fed300019b8b8b2fff622fbc79bca7142aab2d6667ccd1b832bb9170a434b6a00985c8497df57052268b879d8f03aa7a6eaf70
+MISC ChangeLog 6688 SHA256 f3c643352a60646022f0140db5359cc632701b9eaaf5c2d0fc454accd7080d09 SHA512 432d0bb0b5f941b1178e3dc527e2f6cc7e8e12aed5b1cd66db0bf4104398eca4c14e497c4f53dccdfc06c3e0e45479c7afd44e0ca628f43fb6ae943e21715ef2 WHIRLPOOL 9fbb54f193efaff9045c858706f62889514a87a63042dc3c0e3e960e41ba80c7903adf492137a3e329c1fef33450745b2ea8fda87ae20a76d607c7364cf2ff82
MISC metadata.xml 546 SHA256 f55b8dd9eba3e7bbaf5765b86e7c434d6f53285c3aa43923c3ec247c569cf8fd SHA512 34b1d913d42b52156cf3b14f0993e11b081a33f3f56f24befcfbee8f4ee59a432cb9f7f84e54f1a385030ac2c18d79ee0367e5121baac8e5087291db7b31840f WHIRLPOOL 306897493790d0b357913d34aa803295db81e929e3eef122c145a2556f7c1901d78a44a806994650323ba3678bc3b36bd2359fe625625e51ac08037fc6afcca0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlAJdjAACgkQVWmRsqeSphNtYQCeK7rlKlSpPOCZXup9a3wruJL4
-5OMAn1X0YC7MM0lXvawHlllIxnDwzVm7
-=k1wY
+iEYEAREIAAYFAlCaN/8ACgkQIY77eQFFFC1mowCfa8GWIQ+QmbqlPwNhF426fWwZ
+LNAAninbUT3Xl+Ol/2JxGh70PaC3UE+o
+=i2qb
-----END PGP SIGNATURE-----
diff --git a/games-strategy/glob2/glob2-0.9.4.4.ebuild b/games-strategy/glob2/glob2-0.9.4.4.ebuild
index a64afbf2bd36..13c1adb23a52 100644
--- a/games-strategy/glob2/glob2-0.9.4.4.ebuild
+++ b/games-strategy/glob2/glob2-0.9.4.4.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.9.4.4.ebuild,v 1.6 2012/07/20 15:15:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.9.4.4.ebuild,v 1.7 2012/11/07 10:29:13 tupone Exp $
-EAPI=2
+EAPI=4
inherit eutils scons-utils games
DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs"
@@ -27,16 +27,22 @@ DEPEND="virtual/opengl
PATCHES=( "${FILESDIR}"/${P}-gcc44.patch "${FILESDIR}"/${P}-scons-blows.patch )
-src_compile() {
- escons \
- INSTALLDIR="${GAMES_DATADIR}"/${PN} \
+src_configure() {
+ myesconsargs=(
+ INSTALLDIR="${GAMES_DATADIR}"/${PN}
DATADIR="${GAMES_DATADIR}"/${PN}
+ )
+ escons data
+}
+
+src_compile() {
+ escons
}
src_install() {
- dogamesbin src/${PN} || die "dogamesbin failed"
+ dogamesbin src/${PN}
insinto "${GAMES_DATADIR}"/${PN}
- doins -r campaigns data maps scripts || die "doins failed"
+ doins -r campaigns data maps scripts
find "${D}/${GAMES_DATADIR}"/${PN} -name SConscript -exec rm -f {} +
newicon data/icons/glob2-icon-48x48.png ${PN}.png
make_desktop_entry glob2 "Globulation 2"