Removed gcc-4.6 patch not necesssary for recent versions. Readded RDEPEND which myste...

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

diff --git a/games-engines/gemrb/ChangeLog b/games-engines/gemrb/ChangeLog
index c3ca9feec7ea05415296b224933b68185d1557b6..479003bcf7a9b06948811868a7cc575ba8bfb40b 100644 (file)
--- a/games-engines/gemrb/ChangeLog
+++ b/games-engines/gemrb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2012/01/05 19:17:38 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/ChangeLog,v 1.18 2012/01/10 05:35:10 calchan Exp $
+
+  10 Jan 2012; Denis Dupeyron <calchan@gentoo.org>
+  -files/gemrb-0.7.0-gcc46.patch, gemrb-0.6.4.ebuild, gemrb-0.6.6.ebuild,
+  gemrb-0.7.0.ebuild:
+  Removed gcc-4.6 patch not necesssary for recent versions. Readded RDEPEND
+  which mysteriously disappeared during the last commit.
 
 *gemrb-0.7.0 (05 Jan 2012)
 

diff --git a/games-engines/gemrb/Manifest b/games-engines/gemrb/Manifest
index a4e690522877640c2a4f7ebf44710bfbf6154dec..39743c119c3242152ba91b01f4a01eb510005f84 100644 (file)
--- a/games-engines/gemrb/Manifest
+++ b/games-engines/gemrb/Manifest
@@ -1,11 +1,10 @@
 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
-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
 DIST gemrb-0.7.0.tar.gz 2020563 RMD160 75e35d87d1cc0cf76e4a79ebbe0917a9141324ee SHA1 58c45f467eb9ceb0084524e8a88520e6e5384b9e SHA256 b183972901aa3aee7eb8ada5c19d0daa7e21dcdf08d070cdc0c21e01cb78b436
-EBUILD gemrb-0.6.4.ebuild 1359 RMD160 32a16c3b648de9130fa76d250359e4cee79a4338 SHA1 9f8e37f706ce78719503f43ac95e8d7c180ba27f SHA256 b5e01bc8511ff7a35044061f3a45626fc5cb50ca80d34a857b60955ac39478cf
-EBUILD gemrb-0.6.6.ebuild 1360 RMD160 d7c26e021af6826f4cd5a183383ed86b4e2c29dd SHA1 150998d787370388dc8030c9b0fdce3480c6baaf SHA256 2f60b3c54cebcf18534147b64a3750414c0a3ef09e2600059f349b0a5f0f5697
-EBUILD gemrb-0.7.0.ebuild 1402 RMD160 51c1aa522b1060ea949c3ae9600a612d5f0c626f SHA1 35593c1a5ce32a586a644d0478893617ecafd4ab SHA256 5a4602e273ecc700c577eb67ad6b187d37a24fdd178cdb6ce5272bfd994ea88f
-MISC ChangeLog 2662 RMD160 491a7dfdb6fd0052a7fd66d1123a0e61e80c9b07 SHA1 3918787eec449a70890ca26be71a6dbe51daf168 SHA256 83fa109d253c561e5cbca24677356cffbe2fa856610f279968bb3b09f0c0b0c4
+EBUILD gemrb-0.6.4.ebuild 1377 RMD160 19b11655c7682280c1298dedf4851a7662d32793 SHA1 ba5997e50a6de36e96584110e8e0535b9c1e0c46 SHA256 5fd2c2cc4bfe6248ace4453b3d67f9310b8cfac379fcc6dfba3c24f8a2a5ba59
+EBUILD gemrb-0.6.6.ebuild 1378 RMD160 0711964c2341acf0a2b88ae80d6fcb02c43d49ae SHA1 6a3de2f960c11910c134dde54f4bd459d8ae57b5 SHA256 5089acddaadbfb2257fcb6700aff058239fe4ed398421e26a7667c667b14cd9d
+EBUILD gemrb-0.7.0.ebuild 1381 RMD160 5b8b5e71e91b80c2117afadb17ae878ba01a3817 SHA1 8e916d96dbc4837a3207273e93dbc644cfa09970 SHA256 0ce54b70f4e97b150491718f1367227fae9e954d7f66f2a479fda0a04d25dd9d
+MISC ChangeLog 2943 RMD160 cacc268b4624857a453311a404cb702339fceaa6 SHA1 fe2e94962a991b3cb51dc822f99c22fa80326220 SHA256 07da8a011ff1105b994417a4afacb80a3ba0c8f54d79e2db05db0fb13b349fe0
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-engines/gemrb/files/gemrb-0.7.0-gcc46.patch b/games-engines/gemrb/files/gemrb-0.7.0-gcc46.patch
deleted file mode 100644 (file)
index e19fe62..0000000
--- a/games-engines/gemrb/files/gemrb-0.7.0-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
index b9a80223d917b87c1daf48fb6bfd0e841892ca76..bdab636e6547d6e34082d0f8415934da1041e091 100644 (file)
--- a/games-engines/gemrb/gemrb-0.6.4.ebuild
+++ b/games-engines/gemrb/gemrb-0.6.4.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.6.4.ebuild,v 1.6 2012/01/05 21:23:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.6.4.ebuild,v 1.7 2012/01/10 05:35:10 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 18daddc57584b46cd8c566931110cd24696106b8..80b98dcbf102d673a4564872421886fbbb7c49a7 100644 (file)
--- a/games-engines/gemrb/gemrb-0.6.6.ebuild
+++ b/games-engines/gemrb/gemrb-0.6.6.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.6.6.ebuild,v 1.4 2012/01/05 21:23:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.6.6.ebuild,v 1.5 2012/01/10 05:35:10 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.7.0.ebuild b/games-engines/gemrb/gemrb-0.7.0.ebuild
index 6e2835cdf1007ccc39fe4a37720dc1f2a783479e..d985dd28726e5ad65cb8d70b85560cf6b9f28aed 100644 (file)
--- 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.2 2012/01/05 21:23:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.7.0.ebuild,v 1.3 2012/01/10 05:35:10 calchan Exp $
 
 PYTHON_DEPEND="2"
 EAPI=2
@@ -24,6 +24,7 @@ DEPEND="media-libs/freetype
        media-libs/sdl-mixer
        media-libs/sdl-ttf
        sys-libs/zlib"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
        python_set_active_version 2
@@ -35,7 +36,6 @@ src_prepare() {
                -e '/COPYING/d' \
                CMakeLists.txt \
                || die
-       epatch "${FILESDIR}"/${P}-gcc46.patch
 }
 
 src_configure() {