stable on x86; `` -> $(); tidy

3 files changed, 42 insertions, 46 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index c5099efbe85c..1b56ab223613 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.56 2004/09/06 00:15:36 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.57 2004/09/17 09:28:16 mr_bones_ Exp $
+
+  17 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> libsdl-1.2.7-r2.ebuild:
+  stable on x86; `` -> $(); tidy
 
   06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> libsdl-1.2.7-r2.ebuild:
   Switch to use epause and ebeep, bug #62950
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index be51452b82eb..6cff0619531a 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5074715fa2ad4fbd78e35864ff07248a libsdl-1.2.7.ebuild 2486
-MD5 443983eeaff20f0a7a62f3c800bea9df ChangeLog 8381
+MD5 f7ce9f35ffca9f12a4f6f2f15bf4dee3 ChangeLog 8496
+MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 MD5 725053ce30b454e912aaab60c08caf10 libsdl-1.2.6-r3.ebuild 2854
 MD5 4cdef02cae2d28ec06e6fc752ff24602 libsdl-1.2.7-r1.ebuild 2750
-MD5 add8cc84073541e9f2cbe73822506ba3 libsdl-1.2.7-r2.ebuild 3213
-MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
-MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7 62
-MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568
-MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017
-MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
-MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317
-MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r2 62
+MD5 9433e31b5d1fd63898888edbff94f99e libsdl-1.2.7-r2.ebuild 3275
+MD5 5074715fa2ad4fbd78e35864ff07248a libsdl-1.2.7.ebuild 2486
 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 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196
+MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317
 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 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBO6t/LLFUmVNQ7rkRAm5WAJ96VwY0exdbR85cH7mzuuXNCB051gCgv117
-LhLHT1bePzIoYSAvnMSNCCg=
-=VPzv
------END PGP SIGNATURE-----
+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
diff --git a/media-libs/libsdl/libsdl-1.2.7-r2.ebuild b/media-libs/libsdl/libsdl-1.2.7-r2.ebuild
index aebf2e3d039e..39621a196de2 100644
--- a/media-libs/libsdl/libsdl-1.2.7-r2.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.6 2004/09/06 00:15:36 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r2.ebuild,v 1.7 2004/09/17 09:28:16 mr_bones_ Exp $
 
 inherit fixheadtails eutils gnuconfig
 
@@ -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="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ppc64"
 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
 
@@ -29,7 +29,7 @@ RDEPEND=">=media-libs/audiofile-0.1.9
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
 
-S=${WORKDIR}/SDL-${PV}
+S="${WORKDIR}/SDL-${PV}"
 
 pkg_setup() {
 	if use noaudio || use novideo || use nojoystick ; then
@@ -79,32 +79,35 @@ src_compile() {
 		--enable-timers \
 		--enable-endian \
 		--enable-file \
-		`use_enable oss` \
-		`use_enable alsa` \
-		`use_enable esd` \
-		`use_enable arts` \
-		`use_enable nas` \
-		`use_enable x86 nasm` \
-		`use_enable X video-x11` \
-		`use_enable dga` \
-		`use_enable xv video-x11-xv` \
-		`use_enable xinerama video-x11-xinerama` \
-		`use_enable dga video-dga` \
-		`use_enable fbcon video-fbcon` \
-		`use_enable directfb video-directfb` \
-		`use_enable ggi video-ggi` \
-		`use_enable svga video-svga` \
-		`use_enable aalib video-aalib` \
-		`use_enable libcaca video-caca` \
-		`use_enable opengl video-opengl` \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable esd) \
+		$(use_enable arts) \
+		$(use_enable nas) \
+		$(use_enable x86 nasm) \
+		$(use_enable X video-x11) \
+		$(use_enable dga) \
+		$(use_enable xv video-x11-xv) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable dga video-dga) \
+		$(use_enable fbcon video-fbcon) \
+		$(use_enable directfb video-directfb) \
+		$(use_enable ggi video-ggi) \
+		$(use_enable svga video-svga) \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
 		${myconf} || die
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	preplib
-	dosed "s:-pthread::g" /usr/lib/libSDL.la # Bug 34804
+	# Bug 34804
+	sed -i \
+		-e "s:-pthread::g" "${D}/usr/lib/libSDL.la" \
+		|| die "sed failed"
 	dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
 	dohtml -r ./
 }