fix to work with newer directfbs #84348

Package-Manager: portage-2.0.51.19

3 files changed, 19 insertions, 20 deletions

diff --git a/games-engines/freesci/Manifest b/games-engines/freesci/Manifest
index e568430a43fd..0077a55f93fb 100644
--- a/games-engines/freesci/Manifest
+++ b/games-engines/freesci/Manifest
@@ -1,6 +1,6 @@
 MD5 afcc6947e211a6c893fd9cbe3b653240 ChangeLog 1799
-MD5 a5c49c286699befb87df260bcbe877af freesci-0.3.4c.ebuild 1444
-MD5 8c24b9f2801aae8c249bfd4a1e5c7b97 freesci-0.6.1b.ebuild 1253
+MD5 c743715ea9964ffd1979901da12dd536 freesci-0.3.4c.ebuild 1499
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 49dbeda83201ca449d56080200f37b01 freesci-0.6.1b.ebuild 1292
 MD5 4806f4edfc5cc8c8277239b18cf9886c files/digest-freesci-0.3.4c 67
 MD5 ad530c74a05fba43200571ad9a1cab4e files/digest-freesci-0.6.1b 67
diff --git a/games-engines/freesci/freesci-0.3.4c.ebuild b/games-engines/freesci/freesci-0.3.4c.ebuild
index e9669fca757c..3a33de42f3e9 100644
--- a/games-engines/freesci/freesci-0.3.4c.ebuild
+++ b/games-engines/freesci/freesci-0.3.4c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/freesci-0.3.4c.ebuild,v 1.3 2004/07/01 05:23:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/freesci-0.3.4c.ebuild,v 1.4 2005/04/15 04:05:28 vapier Exp $
 
 inherit flag-o-matic games
 
@@ -10,23 +10,24 @@ SRC_URI="http://www-plan.cs.colorado.edu/creichen/freesci/${P}.tar.bz2
 	http://teksolv.de/~jameson/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86"
 IUSE="X ggi directfb alsa sdl ncurses"
 
 RDEPEND="virtual/libc
 	X? (
 		virtual/x11
-		=media-libs/freetype-2* )
+		=media-libs/freetype-2*
+	)
 	ggi? ( media-libs/libggi )
 	directfb? ( dev-libs/DirectFB )
 	alsa? ( >=media-libs/alsa-lib-0.5.0 )
 	sdl? ( >=media-libs/libsdl-1.1.8 )
 	ncurses? ( sys-libs/ncurses )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+DEPEND="${RDEPEND}"
 
 src_compile() {
+	sed -i -e 's:DSPF_RGB15:DSPF_ARGB1555:' src/gfx/drivers/directfb_driver.c
 	use X && append-flags -I/usr/include/freetype2
 	egamesconf \
 		$(use_with X x) \
diff --git a/games-engines/freesci/freesci-0.6.1b.ebuild b/games-engines/freesci/freesci-0.6.1b.ebuild
index 296ced80bbd8..c46fddc54ed4 100644
--- a/games-engines/freesci/freesci-0.6.1b.ebuild
+++ b/games-engines/freesci/freesci-0.6.1b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/freesci-0.6.1b.ebuild,v 1.5 2004/09/11 09:02:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/freesci-0.6.1b.ebuild,v 1.6 2005/04/15 04:05:28 vapier Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ SRC_URI="http://www-plan.cs.colorado.edu/reichenb/freesci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86" # upstream asked us to not stabilize this version
 IUSE="X ggi directfb alsa sdl ncurses"
 
 RDEPEND="virtual/libc
@@ -23,24 +23,22 @@ RDEPEND="virtual/libc
 	alsa? ( >=media-libs/alsa-lib-0.5.0 )
 	sdl? ( >=media-libs/libsdl-1.1.8 )
 	ncurses? ( sys-libs/ncurses )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-
+	cd "${S}"
 	sed -i \
 		-e "/^SUBDIRS/ s/conf debian//" Makefile.in \
 			|| die "sed Makefile.in failed"
 }
 src_compile() {
 	egamesconf \
-		`use_with X x` \
-		`use_with sdl` \
-		`use_with directfb` \
-		`use_with ggi` \
-		`use_with alsa` \
+		$(use_with X x) \
+		$(use_with sdl) \
+		$(use_with directfb) \
+		$(use_with ggi) \
+		$(use_with alsa) \
 		|| die
 	emake || die "emake failed"
 }