--- /usr/portage/media-libs/libsdl/libsdl-1.2.11-r1.ebuild	2007-03-05 18:06:12.000000000 +0100
+++ /usr/local/portage/media-libs/libsdl/libsdl-1.2.11-r2.ebuild	2007-03-11 17:26:14.000000000 +0100
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r1.ebuild,v 1.5 2007/03/05 16:47:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r1.ebuild,v 1.4 2007/02/13 14:24:10 gustavoz Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
 DESCRIPTION="Simple Direct Media Layer"
 HOMEPAGE="http://www.libsdl.org/"
@@ -74,30 +74,35 @@
 	epatch "${FILESDIR}"/${P}-libcaca-new-api.patch #40224
 	epatch "${FILESDIR}"/${P}-sdl-config.patch
 	epatch "${FILESDIR}"/${P}-xinerama-head-0.patch #145917
 	epatch "${FILESDIR}"/${P}-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch #148186
 	epatch "${FILESDIR}"/${P}-audioConv.patch #151991
+	epatch "${FILESDIR}"/${P}-no-yasm.patch #169388
 	epatch "${FILESDIR}"/${P}-fbcon-page-header.patch #159923 #169388
+	epatch "${FILESDIR}"/${P}-dont-propagate-lpthread.patch #Fixes Debian bug #401950 and Debian bug #380508
+	epatch "${FILESDIR}"/${P}-supermount-double-free-issue.patch #Fixes Debian bug #375822
 
-	# add yasm-compatible defines to nasm code (hopefully we
-	# can get this killed soonish)
-	local f
-	for f in "${S}"/src/hermes/*.asm ; do
-		cat <<-EOF >> "${f}"
-		%ifidn __YASM_OBJFMT__,elf
-		section ".note.GNU-stack" noalloc noexec nowrite progbits
-		%endif
-		EOF
-	done
-
-	# yasm does not understand -i
-	# bug #147201
-	sed -i \
-		-e 's:NASMFLAGS -i:NASMFLAGS -I:' \
-		configure.in \
-		|| die "sed failed"
-
+	#We're using NASM
+	## add yasm-compatible defines to nasm code (hopefully we
+	## can get this killed soonish)
+	#local f
+	#for f in "${S}"/src/hermes/*.asm ; do
+	#	cat <<-EOF >> "${f}"
+	#	%ifidn __YASM_OBJFMT__,elf
+	#	section ".note.GNU-stack" noalloc noexec nowrite progbits
+	#	%endif
+	#	EOF
+	#done
+
+	#we're using NASM
+	## yasm does not understand -i
+	## bug #147201
+	#sed -i \
+	#	-e 's:NASMFLAGS -i:NASMFLAGS -I:' \
+	#	configure.in \
+	#	|| die "sed failed"
+	#
 	./autogen.sh || die "autogen failed"
 	elibtoolize
 }
 
 src_compile() {