Changed horrible error in ebuild. Closes #22638

5 files changed, 22 insertions, 15 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 54570da60d9a..51be37cbf896 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.23 2003/05/28 19:59:27 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.24 2003/06/11 22:11:12 mholzer Exp $
+
+*libsdl-1.2.4.20020601 (12 Jun 2003)
+
+  12 Jun 2003; Martin Holzer <mholzer@gentoo.org>
+  libsdl-1.2.4.20020601.ebuild, libsdl-1.2.5-r1.ebuild,
+  libsdl-1.2.5-r2.ebuild:
+  Changed horrible error in ebuild. Closes #22638
 
   28 May 2003; Hanno Boeck <hanno@gentoo.org> libsdl-1.2.5-r2.ebuild,
   files/libsdl_gcc33_fix.diff:
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 544438733c13..179f91162f89 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,9 +1,9 @@
-MD5 ac245c80fc6636786b634a178ff84191 ChangeLog 4104
-MD5 ff6c12b79f61c5485a5de229a749902e libsdl-1.2.4.20020601.ebuild 2832
-MD5 3ca18eb3885b307b310684bf91b83b21 libsdl-1.2.5-r1.ebuild 3054
-MD5 a001e2018775d8a7642ee27ba75b5cac libsdl-1.2.5-r2.ebuild 3241
-MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r1 62
+MD5 678c69cd2921501e939bb38db79ead5e ChangeLog 4327
+MD5 39a7f5ce4957584ffe72e763f5b32095 libsdl-1.2.4.20020601.ebuild 2853
+MD5 87951c93a0af36cee069c0949e695e67 libsdl-1.2.5-r1.ebuild 3076
+MD5 3d4c2ba49af5a2b1b4596e181226c187 libsdl-1.2.5-r2.ebuild 3263
 MD5 ec27096ad41cb3dce80e23f866133db6 files/digest-libsdl-1.2.4.20020601 75
+MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r1 62
 MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r2 62
 MD5 5edca4bf94580e34fce654d8a91d5dd7 files/libsdl-1.2.5-xfree-4.3.patch.bz2 1759
 MD5 2468dd594bc1f3ad3b47bcf69ba5ded2 files/libsdl_gcc33_fix.diff 395
diff --git a/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild b/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild
index b150a0d50561..8c8ea4b138db 100644
--- a/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild,v 1.13 2003/02/13 12:50:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.4.20020601.ebuild,v 1.14 2003/06/11 22:11:12 mholzer Exp $
 
 IUSE="arts xv opengl fbcon aalib nas esd X svga ggi alsa directfb"
 
@@ -54,8 +54,8 @@ src_compile() {
 		|| myconf="${myconf} --disable-video-x11-xv"
 
 	use esd \
-		&& myconf="--enable-esd" \
-		|| myconf="--disable-esd"
+		&& myconf="${myconf} --enable-esd" \
+		|| myconf="${myconf} --disable-esd"
 
 	use ggi \
 		&& myconf="${myconf} --enable-video-ggi" \
diff --git a/media-libs/libsdl/libsdl-1.2.5-r1.ebuild b/media-libs/libsdl/libsdl-1.2.5-r1.ebuild
index 9e80837d6b05..508d5296b66a 100644
--- a/media-libs/libsdl/libsdl-1.2.5-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.5-r1.ebuild,v 1.6 2003/03/26 04:16:03 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.5-r1.ebuild,v 1.7 2003/06/11 22:11:12 mholzer Exp $
 
 IUSE="arts xv opengl fbcon aalib nas esd X svga ggi alsa"
 
@@ -48,8 +48,8 @@ src_compile() {
 		|| myconf="${myconf} --disable-video-x11-xv"
 
 	use esd \
-		&& myconf="--enable-esd" \
-		|| myconf="--disable-esd"
+		&& myconf="${myconf} --enable-esd" \
+		|| myconf="${myconf} --disable-esd"
 
 	use ggi \
 		&& myconf="${myconf} --enable-video-ggi" \
diff --git a/media-libs/libsdl/libsdl-1.2.5-r2.ebuild b/media-libs/libsdl/libsdl-1.2.5-r2.ebuild
index 37173159fe49..7478ba72f832 100644
--- a/media-libs/libsdl/libsdl-1.2.5-r2.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.5-r2.ebuild,v 1.2 2003/05/28 19:59:27 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.5-r2.ebuild,v 1.3 2003/06/11 22:11:12 mholzer Exp $
 
 IUSE="arts xv opengl fbcon aalib nas esd X svga ggi alsa"
 
@@ -54,8 +54,8 @@ src_compile() {
 		|| myconf="${myconf} --disable-video-x11-xv"
 
 	use esd \
-		&& myconf="--enable-esd" \
-		|| myconf="--disable-esd"
+		&& myconf="${myconf} --enable-esd" \
+		|| myconf="${myconf} --disable-esd"
 
 	use ggi \
 		&& myconf="${myconf} --enable-video-ggi" \