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

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

7 files changed, 44 insertions, 261 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/Manifest b/games-engines/gemrb/Manifest
index 398aa953f8f9..58d31556e425 100644
--- a/games-engines/gemrb/Manifest
+++ b/games-engines/gemrb/Manifest
@@ -1,25 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX GemRB.cfg.sample 8730 RMD160 b7015af383014142727c821440797bba24eaabac SHA1 c3a51f01e18a67c97cd9e587568df057d1049074 SHA256 82423ffcd6f092c30375e1439383f4a5e38df5f4b090e0d98c3916a46d25bbe6
 AUX gemrb-0.6.4-gcc46.patch 508 RMD160 546e803c6554c6cae132132f4ece4498f7fe4c98 SHA1 120908c7f3a898187047afe54dd2df25ef09df8b SHA256 d676017ec88bebdd146db4cf25a45e8a6d287a98c1f519ab2b3b8b252112f9e8
 AUX gemrb-0.6.6-gcc46.patch 267 RMD160 53a9de240b57a01c6a59e3ee0a52ee714e38d54f SHA1 7d53d1206c96c938696c6e69d5b6ac9c55ca936e SHA256 1f5312e42e6556a023c29561af03c5a37d7c1651adc3148facbec7e476e03391
-DIST gemrb-0.6.2.tar.gz 1726415 RMD160 eb2a11e2ac8a5660ff5ccbb6f92df51cccf50676 SHA1 fab02d3eaf639ac74d4ba6623e95d29aad0f015a SHA256 68344f290c015feeba0671da647d6b7541f090dd876622ec1f5d8d07b1e6f927
+AUX gemrb-0.7.0-gcc46.patch 267 RMD160 53a9de240b57a01c6a59e3ee0a52ee714e38d54f SHA1 7d53d1206c96c938696c6e69d5b6ac9c55ca936e SHA256 1f5312e42e6556a023c29561af03c5a37d7c1651adc3148facbec7e476e03391
 DIST gemrb-0.6.4.tar.gz 1780439 RMD160 ea4b306c2eb55036a1c6713b00a18b89280c8d52 SHA1 bc2293c54d668c78c958c2008e37c238e0c300fe SHA256 f8bcbfb3e41d3cefc5836af1e66b6e9bd8234bef99f44daeb9c7b8b70c607f06
 DIST gemrb-0.6.6.tar.gz 1914217 RMD160 42a8622370eb8cfc12e425f68fc414d80b8513be SHA1 a8706486a82de89bb86f1c6e1c62e81df954a1e0 SHA256 dfb397883213c091d0c4378dc0935892dc2f02298b47264ea379ac125577b7b0
-EBUILD gemrb-0.6.2.ebuild 1317 RMD160 ed51b65bf4bbea0fb385c010ea88bc4c374a767a SHA1 31a123a1859c95b8da1c10c7bfa7011f129b697b SHA256 ac17246aa8eed16d9188afcd42d0744b410e9ef14332edfec817bc7f7dd28cf9
-EBUILD gemrb-0.6.4.ebuild 1356 RMD160 553dbf07bffe4fd650a7f67d417d6632ddee8351 SHA1 061b69f52fdd6c396f6ccb100e86d821cc7a5bcc SHA256 bee57d33f584bdb4b4d76c3ffc5b7c43267bdf4628fb0000c6d810b83d30316f
-EBUILD gemrb-0.6.6.ebuild 1354 RMD160 8a26549760ede1a8c69f0f5b515823b17778f00a SHA1 5792f7ed0acf9f7df144417c0e26299587fdb8d5 SHA256 8623b16485f6e7e1bb2cfa05031c5b4acf83b0573504f9ea4a049ebafcac9786
-MISC ChangeLog 2316 RMD160 9bd34f3b8343c54d3a571f3cf548c1fd0d031071 SHA1 da2a63f01a0f6aef00aab67f101fac1738b6d393 SHA256 b0f5cd2e31942ef149ac4535c04cea5409c38c6cd92a19b426f41f1fe99a3f7e
+DIST gemrb-0.7.0.tar.gz 2020563 RMD160 75e35d87d1cc0cf76e4a79ebbe0917a9141324ee SHA1 58c45f467eb9ceb0084524e8a88520e6e5384b9e SHA256 b183972901aa3aee7eb8ada5c19d0daa7e21dcdf08d070cdc0c21e01cb78b436
+EBUILD gemrb-0.6.4.ebuild 1377 RMD160 8afafef9b3afa62badb6ca54dd39d5ab458bd477 SHA1 87af69dc53da96c8caa5b10196776d7d9acc373f SHA256 f399238d8eedb3b67e45d86d0aead9753087cc0ce8d0faaf386b2be44837853e
+EBUILD gemrb-0.6.6.ebuild 1378 RMD160 9a49bf1121a41e882544f0fe70769c4e3b26df67 SHA1 76d4575546225b7f94764040386b51326c565404 SHA256 199c465ebbeb4a24daf4ec771ce8012043e414077af7061d87b74c151d710e3d
+EBUILD gemrb-0.7.0.ebuild 1420 RMD160 7ea9a6d6b5f362b8f6f03eb9507bd6cb791054cf SHA1 c4f60809f7239b2ff04d1e1e6a10c145a642cf2e SHA256 10704dfb834b24365449a9d0595d453fb7cf865ff79e2cf62610c06833648266
+MISC ChangeLog 2662 RMD160 491a7dfdb6fd0052a7fd66d1123a0e61e80c9b07 SHA1 3918787eec449a70890ca26be71a6dbe51daf168 SHA256 83fa109d253c561e5cbca24677356cffbe2fa856610f279968bb3b09f0c0b0c4
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJO/4TsAAoJEOTDgjZ80txdQwQH/1i+v8Os6fv3aENQnAjC5Ccu
-3gCy1SKE0cXHG6HkTPqvvxgQfmlBxQRhT5CMGh1Ac0Q6wjzDt2g1rSZcnR9rsv7X
-E/oQ7nIxsMJMSEOdCTjvCA5E1T6Dx1NnbdAquFXW+8TW1yAEaDUd4RKteknNgTOV
-hx5tJqn1hGw8D8lA2qRyRJPwjyLKxJitprU3d98sOXtvh0XM598D/xiaUuC+SBPk
-ZW55UUhlpWIOk566GyZ9bkGHc8AShjogL8U+vKIwOo5k27zvFS8+yLzWjstdjJpB
-w1x4SGe33fd7LLBsUNJKVXQuufSs45/2ZPdt5XUGNNDBcR6XffJm0FLcVH3MVDQ=
-=FCcw
------END PGP SIGNATURE-----
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() {