ebuild fixes thanks to jakub, bug 151137

Package-Manager: portage-2.1.2_pre3-r5

3 files changed, 68 insertions, 18 deletions

diff --git a/app-emulation/basiliskII/ChangeLog b/app-emulation/basiliskII/ChangeLog
index a79b18360f2b..5e3600796cb1 100644
--- a/app-emulation/basiliskII/ChangeLog
+++ b/app-emulation/basiliskII/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/basiliskII
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/basiliskII/ChangeLog,v 1.18 2005/05/22 10:25:53 blubb Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/basiliskII/ChangeLog,v 1.19 2006/10/20 19:44:32 genstef Exp $
+
+  20 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
+  basiliskII-1.0.0_pre20050412.ebuild:
+  ebuild fixes thanks to jakub, bug 151137
 
   22 May 2005; Simon Stelling <blubb@gentoo.org>
   basiliskII-1.0.0_pre20050412.ebuild:
diff --git a/app-emulation/basiliskII/Manifest b/app-emulation/basiliskII/Manifest
index a97a073c128b..60fd1146f3a9 100644
--- a/app-emulation/basiliskII/Manifest
+++ b/app-emulation/basiliskII/Manifest
@@ -1,7 +1,28 @@
-MD5 df0308fb97db4aa6f7843bc0a649b49c ChangeLog 2935
+AUX basiliskII-gcc34.patch 2193 RMD160 bebb819c515f4615442a7fab77d91c7e33d2cc94 SHA1 44d369c48da118a0990c196ba00250c85b10a0b3 SHA256 8ba249502528971579eec086ea90dd37a3127ea5a05fbca9fa7490ec03e89aa3
+MD5 6873919eb3ff20c0acc6b1a7525fbd56 files/basiliskII-gcc34.patch 2193
+RMD160 bebb819c515f4615442a7fab77d91c7e33d2cc94 files/basiliskII-gcc34.patch 2193
+SHA256 8ba249502528971579eec086ea90dd37a3127ea5a05fbca9fa7490ec03e89aa3 files/basiliskII-gcc34.patch 2193
+DIST BasiliskII_src_15012002.tar.gz 494773
+DIST basiliskII-1.0.0_pre20050412.tar.bz2 1014307
+EBUILD basiliskII-1.0.0_pre20020115.ebuild 2681 RMD160 4dcfa812ffa2de5291d598f0034146abdb0658a3 SHA1 754efd0e67676662d9e2342f8d10df265e9f8713 SHA256 90e278d6e21632998220d6b47cd72d47b91f28415d9792e13208ce691dcd201a
 MD5 80e11b9d033934e7d98ad963a4855cc0 basiliskII-1.0.0_pre20020115.ebuild 2681
-MD5 13da7a20711b81a0eb99e7321407a2c6 basiliskII-1.0.0_pre20050412.ebuild 2552
+RMD160 4dcfa812ffa2de5291d598f0034146abdb0658a3 basiliskII-1.0.0_pre20020115.ebuild 2681
+SHA256 90e278d6e21632998220d6b47cd72d47b91f28415d9792e13208ce691dcd201a basiliskII-1.0.0_pre20020115.ebuild 2681
+EBUILD basiliskII-1.0.0_pre20050412.ebuild 3132 RMD160 a4ce584e5573c8ccf8dd46a44f0b5b53108ed8c1 SHA1 2f44b4b16b3c9585e0eb94f60c8c81d5149d3759 SHA256 c5c3a60f54411cb66e5c83bb1bffecd6a2e268a15046758c308a46e47a74e5ed
+MD5 8347e87807d01cab5be3ea056d1ffe31 basiliskII-1.0.0_pre20050412.ebuild 3132
+RMD160 a4ce584e5573c8ccf8dd46a44f0b5b53108ed8c1 basiliskII-1.0.0_pre20050412.ebuild 3132
+SHA256 c5c3a60f54411cb66e5c83bb1bffecd6a2e268a15046758c308a46e47a74e5ed basiliskII-1.0.0_pre20050412.ebuild 3132
+MISC ChangeLog 3073 RMD160 e5660c62d3b5d879eec78b199c47790dec676588 SHA1 34de27650056f44bae743460e0ef23ae48fd0e52 SHA256 601c37d20ea95d556d600a9026c825a09f069108204e4333ffdb1c55d9b11be5
+MD5 fc9b890bd83f4f6a3561fbbdae536363 ChangeLog 3073
+RMD160 e5660c62d3b5d879eec78b199c47790dec676588 ChangeLog 3073
+SHA256 601c37d20ea95d556d600a9026c825a09f069108204e4333ffdb1c55d9b11be5 ChangeLog 3073
+MISC metadata.xml 454 RMD160 44205ea1370647fb61f2b0fc7f6cc7b155c7e7fc SHA1 11f9484a327c5f8d0405a45304a73b678c8820c5 SHA256 dd455243adc7a2cba5ed0e18312b0675a99fd03be50e8d7fcf64c76d9877a721
 MD5 53062b17bc63eab61e30867d93446703 metadata.xml 454
