summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-09-24 16:21:07 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-09-24 16:21:07 +0000
commit8c329893226dbadd0cea6b638745975d3d3da837 (patch)
treeab56962d8ffabe8f92af7caa1274ab64ac0466f2
parentVersion bump. (diff)
downloadgentoo-2-8c329893226dbadd0cea6b638745975d3d3da837.tar.gz
gentoo-2-8c329893226dbadd0cea6b638745975d3d3da837.tar.bz2
gentoo-2-8c329893226dbadd0cea6b638745975d3d3da837.zip
Migrate to EAPI 2 in order to nuke built_with_use.
(Portage version: 2.2_rc40/cvs/Linux i686)
-rw-r--r--games-rpg/nwn/ChangeLog7
-rw-r--r--games-rpg/nwn/nwn-1.69.ebuild47
2 files changed, 17 insertions, 37 deletions
diff --git a/games-rpg/nwn/ChangeLog b/games-rpg/nwn/ChangeLog
index e665e1e3a1ea..e3faf4774419 100644
--- a/games-rpg/nwn/ChangeLog
+++ b/games-rpg/nwn/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-rpg/nwn
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.70 2008/08/13 19:09:26 calchan Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.71 2009/09/24 16:21:07 betelgeuse Exp $
+
+ 24 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> nwn-1.69.ebuild:
+ Migrate to EAPI 2 in order to nuke built_with_use.
13 Aug 2008; Denis Dupeyron <calchan@gentoo.org> nwn-1.69.ebuild:
Fixed LINGUAS issue, thanks to Michael Sterrett. Fixed QA warnings.
diff --git a/games-rpg/nwn/nwn-1.69.ebuild b/games-rpg/nwn/nwn-1.69.ebuild
index dc80411b2331..198143606cf4 100644
--- a/games-rpg/nwn/nwn-1.69.ebuild
+++ b/games-rpg/nwn/nwn-1.69.ebuild
@@ -1,6 +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-rpg/nwn/nwn-1.69.ebuild,v 1.2 2008/08/13 19:09:26 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.69.ebuild,v 1.3 2009/09/24 16:21:07 betelgeuse Exp $
+
+EAPI="2"
inherit eutils games
@@ -23,7 +25,14 @@ RESTRICT="mirror strip"
QA_DT_HASH="/opt/nwn/en/nwserver /opt/nwn/en/nwmain /opt/nwn/lib/libSDL-1.2.so.0.11.2 /opt/nwn/lib/libelf.so.1"
-RDEPEND=">=games-rpg/nwn-data-1.29-r3
+NWN_DATA=">=games-rpg/nwn-data-1.29-r3[sou?,hou?"
+
+# ${P} requires games-rpg/nwn-data emerged with at least LINGUAS=en or none at all
+RDEPEND="
+ || (
+ ${NWN_DATA},linguas_en]
+ ${NWN_DATA},-linguas_fr,-linguas_de,-linguas_es,-linguas_it]
+ )
virtual/opengl
>=media-libs/libsdl-1.2.5
!<games-rpg/nwmouse-0.1-r1
@@ -43,38 +52,6 @@ GAMES_LICENSE_CHECK="yes"
dir=${GAMES_PREFIX_OPT}/${PN}
Ddir=${D}/${dir}
-die_from_busted_nwn-data() {
- local use=$*
- ewarn "You must emerge games-rpg/nwn-data with USE=$use. You can fix this"
- ewarn "by doing the following:"
- echo
- elog "mkdir -p /etc/portage"
- elog "echo 'games-rpg/nwn-data $use' >> /etc/portage/package.use"
- elog "emerge --oneshot games-rpg/nwn-data"
- die "nwn-data requires USE=$use"
-}
-
-pkg_setup() {
- games_pkg_setup
- if use sou
- then
- built_with_use games-rpg/nwn-data sou || die_from_busted_nwn-data sou
- fi
- if use hou
- then
- built_with_use games-rpg/nwn-data hou || die_from_busted_nwn-data hou
- fi
-
- if ! built_with_use games-rpg/nwn-data linguas_en && \
- ( built_with_use games-rpg/nwn-data linguas_fr \
- || built_with_use games-rpg/nwn-data linguas_de \
- || built_with_use games-rpg/nwn-data linguas_es \
- || built_with_use games-rpg/nwn-data linguas_it )
- then
- die "${P} requires games-rpg/nwn-data emerged with at least LINGUAS=en or none at all"
- fi
-}
-
src_unpack() {
mkdir -p "${S}"/en
cd "${S}"/en