dont apply gcc-3.4 patch for gcc-2.x users #70079

diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index da96e3673de831b34a7636532b86f6e5372658f8..1c9ff7d9774ae42a9f36fbcde6ada3f325cc016d 100644 (file)
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -2,19 +2,19 @@ MD5 71ae427cbb1fd40e1036496047164c03 ChangeLog 9435
 MD5 ca3bfcb303f4ddb5c6f708f377e4dc61 libsdl-1.2.6-r3.ebuild 2900
 MD5 894fae13cc92aaec797c7eee55743d1d libsdl-1.2.7-r1.ebuild 2823
 MD5 498c3c407eac50b2b7a5b50a48e70309 libsdl-1.2.7-r2.ebuild 3722
-MD5 18b43c25c522b07b55692176b3739b1a libsdl-1.2.7-r3.ebuild 3759
+MD5 e4a05431dd91039287fbfa7df275997d libsdl-1.2.7-r3.ebuild 3795
 MD5 df227c0b42516d12513e066ac110c1ca libsdl-1.2.7.ebuild 2531
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
-MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568
+MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r1 62
+MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266
+MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
 MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
+MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
 MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317
-MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266
+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 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r1 62
-MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
 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-r3.ebuild b/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
index b35979d065c9aff109f6734f1cf82fd952c93721..48293c1224370ddb49d1284d7c206e2a500ef386 100644 (file)
--- a/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.7-r3.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-r3.ebuild,v 1.6 2004/11/10 14:41:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r3.ebuild,v 1.7 2004/11/16 06:34:27 vapier Exp $
 
 inherit toolchain-funcs fixheadtails eutils gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm 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
 
@@ -47,7 +47,8 @@ src_unpack() {
 
        epatch "${FILESDIR}/${PV}-nobuggy-X.patch" #30089
        epatch "${FILESDIR}/${PV}-libcaca.patch" #40224
-       epatch "${FILESDIR}/${PV}-gcc34.patch" #48947
+       [ "$(gcc-major-version)" != "2" ] \
+               && epatch "${FILESDIR}/${PV}-gcc34.patch" #48947
        epatch "${FILESDIR}/${PV}-joystick2.patch" #52833
        epatch "${FILESDIR}/${PV}-26headers.patch" #58192