summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2014-01-10 05:33:54 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2014-01-10 05:33:54 +0000
commitd5b9964aca5030c11dde96b0110564050c2ecd29 (patch)
tree941ef48d54bc55b0e59f1877978fce56a5e5955a /games-puzzle
parentattempt at more rubying the ebuild (diff)
downloadhistorical-d5b9964aca5030c11dde96b0110564050c2ecd29.tar.gz
historical-d5b9964aca5030c11dde96b0110564050c2ecd29.tar.bz2
historical-d5b9964aca5030c11dde96b0110564050c2ecd29.zip
fix libsdl use deps (bug #460626); skip install for 32bit on amd64 (bug #417187)
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/world-of-goo/ChangeLog9
-rw-r--r--games-puzzle/world-of-goo/Manifest4
-rw-r--r--games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild8
3 files changed, 13 insertions, 8 deletions
diff --git a/games-puzzle/world-of-goo/ChangeLog b/games-puzzle/world-of-goo/ChangeLog
index 0b80539281fe..eb01e47ac056 100644
--- a/games-puzzle/world-of-goo/ChangeLog
+++ b/games-puzzle/world-of-goo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-puzzle/world-of-goo
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/world-of-goo/ChangeLog,v 1.8 2013/01/22 18:44:28 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/world-of-goo/ChangeLog,v 1.9 2014/01/10 05:33:48 mr_bones_ Exp $
+
+ 10 Jan 2014; Michael Sterrett <mr_bones_@gentoo.org>
+ world-of-goo-1.41-r1.ebuild:
+ fix libsdl use deps (bug #460626); skip install for 32bit on amd64 (bug
+ #417187)
22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
-world-of-goo-1.41.ebuild:
diff --git a/games-puzzle/world-of-goo/Manifest b/games-puzzle/world-of-goo/Manifest
index cd9418b5eaca..0664832e7330 100644
--- a/games-puzzle/world-of-goo/Manifest
+++ b/games-puzzle/world-of-goo/Manifest
@@ -1,4 +1,4 @@
DIST WorldOfGooSetup.1.41.tar.gz 66428181 SHA256 675a8a11bed6c9d810cd222bac5e9834f82acc31c2afc6990da40b45ba564566 SHA512 278dfb983cf9cf4de87f13d94f5e75b3830af07523e2ddc7a443d5afb6fead130ed50440357554986b5b0d99c17651f77ae11298f51f9f1072ebd40287cad396 WHIRLPOOL 784192ec8161faad3bfab8f0e94bb77b8b900922b7df90b10c887e9fc111e895b859a9dd111cc170523de0a32c0d0fae9e4418c7b27d68f08425939d6bb2da4f
-EBUILD world-of-goo-1.41-r1.ebuild 1581 SHA256 c765fbe1cd4848a20731eea856e4e8005f616a304382e081b05b9eca6c89f1ec SHA512 0b06eaac738073807b60b7d8416bbeccb0f3b81b76aa54f2e13eaa03600ab813c2b4b65da9a0726f4bc6372d6e8b984ed56abdcd06ed6f3feba7b419432d032a WHIRLPOOL 7f56b060011af4ed683142bb40dfa3f9f9e96f40530fc8e0c6d4ac3ba3dbf41b37a5a0831178361f5b9f67e9aab213e7c4a01e5b6357529c1261b5a853274110
-MISC ChangeLog 1258 SHA256 f14736fa3dc5f0a39138e5cba0d30cd6c44bf19244969783a2d7b1af51ca94ae SHA512 b2bd9e5d924c3fc8c47695f54e9fa5b209d8972c08d664f7625418846b3c27b11689460b51f8136b2e22c61392b9e7ee8a4d30b6ad70de7213fa06bb53d64c30 WHIRLPOOL 642dda15c761215626c71935b181dae151e27393af45e558b2f0e2ff945a0eca1fc304ff55182a2acc5ad3edcaaf30ed30d4058d08b8ae8e73eb845b26e1f557
+EBUILD world-of-goo-1.41-r1.ebuild 1620 SHA256 7049c72d9a65d069612307aa43ee62a90c486d8f4bdfa734ba67e51ec8fc2a5c SHA512 81a2267b21882a0a1c233c670be4626996911ecd0a7a1f94f68676734e42608b1942923d4ff9a44c2e9d0f652dcec23e1fd55c33e3b7d94735ac5ebf58fb3dbd WHIRLPOOL 0d18ac7f3ce2a8e4377a3dc2368eafed0d40d7b9db628f161828f736f23210c5db61e7e823a754998730dc207221622239e00a831da3eefe56897604927a0f3f
+MISC ChangeLog 1430 SHA256 1c85497b436e4782c9546eac20c47a71982d704fe4e52bdbd24fc898bd57e319 SHA512 d925be7d0bf933b0071bfce8b55264c1d9832c1e808ea29cae10c5b57de6acb19f1a954afe67d8ac89ad774249d7b89447773cff75677052aba89fce1d77042c WHIRLPOOL e623595fb8245c45f40a20fbf5428a5640ba2e148e44f6a79aa65f2347793637ad2078a0da64bdc71848904177e51d8aef6add0623728288ed155bf991a799c5
MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild b/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
index 252c38d8bf20..cfa2d0474844 100644
--- a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
+++ b/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild,v 1.3 2013/01/13 11:21:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild,v 1.4 2014/01/10 05:33:48 mr_bones_ Exp $
EAPI=2
inherit eutils games
@@ -22,7 +22,7 @@ KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="fetch strip"
-RDEPEND="media-libs/libsdl[audio,opengl,video]
+RDEPEND="media-libs/libsdl[alsa,audio,opengl,video]
media-libs/sdl-mixer[vorbis]
sys-libs/glibc
virtual/opengl
@@ -47,7 +47,7 @@ pkg_nofetch() {
src_install() {
exeinto "${dir}"
- doexe ${MY_PN%Demo}* || die
+ doexe ${MY_PN%Demo}{,.$(usex amd64 bin64 bin32)} || die
games_make_wrapper ${PN} "${dir}"/${MY_PN%Demo} || die