stable for x86; use toolchain-funcs; tidy

3 files changed, 26 insertions, 24 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index cd1c4cd49c86..456ddda743d6 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.60 2004/10/01 10:19:07 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.61 2004/11/06 04:07:05 mr_bones_ Exp $
+
+  05 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> libsdl-1.2.7-r3.ebuild:
+  stable for x86; use toolchain-funcs; tidy
 
   01 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> libsdl-1.2.6-r3.ebuild,
   libsdl-1.2.7-r1.ebuild, libsdl-1.2.7-r2.ebuild, libsdl-1.2.7-r3.ebuild,
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index a79724c435ea..a76b0c3f6204 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,21 +1,21 @@
-MD5 2d0f23c9876b580e5afc0823267498db ChangeLog 9127
+MD5 fe0a3840517bd6cbc4248060279bd234 ChangeLog 9251
+MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 MD5 ca3bfcb303f4ddb5c6f708f377e4dc61 libsdl-1.2.6-r3.ebuild 2900
-MD5 df227c0b42516d12513e066ac110c1ca libsdl-1.2.7.ebuild 2531
 MD5 894fae13cc92aaec797c7eee55743d1d libsdl-1.2.7-r1.ebuild 2823
-MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 MD5 cd95873b9f837770c2fb0928b69536aa libsdl-1.2.7-r2.ebuild 3721
-MD5 4dcb2e6fa58d4b163847c26f08deef83 libsdl-1.2.7-r3.ebuild 3737
-MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
-MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568
-MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568
-MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
-MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7 62
-MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
+MD5 df227c0b42516d12513e066ac110c1ca libsdl-1.2.7.ebuild 2531
+MD5 8db12d6d6a4e925af2fbb8554ad4cb24 libsdl-1.2.7-r3.ebuild 3760
 MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266
 MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r1 62
+MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
+MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7 62
 MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
 MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317
-MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017
+MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
+MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
+MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568
+MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568
 MD5 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196
 MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r2 62
+MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017
 MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62
diff --git a/media-libs/libsdl/libsdl-1.2.7-r3.ebuild b/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
index 9059f9d4f361..36e247ce6024 100644
--- a/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r3.ebuild,v 1.2 2004/10/01 10:19:07 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r3.ebuild,v 1.3 2004/11/06 04:07:05 mr_bones_ Exp $
 
-inherit fixheadtails eutils gnuconfig
+inherit toolchain-funcs fixheadtails eutils gnuconfig
 
 DESCRIPTION="Simple Direct Media Layer"
 HOMEPAGE="http://www.libsdl.org/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick"
 # if you disable audio/video/joystick and something breaks, you pick up the pieces
 
@@ -43,13 +43,13 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${PV}-nobuggy-X.patch #30089
-	epatch ${FILESDIR}/${PV}-libcaca.patch #40224
-	epatch ${FILESDIR}/${PV}-gcc34.patch #48947
-	epatch ${FILESDIR}/${PV}-joystick2.patch #52833
-	epatch ${FILESDIR}/${PV}-26headers.patch #58192
+	epatch "${FILESDIR}/${PV}-nobuggy-X.patch" #30089
+	epatch "${FILESDIR}/${PV}-libcaca.patch" #40224
+	epatch "${FILESDIR}/${PV}-gcc34.patch" #48947
+	epatch "${FILESDIR}/${PV}-joystick2.patch" #52833
+	epatch "${FILESDIR}/${PV}-26headers.patch" #58192
 
 	ht_fix_file configure.in
 
@@ -60,12 +60,11 @@ src_unpack() {
 	fi
 
 	./autogen.sh || die "autogen failed"
-
 	gnuconfig_update
 }
 
 src_compile() {
-	local myconf=""
+	local myconf=
 	use noaudio && myconf="${myconf} --disable-audio"
 	use novideo \
 		&& myconf="${myconf} --disable-video" \
@@ -78,7 +77,7 @@ src_compile() {
 		# dependency loop, only link against DirectFB if it
 		# isn't broken #61592
 		echo 'int main(){}' > directfb-test.c
-		$(gcc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
+		$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
 			&& directfbconf="--enable-video-directfb" \
 			|| ewarn "Disabling DirectFB since libdirectfb.so is broken"
 	fi