diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2007-03-15 12:18:42 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2007-03-15 12:18:42 +0000 |
| commit | 1b5a6aa3fe1425071604a9e9f0a7a949bb137695 (patch) | |
| tree | 859810b8bc5f1174b33ca837b67d28ac1263e184 /games-strategy | |
| parent | sdl-mixer no longer has the oggvorbis flag (diff) | |
| download | historical-1b5a6aa3fe1425071604a9e9f0a7a949bb137695.tar.gz historical-1b5a6aa3fe1425071604a9e9f0a7a949bb137695.tar.bz2 historical-1b5a6aa3fe1425071604a9e9f0a7a949bb137695.zip | |
sdl-mixer no longer has the oggvorbis flag
Package-Manager: portage-2.1.2.2
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/freelords/freelords-0.3.7.ebuild | 25 | ||||
| -rw-r--r-- | games-strategy/wesnoth/wesnoth-1.2.2.ebuild | 4 |
2 files changed, 15 insertions, 14 deletions
diff --git a/games-strategy/freelords/freelords-0.3.7.ebuild b/games-strategy/freelords/freelords-0.3.7.ebuild index cb4818bdfd6f..9c16eb8ab855 100644 --- a/games-strategy/freelords/freelords-0.3.7.ebuild +++ b/games-strategy/freelords/freelords-0.3.7.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.7.ebuild,v 1.7 2006/10/05 20:58:22 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.7.ebuild,v 1.8 2007/03/15 12:17:18 nyhm Exp $ inherit eutils games DESCRIPTION="Free Warlords clone" HOMEPAGE="http://www.freelords.org/" -SRC_URI="mirror://sourceforge/freelords/${P}.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -KEYWORDS="~amd64 ppc x86" LICENSE="GPL-2" SLOT="0" +KEYWORDS="~amd64 ppc x86" IUSE="editor nls" RDEPEND="dev-libs/expat media-libs/sdl-mixer - >=media-libs/libsdl-1.2 - >=media-libs/sdl-image-1.2 + media-libs/libsdl + media-libs/sdl-image >=media-libs/freetype-2 >=media-libs/paragui-1.1.8 !=media-libs/paragui-1.0* @@ -27,8 +27,8 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" pkg_setup() { - if ! built_with_use -o media-libs/sdl-mixer vorbis oggvorbis ; then - die "Please emerge sdlmixer with USE=vorbis" + if ! built_with_use media-libs/sdl-mixer vorbis ; then + die "Please emerge sdl-mixer with USE=vorbis" fi games_pkg_setup } @@ -44,8 +44,9 @@ src_unpack() { -e '/^localedir/ s:$(datadir):/usr/share:' \ -e 's:$(prefix)/share/locale:/usr/share/locale:' src/Makefile.in \ || die "sed src/Makefile.in failed" - epatch ${FILESDIR}/${P}-gcc41.patch - epatch ${FILESDIR}/${P}-freelordsrc.patch + epatch \ + "${FILESDIR}"/${P}-gcc41.patch \ + "${FILESDIR}"/${P}-freelordsrc.patch } src_compile() { @@ -61,11 +62,11 @@ src_compile() { } src_install() { - make \ + emake \ DESTDIR="${D}" \ localedir="/usr/share/locale" \ fldesktopdir="/usr/share/applications" \ - install || die "make install failed" + install || die "emake install failed" dodoc AUTHORS BUGS ChangeLog DEPENDENCIES HACKER NEWS README TODO \ doc/[[:upper:]]* prepgamesdirs diff --git a/games-strategy/wesnoth/wesnoth-1.2.2.ebuild b/games-strategy/wesnoth/wesnoth-1.2.2.ebuild index 5641784fd811..8c5645f62522 100644 --- a/games-strategy/wesnoth/wesnoth-1.2.2.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.2.2.ebuild,v 1.2 2007/02/25 05:25:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.2.2.ebuild,v 1.3 2007/03/15 12:18:42 nyhm Exp $ inherit eutils toolchain-funcs flag-o-matic games @@ -33,7 +33,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}-${MY_PV} pkg_setup() { - if ! built_with_use -o media-libs/sdl-mixer vorbis oggvorbis ; then + if ! built_with_use media-libs/sdl-mixer vorbis ; then die "Please emerge media-libs/sdl-mixer with USE=vorbis" fi if ! built_with_use media-libs/sdl-image png ; then |