summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Kennedy <mkennedy@gentoo.org>2003-02-09 12:04:33 +0000
committerMatthew Kennedy <mkennedy@gentoo.org>2003-02-09 12:04:33 +0000
commitec45fbe2876da61c1efec7d42cefba0e5b0a1cc0 (patch)
tree00c8cf3db71df2248ddc5ff068d66f1769b5b188
parentresolves bug 13156 (~ keywords for now) (diff)
downloadgentoo-2-ec45fbe2876da61c1efec7d42cefba0e5b0a1cc0.tar.gz
gentoo-2-ec45fbe2876da61c1efec7d42cefba0e5b0a1cc0.tar.bz2
gentoo-2-ec45fbe2876da61c1efec7d42cefba0e5b0a1cc0.zip
Conditionally apply the gcc3 patch. resolves bug 13580.
-rw-r--r--media-video/xmovie/ChangeLog7
-rw-r--r--media-video/xmovie/xmovie-1.8-r4.ebuild12
2 files changed, 15 insertions, 4 deletions
diff --git a/media-video/xmovie/ChangeLog b/media-video/xmovie/ChangeLog
index 7171c59391a9..f2fee6610743 100644
--- a/media-video/xmovie/ChangeLog
+++ b/media-video/xmovie/ChangeLog
@@ -1,9 +1,14 @@
# ChangeLog for media-video/xmovie
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/ChangeLog,v 1.5 2002/10/21 08:56:21 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/ChangeLog,v 1.6 2003/02/09 12:04:33 mkennedy Exp $
*xmovie-1.8-r4 (21 Oct 2002)
+ 09 Feb 2003; Matthew Kennedy <mkennedy@gentoo.org> xmovie-1.8-r4.ebuild,
+ ChangeLog :
+
+ Conditionally apply the gcc3 patch. resolves bug 13580.
+
21 Oct 2002; Matthew Kennedy <mkennedy@gentoo.org> xmovie-1.8-r4,
ChangeLog, files/digest-xmovie-1.8-r4, files/xmovie-gcc3-gentoo.patch :
diff --git a/media-video/xmovie/xmovie-1.8-r4.ebuild b/media-video/xmovie/xmovie-1.8-r4.ebuild
index 0c2be49d2c32..cefcbdcc9474 100644
--- a/media-video/xmovie/xmovie-1.8-r4.ebuild
+++ b/media-video/xmovie/xmovie-1.8-r4.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.8-r4.ebuild,v 1.1 2002/10/21 08:56:21 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.8-r4.ebuild,v 1.2 2003/02/09 12:04:33 mkennedy Exp $
+
+inherit gcc
S=${WORKDIR}/${P}
DESCRIPTION="A Player for MPEG and Quicktime movies"
@@ -13,6 +15,7 @@ RDEPEND="virtual/x11
DEPEND="${RDEPEND}
>=dev-lang/nasm-0.98"
+IUSE=""
SLOT="0"
LICENSE="GPL-2"
@@ -20,8 +23,11 @@ KEYWORDS="x86"
src_unpack() {
unpack ${A}
- # gcc3.2 fix (from bug #7227)
- cd ${S} && patch -p1 <${FILESDIR}/xmovie-gcc3-gentoo.patch || die
+ if [ `gcc-major-version` = '3' ] ;
+ then
+ # gcc3.2 fix (from bug #7227)
+ cd ${S} && patch -p1 <${FILESDIR}/xmovie-gcc3-gentoo.patch || die
+ fi
}
src_compile() {