summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-01-22 18:53:35 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-01-22 18:53:35 +0000
commit577e0a509e6f8b6cd7f3460938d93b6775290766 (patch)
treef97ebee2a0318a84cc74384439fa4a97a99a2d39 /games-strategy/glest
parenttransition to the non-no* use flags in libsdl (diff)
downloadhistorical-577e0a509e6f8b6cd7f3460938d93b6775290766.tar.gz
historical-577e0a509e6f8b6cd7f3460938d93b6775290766.tar.bz2
historical-577e0a509e6f8b6cd7f3460938d93b6775290766.zip
transition to the non-no* use flags in libsdl
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28.1 i686
Diffstat (limited to 'games-strategy/glest')
-rw-r--r--games-strategy/glest/ChangeLog7
-rw-r--r--games-strategy/glest/Manifest4
-rw-r--r--games-strategy/glest/glest-3.1.2.ebuild20
3 files changed, 17 insertions, 14 deletions
diff --git a/games-strategy/glest/ChangeLog b/games-strategy/glest/ChangeLog
index 17ef9dbc86d6..139d2f4866d1 100644
--- a/games-strategy/glest/ChangeLog
+++ b/games-strategy/glest/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-strategy/glest
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.21 2008/11/01 12:40:22 pauldv Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.22 2009/01/22 18:53:35 mr_bones_ Exp $
+
+ 22 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> glest-3.1.2.ebuild:
+ transition to the non-no* use flags in libsdl
01 Nov 2008; Paul de Vrieze <pauldv@gentoo.org> glest-3.1.2.ebuild:
Glest actually depends on xerces-c (really doesn't run or build without
diff --git a/games-strategy/glest/Manifest b/games-strategy/glest/Manifest
index d77a1f956b7c..374828d89599 100644
--- a/games-strategy/glest/Manifest
+++ b/games-strategy/glest/Manifest
@@ -9,6 +9,6 @@ DIST magyar_3.1.2.zip 2157 RMD160 dcad31162dd0ff72410baba8ade790534d28b93f SHA1
DIST norsk_3.1.2.zip 2023 RMD160 c0216a3cc3d7f8e2f8b6c096ca997dd2078256ff SHA1 c6fe059cda2c118a8701643e9a611681a15406b6 SHA256 2ac6c6b154f4680c83a4adaf21604b7eaa01f6c9aa4214c5f09e067fe5c7905b
DIST russian_3.1.2.zip 1377 RMD160 526a2b2b80cd6aa5eac75222c1fa8f78eac80d64 SHA1 2a1162253614af5353b5c8f78e919d50c2369dde SHA256 16b40e46f3c84d8c94ae5174997ff9e3038a31b0934e4d930697ac499cc2022c
DIST turkish_3.1.2.zip 2137 RMD160 ca1842fb3d53118c2841f7ded3b24e97a395b7f8 SHA1 cf3dc8b51786a53e5f4c9f00db190e4ee9a7fe64 SHA256 3be22f0f20a1412cbd771fde6858557e4944db09c1974a1238e7ecc987d1d5c0
-EBUILD glest-3.1.2.ebuild 2921 RMD160 56fda459e84bfce61d3fa29a0ff4ede28bda498e SHA1 8cf778afd141374db05ebc9012ab2a32a52d5a2d SHA256 e406fa9eea73f215c918276fd00f6c118b39a71726f6ddbc179ca22eb2014640
-MISC ChangeLog 3441 RMD160 ed102f73259e23c5a9c73cd89aff0ebb4765e343 SHA1 b9fcbc41085766a0358e5e35e8bbfb23db105dba SHA256 45504b946e17dfabdcc1830ea60bc80cb691b24448a7ceb3f1e28babc681e507
+EBUILD glest-3.1.2.ebuild 2963 RMD160 81c03ac311a1df34c6284b8aec1d2ad09858b7ef SHA1 72b92912234fd951686923941c14531c2603cbd8 SHA256 0f684710524dcb02542d4ebb765ee79f974e1047404f50b9be2a20de3c42739f
+MISC ChangeLog 3568 RMD160 7e48f1fd2dc6508b28c0eb8c8007155c13250762 SHA1 6d3e5de2423b2c19b6c360bcd0b8c5c5a736f81a SHA256 13a263516aa4cde83118ed4cdd54856bb76846174f92485ed097f613d10e4b35
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/glest/glest-3.1.2.ebuild b/games-strategy/glest/glest-3.1.2.ebuild
index 34cdcce1b999..d65a042d74a5 100644
--- a/games-strategy/glest/glest-3.1.2.ebuild
+++ b/games-strategy/glest/glest-3.1.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-3.1.2.ebuild,v 1.4 2008/11/01 12:40:22 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-3.1.2.ebuild,v 1.5 2009/01/22 18:53:35 mr_bones_ Exp $
+EAPI=2
inherit autotools eutils games
L_URI="http://www.glest.org/files/contrib/translations"
@@ -23,7 +24,7 @@ KEYWORDS="~amd64 -ppc ~x86" # ppc: bug #145478
IUSE="linguas_pt_BR linguas_cs linguas_de linguas_hu linguas_no linguas_ru
linguas_tr"
-RDEPEND="media-libs/libsdl
+RDEPEND="|| ( media-libs/libsdl[joystick] <media-libs/libsdl-1.2.13-r1 )
media-libs/libogg
media-libs/libvorbis
media-libs/openal
@@ -40,10 +41,7 @@ S="${WORKDIR}"/${PN}-source-${PV}
GAMES_USE_SDL="nojoystick"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
epatch \
"${FILESDIR}"/${P}-{home,gcc43}.patch
@@ -61,13 +59,15 @@ src_unpack() {
sed -i 's:-O3 -g3::' Jamrules || die "sed Jamrules failed"
}
-src_compile() {
+src_configure() {
# Fails with wx enabled, bug #130011
egamesconf \
--with-vorbis=/usr \
--with-ogg=/usr \
- --with-wx-config=disabled_wx \
- || die
+ --with-wx-config=disabled_wx
+}
+
+src_compile() {
jam -q || die "jam failed"
}