Patch to build with gcc-3.4 #65453. Start using econf, emake, einstall

(Portage version: 2.0.51.19)

4 files changed, 26 insertions, 21 deletions

diff --git a/media-libs/openquicktime/ChangeLog b/media-libs/openquicktime/ChangeLog
index 456ebe3d9e20..c97d256e3028 100644
--- a/media-libs/openquicktime/ChangeLog
+++ b/media-libs/openquicktime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openquicktime
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openquicktime/ChangeLog,v 1.13 2004/06/24 23:18:15 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openquicktime/ChangeLog,v 1.14 2005/03/12 18:22:30 agriffis Exp $
+
+  12 Mar 2005; Aron Griffis <agriffis@gentoo.org>
+  openquicktime-1.0-r1.ebuild:
+  Patch to build with gcc-3.4 #65453.  Start using econf, emake, einstall
 
   23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
   openquicktime-1.0-r1.ebuild, openquicktime-1.0.ebuild:
diff --git a/media-libs/openquicktime/Manifest b/media-libs/openquicktime/Manifest
index 35dbd4ed80d4..e577d0029a28 100644
--- a/media-libs/openquicktime/Manifest
+++ b/media-libs/openquicktime/Manifest
@@ -1,3 +1,3 @@
-MD5 975d0c94f2f7e17c8186551313bea182 openquicktime-1.0-r1.ebuild 1101
 MD5 f11fa53fc66269e36ebc64da74d2f799 ChangeLog 1853
-MD5 961cf4c61a472e890cf7bd348d5b83ad files/digest-openquicktime-1.0-r1 70
+MD5 3137302722dbea7e154fdf564e36ca6c openquicktime-1.0-r1.ebuild 1300
+MD5 40f0db85a78b1dd555e222afd3c24570 files/digest-openquicktime-1.0-r1 147
diff --git a/media-libs/openquicktime/files/digest-openquicktime-1.0-r1 b/media-libs/openquicktime/files/digest-openquicktime-1.0-r1
index d08e2560574d..1a76ffb14b84 100644
--- a/media-libs/openquicktime/files/digest-openquicktime-1.0-r1
+++ b/media-libs/openquicktime/files/digest-openquicktime-1.0-r1
@@ -1 +1,2 @@
 MD5 f90bc78b8632c6c254cddf70b4726644 openquicktime-1.0-src.tgz 320144
+MD5 293784d47543f3b94c17fb39042eb732 openquicktime-1.0-gcc34-1.patch.bz2 854
diff --git a/media-libs/openquicktime/openquicktime-1.0-r1.ebuild b/media-libs/openquicktime/openquicktime-1.0-r1.ebuild
index 5b7b83ac9fd5..8cdf7ce24826 100644
--- a/media-libs/openquicktime/openquicktime-1.0-r1.ebuild
+++ b/media-libs/openquicktime/openquicktime-1.0-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openquicktime/openquicktime-1.0-r1.ebuild,v 1.9 2004/07/14 20:21:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openquicktime/openquicktime-1.0-r1.ebuild,v 1.10 2005/03/12 18:22:30 agriffis Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 replace-flags "-fprefetch-loop-arrays" " "
 
 MY_P=${P}-src
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="OpenQuicktime library for linux"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz
+	mirror://gentoo/openquicktime-1.0-gcc34-1.patch.bz2"
 HOMEPAGE="http://openquicktime.sourceforge.net/"
 
 SLOT="0"
@@ -24,13 +25,18 @@ DEPEND="media-sound/lame
 
 PROVIDE="virtual/quicktime"
 
-src_compile() {
-
-	./configure \
-		--enable-debug=no \
-		--prefix=/usr || die # Disable debug - enabled by default
+src_unpack () {
+	unpack ${MY_P}.tgz
+	cd ${S}
+	if has_version '>=sys-devel/gcc-3.4'; then
+		epatch ${DISTDIR}/${P}-gcc34-1.patch.bz2
+	fi
+}
 
-	make || die
+src_compile() {
+	# debug is enabled by default...
+	econf --enable-debug=no || die
+	emake || die
 }
 
 src_install() {
@@ -38,11 +44,5 @@ src_install() {
 	dolib.so libopenquicktime.so
 	dodoc README AUTHORS NEWS COPYING TODO
 	dodir /usr/bin
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		docdir=${D}/usr/share/doc/${PF}/html \
-		sysconfdir=${D}/etc \
-		install || die
+	einstall || die
 }