Version bump. Fixed RDEPEND not being explicitely assigned. Removed unnecessary config sample. Removed old ebuild.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

6 files changed, 38 insertions, 241 deletions

diff --git a/games-engines/gemrb/ChangeLog b/games-engines/gemrb/ChangeLog
index 67872771af72..c3ca9feec7ea 100644
--- a/games-engines/gemrb/ChangeLog
+++ b/games-engines/gemrb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-engines/gemrb
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/ChangeLog,v 1.16 2011/12/31 21:55:50 ago Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/ChangeLog,v 1.17 2012/01/05 19:17:38 calchan Exp $
+
+*gemrb-0.7.0 (05 Jan 2012)
+
+  05 Jan 2012; Denis Dupeyron <calchan@gentoo.org>
+  +files/gemrb-0.7.0-gcc46.patch, +gemrb-0.7.0.ebuild, -files/GemRB.cfg.sample,
+  -gemrb-0.6.2.ebuild, gemrb-0.6.4.ebuild, gemrb-0.6.6.ebuild:
+  Version bump. Fixed RDEPEND not being explicitely assigned. Removed
+  unnecessary config sample. Removed old ebuild.
 
   31 Dec 2011; Agostino Sarubbo <ago@gentoo.org> gemrb-0.6.6.ebuild:
   Stable for AMD64, wrt bug #396621