-MD5 6873919eb3ff20c0acc6b1a7525fbd56 files/basiliskII-gcc34.patch 2193
+RMD160 44205ea1370647fb61f2b0fc7f6cc7b155c7e7fc metadata.xml 454
+SHA256 dd455243adc7a2cba5ed0e18312b0675a99fd03be50e8d7fcf64c76d9877a721 metadata.xml 454
 MD5 8d473aa97b40ed58727e0e364223a39c files/digest-basiliskII-1.0.0_pre20020115 75
+RMD160 c59b78e0849da373ebc7a5be8d74c0a50f818afa files/digest-basiliskII-1.0.0_pre20020115 75
+SHA256 d5cc716acc4d1f8c0d84dc3889e2cd3b3ddfab3aff705f6009677713fb616e42 files/digest-basiliskII-1.0.0_pre20020115 75
 MD5 63ff1a9ccaba02f8135a8319b00071bb files/digest-basiliskII-1.0.0_pre20050412 82
+RMD160 1ca2ab11f7406f599b10fe0254a1ada4f788c285 files/digest-basiliskII-1.0.0_pre20050412 82
+SHA256 3466c81e9b01362788551029d97ad81a7824ddce57f9683240f8d2efc421ef97 files/digest-basiliskII-1.0.0_pre20050412 82
diff --git a/app-emulation/basiliskII/basiliskII-1.0.0_pre20050412.ebuild b/app-emulation/basiliskII/basiliskII-1.0.0_pre20050412.ebuild
index 41d133b4cfbb..188045939dd0 100644
--- a/app-emulation/basiliskII/basiliskII-1.0.0_pre20050412.ebuild
+++ b/app-emulation/basiliskII/basiliskII-1.0.0_pre20050412.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/basiliskII/basiliskII-1.0.0_pre20050412.ebuild,v 1.2 2005/05/22 10:25:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/basiliskII/basiliskII-1.0.0_pre20050412.ebuild,v 1.3 2006/10/20 19:44:32 genstef Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="X gtk xv esd dga"
+IUSE="dga esd gtk nls sdl"
 
 ### We'll set $S Manually, it's version dependant, and nested strangely.
 S=${WORKDIR}/${P}/src/Unix
@@ -24,14 +24,38 @@ S=${WORKDIR}/${P}/src/Unix
 ### gtk and esd support are compile time options, we'll check the usual
 ### use variables here and set ./configure options accordingly
 
-DEPEND="esd? ( media-sound/esound )
-	gtk? ( =x11-libs/gtk+-1.2* )"
-
+RDEPEND="esd? ( media-sound/esound )
+	gtk? ( =x11-libs/gtk+-1.2* gnome-base/libgnomeui )
+	!sdl? ( dga? ( x11-libs/libXxf86dga ) )
+	sdl? ( media-libs/libsdl )
+	nls? ( virtual/libintl )
+	x11-libs/libSM
+	x11-libs/libXi
+	x11-libs/libXxf86vm
+	!app-emulation/basiliskII-jit"
+
+DEPEND="${RDEPEND}
+	!sdl? ( dga? ( x11-proto/xf86dgaproto ) )
+	nls? ( sys-devel/gettext )
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	#prevent prestripped binary
+	sed -i -e '/^INSTALL_PROGRAM/s/-s//' Makefile.in
+	
+	if use sdl && use dga ; then
+		einfo "SDL support was requested, DGA will be disabled"
+	fi
+}
 
 src_compile() {
 	#fpu_x86 doesnt compile properly if -O3 or greater :(
 	replace-flags -O[3-9] -O2
-
 	strip-flags -mpowerpc-gfxopt
 
 	local myflags
@@ -39,11 +63,14 @@ src_compile() {
 ### Default ./configure options are all =yes by default. we'll check for
 ### and use -values and switch them accordingly
 
-	use X || myflags="${myflags} --with-x=no"
 	use esd || myflags="${myflags} --with-esd=no"
 	use gtk || myflags="${myflags} --with-gtk=no"
-	use dga || myflags="${myflags} --with-dga=no"
-	use xv || myflags="${myflags} --enable-xf86-vidmode=no"
+	use dga || myflags="${myflags} --enable-xf86-dga=no"
+	use nls || myflags="${myflags} --disable-nls"
+	use sdl && myflags="${myflags} \
+		--enable-sdl-video=yes \
+		--enable-sdl-audio=yes"
+
 
 	./configure \
 		--host=${CHOST} \
@@ -53,9 +80,7 @@ src_compile() {
 		${myflags} || die "BasiliskII ./configure Failed"
 
 	#hack to link against libstdc++ for gcc3.x compatibility
-	cp Makefile Makefile.old
-	sed -e 's:-o $(OBJ_DIR)/gencpu:-lstdc++ -o $(OBJ_DIR)/gencpu:' \
-		Makefile.old > Makefile
+	sed -i -e 's:-o $(OBJ_DIR)/gencpu:-lstdc++ -o $(OBJ_DIR)/gencpu:' Makefile
 
 	emake -j1 || die "BasiliskII Make Failed"
 }