6 files changed, 7 insertions, 164 deletions
diff --git a/games-engines/gemrb/ChangeLog b/games-engines/gemrb/ChangeLog
index 2574510ec12e..4f5b75838e6f 100644
--- a/games-engines/gemrb/ChangeLog
+++ b/games-engines/gemrb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-engines/gemrb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/ChangeLog,v 1.22 2012/04/13 19:18:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/ChangeLog,v 1.23 2012/05/04 18:51:08 mr_bones_ Exp $
+
+  04 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/gemrb-0.6.4-gcc46.patch, -files/gemrb-0.6.6-gcc46.patch,
+  -gemrb-0.6.4.ebuild, -gemrb-0.6.6.ebuild, gemrb-0.7.0.ebuild:
+  old
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> gemrb-0.6.4.ebuild,
   gemrb-0.6.6.ebuild, gemrb-0.7.0.ebuild:
diff --git a/games-engines/gemrb/files/gemrb-0.6.4-gcc46.patch b/games-engines/gemrb/files/gemrb-0.6.4-gcc46.patch
deleted file mode 100644
index bb42c1006bd1..000000000000
--- a/games-engines/gemrb/files/gemrb-0.6.4-gcc46.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gemrb/core/Item.h.old	2011-06-01 17:18:40.106859741 +0200
-+++ gemrb/core/Item.h	2011-06-01 17:21:27.123335949 +0200
-@@ -28,6 +28,8 @@
- #ifndef ITEM_H
- #define ITEM_H
- 
-+#include <cstddef>
-+
- #include "exports.h"
- #include "ie_types.h"
- 
---- 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/files/gemrb-0.6.6-gcc46.patch b/games-engines/gemrb/files/gemrb-0.6.6-gcc46.patch
deleted file mode 100644
index e19fe628b911..000000000000
--- a/games-engines/gemrb/files/gemrb-0.6.6-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index da2d0b9c40a4..000000000000
--- a/games-engines/gemrb/gemrb-0.6.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.8 2012/04/13 19:18:57 ulm Exp $
-
-EAPI=2
-PYTHON_DEPEND="2"
-WANT_CMAKE=always
-inherit eutils python cmake-utils games
-
-DESCRIPTION="Reimplementation of the Infinity engine"
-HOMEPAGE="http://gemrb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.2[video]
-	sys-libs/zlib
-	media-libs/libvorbis
-	media-libs/libpng
-	media-libs/sdl-mixer
-	media-libs/openal"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-	games_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/COPYING/d' \
-		CMakeLists.txt \
-		|| die
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBIN_DIR="${GAMES_BINDIR}"
-		-DDATA_DIR="${GAMES_DATADIR}/gemrb"
-		-DSYSCONF_DIR="${GAMES_SYSCONFDIR}/gemrb"
-		-DLIB_DIR="$(games_get_libdir)"
-		-DMAN_DIR=/usr/share/man/man6
-		-DICON_DIR=/usr/share/pixmaps
-		-DMENU_DIR=/usr/share/applications
-		-DDOC_DIR="/usr/share/doc/${PF}"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README NEWS AUTHORS
-	prepgamesdirs
-	prepalldocs
-}
diff --git a/games-engines/gemrb/gemrb-0.6.6.ebuild b/games-engines/gemrb/gemrb-0.6.6.ebuild
deleted file mode 100644
index 5a3998e8df9f..000000000000
--- a/games-engines/gemrb/gemrb-0.6.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.7 2012/04/13 19:18:57 ulm Exp $
-
-EAPI=2
-PYTHON_DEPEND="2"
-WANT_CMAKE=always
-inherit eutils python cmake-utils games
-
-DESCRIPTION="Reimplementation of the Infinity engine"
-HOMEPAGE="http://gemrb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.2[video]
-	sys-libs/zlib
-	media-libs/libvorbis
-	media-libs/libpng
-	media-libs/sdl-mixer
-	media-libs/openal"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-	games_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/COPYING/d' \
-		CMakeLists.txt \
-		|| die
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBIN_DIR="${GAMES_BINDIR}"
-		-DDATA_DIR="${GAMES_DATADIR}/gemrb"
-		-DSYSCONF_DIR="${GAMES_SYSCONFDIR}/gemrb"
-		-DLIB_DIR="$(games_get_libdir)"
-		-DMAN_DIR=/usr/share/man/man6
-		-DICON_DIR=/usr/share/pixmaps
-		-DMENU_DIR=/usr/share/applications
-		-DDOC_DIR="/usr/share/doc/${PF}"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README NEWS AUTHORS
-	prepgamesdirs
-	prepalldocs
-}
diff --git a/games-engines/gemrb/gemrb-0.7.0.ebuild b/games-engines/gemrb/gemrb-0.7.0.ebuild
index 524475e66be5..ccd26fb26efa 100644
--- a/games-engines/gemrb/gemrb-0.7.0.ebuild
+++ b/games-engines/gemrb/gemrb-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # 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.7.0.ebuild,v 1.6 2012/04/13 19:18:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.7.0.ebuild,v 1.7 2012/05/04 18:51:08 mr_bones_ Exp $
 
 EAPI=2
 PYTHON_DEPEND="2"
@@ -24,7 +24,6 @@ DEPEND="media-libs/freetype
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf
 	sys-libs/zlib"
-RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	python_set_active_version 2