diff --git a/games-engines/gemrb/files/GemRB.cfg.sample b/games-engines/gemrb/files/GemRB.cfg.sample
deleted file mode 100644
index 17c21fd08998..000000000000
--- a/games-engines/gemrb/files/GemRB.cfg.sample
+++ /dev/null
@@ -1,228 +0,0 @@
-#####################################################
-#                                                   #
-#  This is the GemRB Configuration file.            #
-#  Here are defined some default parameters for     #
-#  basic configuration and paths definition.        #
-#                                                   #
-#  Parameters are defined as a Name=Value pair      #
-#  The Value can be of three types:                 #
-#      - String                                     #
-#      - Integer                                    #
-#      - Boolean                                    #
-#                                                   #
-#  The String value is represented as follows       #
-#  i.e. H:\GemRB\plugins                            #
-#  Integers are defined as follows                  #
-#  i.e. 12723                                       #
-#  Booleans are represented as 1 or 0 in this file  #
-#                                                   #
-#  Lines starting with # are ignored                #
-#                                                   #
-#####################################################
-
-#####################################################
-#                                                   #
-#  Game Type [String] Use one of the following      #
-#  values:                                          #
-#                                                   #
-#  bg1       Baldur's Gate                          #
-#  bg2       Baldur's Gate 2 : SoA                  #
-#  tob       Baldur's Gate 2 : ToB                  #
-#  iwd       IceWind Dale                           #
-#  how       IceWind Dale : HoW or ToTL             #
-#  iwd2      IceWind Dale 2                         #
-#  pst       Planescape Torment                     #
-#  (More will come)                                 #
-#                                                   #
-#####################################################
-
-GameType=bg2
-
-#####################################################
-#  Game Name [String] Title for GemRB window, use   #
-#  anything you wish, e.g. Baldur's Gate 3: RotFL   #
-#####################################################
-
-GameName=Baldur's Gate 2
-
-#####################################################
-#  Video Parameters                                 #
-#####################################################
-
-#Screen width
-Width=640
-
-#Screen height
-Height=480
-
-#Bits per pixel [Integer:16,24,32]
-Bpp=32
-
-#Fullscreen [Boolean]
-Fullscreen=1
-
-# Delay before tooltips appear [milliseconds]
-TooltipDelay=500
-
-#####################################################
-#  Audio Parameters                                 #
-#####################################################
-#                                                   #
-# All volume options are in percents, with 100      #
-# being the normal and default volume               #
-#                                                   #
-#####################################################
-
-# Volume of ambient sounds
-VolumeAmbients = 100
-
-# Volume during movie playback
-VolumeMovie = 100
-
-# Volume of background music
-VolumeMusic = 100
-
-# Volume of sound effects
-VolumeSFX = 100
-
-# Volume of PC or NPC voices
-VolumeVoices = 100
-
-#####################################################
-#  Case Sensitive Filesystem [Boolean]              #
-#                                                   #
-#  If your installed game files are residing on a   #
-#  case sensitive filesystem (ext2 on Linux) then   #
-#  you need to set this value to 1, it has no       #
-#  effect on Windows                                #
-#####################################################
-
-CaseSensitive=1
-
-#GameOnCD=0
-
-#####################################################
-#  Debug                                            #
-#####################################################
-
-# Do not play intro videos [Boolean], useful for development
-SkipIntroVideos=0
-
-# Draw Frames per Second info [Boolean]
-DrawFPS=0
-
-# Hide unexplored parts of a map
-FogOfWar=1
-
-# Enable debug and cheat keystrokes, see docs/en/CheatKeys.txt
-#   full listing
-EnableCheatKeys=0
-
-#####################################################
-#  Paths                                            #
-#####################################################
-#                                                   #
-#  Note: You have to terminate all paths with the   #
-#  path separator character ('\' for Windows users, #
-#  '/' for Linux users)                             #
-#                                                   #
-#####################################################
-
-#####################################################
-#  Game Paths [String]                              #
-#                                                   #
-#  These are the paths where the Game you want to   #
-#  play is installed.                               #
-#  Enter the full path to the directory.             #
-#####################################################
-
-GamePath=/usr/share/games/bg2/
-CD1=/usr/share/games/bg2/
-CD2=/usr/share/games/bg2/
-CD3=/usr/share/games/bg2/
-CD4=/usr/share/games/bg2/
-CD5=/usr/share/games/bg2/
-
-#####################################################
-#  GemRB Path [String]                              #
-#                                                   #
-#  This is the path where GemRB is stored, just     #
-#  enter the full path to the GemRB executable      #
-#####################################################
-
-GemRBPath=/usr/share/games/gemrb/
-
-#####################################################
-#  GemRB Cache Path [String]                        #
-#                                                   #
-#  This is the path where GemRB will store the      #
-#  cached files, enter the full path to the GemRB   #
-#  Cache directory.                                 #
-#####################################################
-
-CachePath=/var/cache/gemrb/
-
-#####################################################
-#  GemRB GUI Scripts Path [String]                  #
-#                                                   #
-#  This is the path where GemRB GUI scripts are     #
-#  stored, usually these are in the GemRB directory #
-#  Enter the full path to the directory containing  #
-#  the 'GUIScript' subdirectory.                    #
-#####################################################
-
-GUIScriptsPath=/usr/share/games/gemrb/
-
-#####################################################
-#  GemRB Plugins Path [String]                      #
-#                                                   #
-#  This is the path containing GemRB plugins        #
-#  - shared libraries (.so) on Unixes, or           #
-#  DLLs (.dll) on windows.                          #
-#  Enter the full path to the directory.            #
-#                                                   #
-#  You may need to specify this path if running     #
-#  GemRB from source directory on Linux.            #
-#####################################################
-
-PluginsPath=/usr/games/lib/gemrb/plugins
-
-#####################################################
-#  GemRB Save Path [String]                         #
-#                                                   #
-#  This is the path where GemRB looks for saved     #
-#  games.                                           #
-#  Enter the full path to the directory containing  #
-#  e.g. the 'save' subdirectory.                    #
-#                                                   #
-#  You do not have to specify this if you use save  #
-#  subdir in the GamePath directory.                #
-#####################################################
-
-SavePath=~/.bg2/
-
-#####################################################
-#  Game Data Path [String]                          #
-#                                                   #
-#  This is the subdirectory under GamePath where    #
-#  game data files are stored.                      #
-#                                                   #
-#  You probably do NOT want to specify this!        #
-#####################################################
-
-#GameDataPath=data
-
-#####################################################
-#  Game Data Override Path [String]                 #
-#                                                   #
-#  This is the subdirectory under GamePath where    #
-#  game data override files are stored.             #
-#                                                   #
-#  You probably do NOT want to specify this!        #
-#####################################################
-
-#GameOverridePath=override
-
-#####################################################
-#  END                                              #
-#####################################################
diff --git a/games-engines/gemrb/files/gemrb-0.7.0-gcc46.patch b/games-engines/gemrb/files/gemrb-0.7.0-gcc46.patch
new file mode 100644
index 000000000000..e19fe628b911
--- /dev/null
+++ b/games-engines/gemrb/files/gemrb-0.7.0-gcc46.patch
@@ -0,0 +1,11 @@
+--- gemrb/core/EffectQueue.h.old	2011-06-01 17:24:47.102882668 +0200
++++ gemrb/core/EffectQueue.h	2011-06-01 17:25:07.399156225 +0200
+@@ -28,6 +28,8 @@
+ #ifndef EFFECTQUEUE_H
+ #define EFFECTQUEUE_H
+ 
++#include <cstddef>
++
+ #include "exports.h"
+ 
+ #include "Effect.h"
diff --git a/games-engines/gemrb/gemrb-0.6.4.ebuild b/games-engines/gemrb/gemrb-0.6.4.ebuild
index 125ff9492612..e57181c537f6 100644
--- a/games-engines/gemrb/gemrb-0.6.4.ebuild
+++ b/games-engines/gemrb/gemrb-0.6.4.ebuild
@@ -1,6 +1,6 @@
-# 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-engines/gemrb/gemrb-0.6.4.ebuild,v 1.4 2011/06/01 15:42:19 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.6.4.ebuild,v 1.5 2012/01/05 19:17:38 calchan Exp $
 
 PYTHON_DEPEND="2"
 EAPI=2
