[gentoo-commits] gentoo-x86 commit in games-rpg/nwn-data: ChangeLog nwn-data-1.29-r4.ebuild

[Ulrich Mueller (ulm)]

ulm         12/03/01 06:52:06

  Modified:             ChangeLog nwn-data-1.29-r4.ebuild
  Log:
  Migrate to cdrom.eclass, bug 398809.
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.44                 games-rpg/nwn-data/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/nwn-data/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/nwn-data/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/nwn-data/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	10 Dec 2011 21:51:16 -0000	1.43
+++ ChangeLog	1 Mar 2012 06:52:06 -0000	1.44
@@ -1,6 +1,9 @@
 # ChangeLog for games-rpg/nwn-data
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.43 2011/12/10 21:51:16 calchan Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.44 2012/03/01 06:52:06 ulm Exp $
+
+  01 Mar 2012; Ulrich Müller <ulm@g.o> nwn-data-1.29-r4.ebuild:
+  Migrate to cdrom.eclass, bug 398809.
 
   10 Dec 2011; Denis Dupeyron <calchan@g.o> nwn-data-1.29-r4.ebuild:
   Fixed sandbox access-violation, bug #355581. Thanks to Christian.



1.8                  games-rpg/nwn-data/nwn-data-1.29-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r4.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r4.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r4.ebuild?r1=1.7&r2=1.8

Index: nwn-data-1.29-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r4.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nwn-data-1.29-r4.ebuild	10 Dec 2011 21:51:16 -0000	1.7
+++ nwn-data-1.29-r4.ebuild	1 Mar 2012 06:52:06 -0000	1.8
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r4.ebuild,v 1.7 2011/12/10 21:51:16 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r4.ebuild,v 1.8 2012/03/01 06:52:06 ulm Exp $
 
-inherit eutils games
+CDROM_OPTIONAL="yes"
+inherit eutils cdrom games
 
 # 3-in-1 DVD - NWN, SoU, HotU (1 disk)
 # Diamond DVD - NWN, SoU, HotU (1 disk)
@@ -40,9 +41,8 @@
 LICENSE="NWN-EULA"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="cdinstall hou nowin sou videos ${LANGUAGES}"
+IUSE="hou nowin sou videos ${LANGUAGES}"
 RESTRICT="strip mirror"
-PROPERTIES="cdinstall? ( interactive )"
 
 RDEPEND="virtual/opengl
 	>=media-libs/libsdl-1.2.5
@@ -465,12 +465,12 @@
 	rm -rf override/*
 	for a in ${A}
 	do
-	    currentlocale=""
-	    if [[ -z ${a/*german*/} ]]
-	    then
-	        currentlocale=de
-	    elif [[ -z ${a/*spanish*/} ]]
-	    then
+		currentlocale=""
+		if [[ -z ${a/*german*/} ]]
+		then
+			currentlocale=de
+		elif [[ -z ${a/*spanish*/} ]]
+		then
 			currentlocale=es
 		elif [[ -z ${a/*italian*/} ]]
 		then