@@ -22,6 +22,7 @@ DEPEND=">=media-libs/libsdl-1.2[video]
 	media-libs/libpng
 	media-libs/sdl-mixer
 	media-libs/openal"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	python_set_active_version 2
diff --git a/games-engines/gemrb/gemrb-0.6.6.ebuild b/games-engines/gemrb/gemrb-0.6.6.ebuild
index 3e7f5b46da58..ec762cdff026 100644
--- a/games-engines/gemrb/gemrb-0.6.6.ebuild
+++ b/games-engines/gemrb/gemrb-0.6.6.ebuild
@@ -1,6 +1,6 @@
-# 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-engines/gemrb/gemrb-0.6.6.ebuild,v 1.2 2011/12/31 21:55:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.6.6.ebuild,v 1.3 2012/01/05 19:17:38 calchan Exp $
 
 PYTHON_DEPEND="2"
 EAPI=2
@@ -22,6 +22,7 @@ DEPEND=">=media-libs/libsdl-1.2[video]
 	media-libs/libpng
 	media-libs/sdl-mixer
 	media-libs/openal"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	python_set_active_version 2
diff --git a/games-engines/gemrb/gemrb-0.6.2.ebuild b/games-engines/gemrb/gemrb-0.7.0.ebuild
index 35321d0f0670..4f0b97f1212f 100644
--- a/games-engines/gemrb/gemrb-0.6.2.ebuild
+++ b/games-engines/gemrb/gemrb-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.6.2.ebuild,v 1.4 2010/11/03 21:48:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.7.0.ebuild,v 1.1 2012/01/05 19:17:38 calchan Exp $
 
 PYTHON_DEPEND="2"
 EAPI=2
@@ -13,15 +13,18 @@ SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.2[video]
-	sys-libs/zlib
-	media-libs/libvorbis
+DEPEND="media-libs/freetype
 	media-libs/libpng
+	>=media-libs/libsdl-1.2[video]
+	media-libs/libvorbis
+	media-libs/openal
 	media-libs/sdl-mixer
-	media-libs/openal"
+	media-libs/sdl-ttf
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -33,6 +36,7 @@ src_prepare() {
 		-e '/COPYING/d' \
 		CMakeLists.txt \
 		|| die
+	epatch "${FILESDIR}"/${P}-gcc46.patch
 }
 
 src_configure() {