Moved patches into patchsets (when needed/better).

Package-Manager: portage-2.0.51.20-r5

16 files changed, 48 insertions, 227 deletions

diff --git a/media-libs/quicktime4linux/ChangeLog b/media-libs/quicktime4linux/ChangeLog
index 7dce8bf63518..4ddc27b39ea7 100644
--- a/media-libs/quicktime4linux/ChangeLog
+++ b/media-libs/quicktime4linux/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/quicktime4linux
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/ChangeLog,v 1.24 2005/01/23 03:15:07 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/ChangeLog,v 1.25 2005/05/02 08:45:26 flameeyes Exp $
+
+  02 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/2.0.0-gcc2.patch, -files/quicktime4linux-1.5.5-fPIC.patch,
+  -files/2.0.0-gentoo-sharedlib.patch, -files/1.6.2-gentoo-libmpeg3.patch,
+  -files/1.6.2-gentoo-sharedlib.patch, -files/2.0.0-external-libs.patch,
+  -files/quicktime_makefile.patch, quicktime4linux-1.5.5-r1.ebuild,
+  quicktime4linux-1.6.2.ebuild, quicktime4linux-2.0.0.ebuild,
+  quicktime4linux-2.0.0-r1.ebuild:
+  Moved patches into patchsets (when needed/better).
 
 *quicktime4linux-2.0.4 (23 Jan 2005)
 
diff --git a/media-libs/quicktime4linux/Manifest b/media-libs/quicktime4linux/Manifest
index 972710fc838d..84eff1be8cf3 100644
--- a/media-libs/quicktime4linux/Manifest
+++ b/media-libs/quicktime4linux/Manifest
@@ -1,21 +1,14 @@
-MD5 bcc689d1e81528c68899b00438f768a4 quicktime4linux-2.0.4.ebuild 1323
-MD5 d0a078ec81a4dfdd16c70ca4d79fa6cc quicktime4linux-1.6.2.ebuild 1131
-MD5 7084829ee30b301dbc23eeaceb8bf70a quicktime4linux-1.5.5-r1.ebuild 938
-MD5 6921ff694f11249f469162fc85df1f9d quicktime4linux-2.0.0.ebuild 1133
-MD5 f6d3cfd0722b5af5c8c0ea0f79b7435a quicktime4linux-2.0.0-r1.ebuild 1361
-MD5 83005da1265cd614ebeb485734967f9f ChangeLog 3862
+MD5 899aa6a99aea241bbd24f138bea07159 ChangeLog 4350
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 108d3e9d9e220d8415e069fb6232eeea files/quicktime_makefile.patch 420
-MD5 be32d825584a5b034b9976aa75a2b23b files/digest-quicktime4linux-1.6.2 79
+MD5 6a2c20038939155bde70d0bda698b9c8 quicktime4linux-1.5.5-r1.ebuild 983
+MD5 ff99d415c5017af8ef79964c77b2e319 quicktime4linux-1.6.2.ebuild 1201
+MD5 b64da4e2b0bba2cc3287dc28c3fe15fc quicktime4linux-2.0.0-r1.ebuild 1449
+MD5 c58a7ff56454d9fd628c3a824144d123 quicktime4linux-2.0.0.ebuild 924
+MD5 bcc689d1e81528c68899b00438f768a4 quicktime4linux-2.0.4.ebuild 1323
+MD5 cff036b41967a42ea65b3eef0002f4a0 files/2.0.0-gentoo-libmpeg3.patch 663
+MD5 20c7d429ba0312f794acf28415a87403 files/2.0.4-external-libs.patch 2226
+MD5 d174f89f47c93a15f31744ff3c78e270 files/digest-quicktime4linux-1.5.5-r1 149
+MD5 7ba7a569ff1c1d5d53285361ed6c5413 files/digest-quicktime4linux-1.6.2 154
 MD5 05a81d2da899448b5ec3b5bbf23b6f2d files/digest-quicktime4linux-2.0.0 79
+MD5 d4ca2cbd6ad27b322e4fe55691deb764 files/digest-quicktime4linux-2.0.0-r1 155
 MD5 9b609bee6de30124e7d091979bc123c6 files/digest-quicktime4linux-2.0.4 79
-MD5 20c7d429ba0312f794acf28415a87403 files/2.0.4-external-libs.patch 2226
-MD5 e55c3522c5ee09ecdc22287cb4d80539 files/2.0.0-external-libs.patch 1644
-MD5 c46fd893f3945688c806226477501585 files/digest-quicktime4linux-1.5.5-r1 74
-MD5 ae2802be07e21795df874c1d65cbe021 files/2.0.0-gcc2.patch 1007
-MD5 679164a3434c2d4fb28583d4d8a24430 files/quicktime4linux-1.5.5-fPIC.patch 325
-MD5 cff036b41967a42ea65b3eef0002f4a0 files/2.0.0-gentoo-libmpeg3.patch 663
-MD5 18f6f22f1a711f5be21eed00582cf61e files/1.6.2-gentoo-libmpeg3.patch 647
-MD5 05a81d2da899448b5ec3b5bbf23b6f2d files/digest-quicktime4linux-2.0.0-r1 79
-MD5 947ef42daabc28f6c58cbccd4f7bb911 files/1.6.2-gentoo-sharedlib.patch 1072
-MD5 7181d651d366d5e7a27d576bbf5d0230 files/2.0.0-gentoo-sharedlib.patch 969
diff --git a/media-libs/quicktime4linux/files/1.6.2-gentoo-libmpeg3.patch b/media-libs/quicktime4linux/files/1.6.2-gentoo-libmpeg3.patch
deleted file mode 100644
index a4d21814ad63..000000000000
--- a/media-libs/quicktime4linux/files/1.6.2-gentoo-libmpeg3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2003-07-26 17:58:29.000000000 -0400
-+++ Makefile	2003-07-26 17:58:50.000000000 -0400
-@@ -8,7 +8,7 @@
- DECORE_DIR := decore50
- ENCORE_INCLUDE := $(ENCORE_DIR)/encore.h
- DECORE_INCLUDE := $(DECORE_DIR)/decore.h
--MPEG3_DIR := ../libmpeg3
-+MPEG3_DIR := /usr/include/libmpeg3
- OBJS := 
- 
- 
-@@ -207,7 +207,7 @@
- 	$(OBJDIR)/$(ENCORE_DIR)/mbtransquant/intel_mmx
- 
- 
--LIBS := $(OUTPUT) $(MPEG3_DIR)/$(OBJDIR)/libmpeg3.a -lpng -lz -lpthread -lglib -ldl -lm
-+LIBS := $(OUTPUT) /usr/lib/libmpeg3.a -lpng -lz -lpthread -lglib -ldl -lm
- 
- $(shell echo  $(CFLAGS) > $(OBJDIR)/c_flags)
- $(shell echo  $(LIBRAW_CFLAGS) > $(OBJDIR)/libraw_cflags)
diff --git a/media-libs/quicktime4linux/files/1.6.2-gentoo-sharedlib.patch b/media-libs/quicktime4linux/files/1.6.2-gentoo-sharedlib.patch
deleted file mode 100644
index 0a6b4ec6fa3f..000000000000
--- a/media-libs/quicktime4linux/files/1.6.2-gentoo-sharedlib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	2003-07-26 18:09:51.000000000 -0400
-+++ Makefile	2003-07-26 18:21:16.000000000 -0400
-@@ -213,7 +213,7 @@
- $(shell echo  $(LIBRAW_CFLAGS) > $(OBJDIR)/libraw_cflags)
- $(shell echo  $(OBJS) $(LIBRAW_OBJS) $(DV_OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(JPEG_FAIL) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS) $(LAME_OBJS) > $(OBJDIR)/objs)
- 
--all: $(DIRS) $(OUTPUT)
-+all: $(DIRS) $(OUTPUT) $(SHAREDOUTPUT)
- 
- $(DIRS):
- 	if ! test -d $@ ; then mkdir -p $@ ; fi
-@@ -221,6 +221,9 @@
- $(OUTPUT): $(LIBRAW_OBJS) $(DV_OBJS) $(DVMMXOBJ) $(OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS) $(LAME_OBJS) $(JPEG_FAIL) 
- 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
- 
-+$(SHAREDOUTPUT): $(DVMMXOBJ) $(OBJS) $(DVMMXOBJS) $(ENCOREMMX_OBJS)
-+	gcc -shared -o $(SHAREDOUTPUT) $(LIBRAW_OBJS) $(DV_OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(LAME_OBJS) $(JPEG_FAIL) $(FFMPEGIA32_OBJS)
-+
- $(OBJDIR)/qtdump: $(OBJDIR)/dump.o $(OUTPUT)
- 	$(CC) -o $(OBJDIR)/qtdump $(OBJDIR)/dump.o $(LIBS)
- 
diff --git a/media-libs/quicktime4linux/files/2.0.0-external-libs.patch b/media-libs/quicktime4linux/files/2.0.0-external-libs.patch
deleted file mode 100644
index 2bd3bc106794..000000000000
--- a/media-libs/quicktime4linux/files/2.0.0-external-libs.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ur work/quicktime4linux-2.0.0/Makefile work.new/quicktime4linux-2.0.0/Makefile
---- work/quicktime4linux-2.0.0/Makefile	2003-08-09 18:11:59.000000000 -0400
-+++ work.new/quicktime4linux-2.0.0/Makefile	2003-10-02 04:36:06.296870072 -0400
-@@ -9,11 +9,7 @@
- endif
- 
- 
--ifeq ($(origin CFLAGS), environment)
- HAVE_CFLAGS := y
--else
--HAVE_CFLAGS := n
--endif
- 
- #ENCORE_DIR := encore2/src
- #DECORE_DIR := decore2/src
-@@ -21,7 +17,8 @@
- DECORE_DIR := decore50
- ENCORE_INCLUDE := $(ENCORE_DIR)/encore.h
- DECORE_INCLUDE := $(DECORE_DIR)/decore.h
--MPEG3_DIR := $(shell expr ../libmpeg3* )
-+MPEG3_DIR := /usr/include/libmpeg3
-+LAME_DIR := /usr/include/lame
- OBJS := 
- 
- 
-@@ -54,11 +51,11 @@
- 
- 
- 
--include Makefile.jpeg
--include Makefile.vorbis
--include Makefile.ffmpeg
--include Makefile.lame
--include Makefile.dv
-+#include Makefile.jpeg
-+#include Makefile.vorbis
-+#include Makefile.ffmpeg
-+#include Makefile.lame
-+#include Makefile.dv
- include Makefile.encore50
- 
- 
-@@ -67,12 +64,13 @@
- 
- 
- #CFLAGS += -g
-+CFLAGS = $(MYCFLAGS)
- CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- CFLAGS += -DHAVE_FIREWIRE
- CFLAGS += -I. \
--	-I$(JPEG_DIR) \
-+	-I/usr/include/ffmpeg \
- 	-I$(MPEG3_DIR) \
--	-I$(LAME_DIR)/include \
-+	-I$(LAME_DIR) \
- 	$(shell glib-config --cflags)
- 
- 
-@@ -227,7 +225,9 @@
- 	$(OBJDIR)/$(ENCORE_DIR)/mbtransquant/intel_mmx
- 
- 
--LIBS := $(OUTPUT) $(MPEG3_DIR)/$(OBJDIR)/libmpeg3.a -lpng -lz -lpthread -lglib -ldl -lm
-+LIBS := $(OUTPUT) \
-+	-logg -lmpeg3 -lmp3lame -ldv -ljpeg -lvorbis -lvorbisenc -lavcodec \
-+	-lpng -lz -lpthread -lglib -ldl -lm
- 
- 
- $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(DIRS) \; fi )
diff --git a/media-libs/quicktime4linux/files/2.0.0-gcc2.patch b/media-libs/quicktime4linux/files/2.0.0-gcc2.patch
deleted file mode 100644
index 05d80ef9dfbf..000000000000
--- a/media-libs/quicktime4linux/files/2.0.0-gcc2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- Makefile.orig	2003-10-02 11:51:41.419727480 -0400
-+++ Makefile	2003-10-02 11:52:30.588252728 -0400
-@@ -182 +181,0 @@
--	-mno-ieee-fp \
---- avi_ix.c.orig	2003-10-02 11:51:45.278140912 -0400
-+++ avi_ix.c	2003-10-02 11:52:48.774488000 -0400
-@@ -97,6 +97,7 @@
- 
- 
- /* Update super index */
-+{
- 	quicktime_riff_t *riff = file->riff[0];
- 	quicktime_hdrl_t *hdrl = &riff->hdrl;
- 	quicktime_strl_t *strl = hdrl->strl[track];
-@@ -104,6 +105,7 @@
- 
- 	quicktime_update_indx(file, indx, ix);
- }
-+}
- 
- void quicktime_read_ix(quicktime_t *file,
- 	quicktime_ix_t *ix)
---- libdv.c.orig	2003-10-02 11:51:49.356520904 -0400
-+++ libdv.c	2003-10-02 11:53:12.945813400 -0400
-@@ -298,6 +298,7 @@
- 		int norm)
- {
- 	int i, j;
-+	int samples;
- 
- 	if(!dv->encoder)
- 	{
-@@ -310,7 +311,7 @@
- 
- 
- // Get sample count from a libdv function
--	int samples = dv_calculate_samples(dv->encoder, rate, dv->audio_frames);
-+	samples = dv_calculate_samples(dv->encoder, rate, dv->audio_frames);
- 	dv->audio_frames++;
- 
- 	if(!dv->temp_audio[0])
diff --git a/media-libs/quicktime4linux/files/2.0.0-gentoo-sharedlib.patch b/media-libs/quicktime4linux/files/2.0.0-gentoo-sharedlib.patch
deleted file mode 100644
index 94a50f81640b..000000000000
--- a/media-libs/quicktime4linux/files/2.0.0-gentoo-sharedlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig	2003-09-02 23:35:26.004030744 -0400
-+++ Makefile	2003-09-02 23:36:20.451753432 -0400
-@@ -236,11 +236,13 @@
- $(shell echo  $(LAME_CFLAGS) > $(OBJDIR)/lame_flags)
- $(shell echo  $(OBJS) $(DV_OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(JPEG_FAIL) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS) $(LAME_OBJS) > $(OBJDIR)/objs)
- 
--all: $(OBJDIR) $(OUTPUT)
-+all: $(OBJDIR) $(OUTPUT) $(SHAREDOUTPUT)
- 
- $(OUTPUT): $(DV_OBJS) $(DVMMXOBJ) $(OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS) $(LAME_OBJS) $(JPEG_FAIL) 
- 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
- 
-+$(SHAREDOUTPUT): $(DVMMXOBJ) $(OBJS) $(DVMMXOBJS) $(ENCOREMMX_OBJS)
-+	gcc -shared -o $(SHAREDOUTPUT) $(LIBRAW_OBJS) $(DV_OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(LAME_OBJS) $(JPEG_FAIL) $(FFMPEGIA32_OBJS)
- 
- $(OBJDIR)/qtdump: $(OBJDIR)/dump.o $(OUTPUT)
- 	$(CC) -o $(OBJDIR)/qtdump $(OBJDIR)/dump.o $(LIBS)
diff --git a/media-libs/quicktime4linux/files/digest-quicktime4linux-1.5.5-r1 b/media-libs/quicktime4linux/files/digest-quicktime4linux-1.5.5-r1
index 7387d013c33d..bc30814dad7a 100644
--- a/media-libs/quicktime4linux/files/digest-quicktime4linux-1.5.5-r1
+++ b/media-libs/quicktime4linux/files/digest-quicktime4linux-1.5.5-r1
@@ -1 +1,2 @@
 MD5 cbfed358123cfcd35b553df2b77b42f7 quicktime4linux-1.5.5.tar.gz 2109955
+MD5 3f55da1d48893b34605441742db815f6 quicktime4linux-patches-1.tar.bz2 559
diff --git a/media-libs/quicktime4linux/files/digest-quicktime4linux-1.6.2 b/media-libs/quicktime4linux/files/digest-quicktime4linux-1.6.2
index eaf96f568128..58885614ab5f 100644
--- a/media-libs/quicktime4linux/files/digest-quicktime4linux-1.6.2
+++ b/media-libs/quicktime4linux/files/digest-quicktime4linux-1.6.2
@@ -1 +1,2 @@
 MD5 bcb007e083e6762d828cc20e1b8d42ef quicktime4linux-1.6.2-src.tar.bz2 5893469
+MD5 c4f038d3c98fad6ba1e8187c01acdc2c quicktime4linux-patches-2.tar.bz2 867
diff --git a/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.0-r1 b/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.0-r1
index 27970acdf25b..ed1a68aa4c67 100644
--- a/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.0-r1
+++ b/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.0-r1
@@ -1 +1,2 @@
 MD5 14f32cf887f50f8d1dc9dbbc72a1c206 quicktime4linux-2.0.0-src.tar.bz2 3832766
+MD5 a3fcfe7e10df819a5b1791457686cc2f quicktime4linux-patches-3.tar.bz2 1416
diff --git a/media-libs/quicktime4linux/files/quicktime4linux-1.5.5-fPIC.patch b/media-libs/quicktime4linux/files/quicktime4linux-1.5.5-fPIC.patch
deleted file mode 100644
index d91564d96d7f..000000000000
--- a/media-libs/quicktime4linux/files/quicktime4linux-1.5.5-fPIC.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2004-02-25 16:50:22.759175018 +0000
-+++ Makefile	2004-02-25 16:50:16.534709390 +0000
-@@ -483,7 +483,7 @@
- $(OBJDIR)/qtinfo.o \
- $(OBJDIR)/rechunk.o \
- $(OBJS):
--	$(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
-+	$(CC) -fPIC -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
- 
- 
- 
diff --git a/media-libs/quicktime4linux/files/quicktime_makefile.patch b/media-libs/quicktime4linux/files/quicktime_makefile.patch
deleted file mode 100644
index b12f230432ab..000000000000
--- a/media-libs/quicktime4linux/files/quicktime_makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r quicktime/Makefile quicktime.new/Makefile
---- quicktime/Makefile	2001-12-26 14:34:52.000000000 +0100
-+++ quicktime.new/Makefile	2002-07-26 00:16:50.000000000 +0200
-@@ -219,7 +219,9 @@
- 	$(OBJDIR)/libraw1394/src/fcp.o \
- 	$(OBJDIR)/libraw1394/src/iso.o \
- 	$(OBJDIR)/libraw1394/src/main.o \
--	$(OBJDIR)/libraw1394/src/readwrite.o
-+	$(OBJDIR)/libraw1394/src/readwrite.o \
-+	$(OBJDIR)/libraw1394/src/errors.o 
-+
diff --git a/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild b/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild
index 16ba3c762b9b..656336857767 100644
--- a/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild
+++ b/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild,v 1.18 2005/01/16 16:57:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild,v 1.19 2005/05/02 08:45:26 flameeyes Exp $
 
 inherit eutils
 
+PATCHLEVEL="1"
 DESCRIPTION="quicktime library for linux"
 HOMEPAGE="http://heroinewarrior.com/quicktime.php3"
-SRC_URI="http://heroinewarrior.com/${P}.tar.gz"
+SRC_URI="http://heroinewarrior.com/${P}.tar.gz
+	http://digilander.libero.it/dgp85/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -21,10 +23,9 @@ PROVIDE="virtual/quicktime"
 S=${WORKDIR}/quicktime
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/quicktime_makefile.patch
-	epatch ${FILESDIR}/${P}-fPIC.patch
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
 }
 
 src_compile() {
diff --git a/media-libs/quicktime4linux/quicktime4linux-1.6.2.ebuild b/media-libs/quicktime4linux/quicktime4linux-1.6.2.ebuild
index e58ce1d55f1a..9df9d001ee54 100644
--- a/media-libs/quicktime4linux/quicktime4linux-1.6.2.ebuild
+++ b/media-libs/quicktime4linux/quicktime4linux-1.6.2.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-1.6.2.ebuild,v 1.10 2005/01/16 16:57:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-1.6.2.ebuild,v 1.11 2005/05/02 08:45:26 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
+PATCHLEVEL="2"
 DESCRIPTION="quicktime library for linux"
 HOMEPAGE="http://heroinewarrior.com/quicktime.php3"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
+	http://digilander.libero.it/dgp85/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -22,9 +24,12 @@ PROVIDE="virtual/quicktime"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-gentoo-libmpeg3.patch
-	epatch ${FILESDIR}/${PV}-gentoo-sharedlib.patch
-	[ "${ARCH}" == "ppc" ] && sed -i 's:-mno-ieee-fp::g' `find -name 'Makefile*' -o -name 'configure*'`
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
+
+	if [[ "${ARCH}" == "ppc" ]]; then
+		find ${S} -name 'Makefile*' -o -name 'configure*' | \
+			xargs sed -i -e 's:-mno-ieee-fp::g'
+	fi
 }
 
 src_compile() {
diff --git a/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild b/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild
index 73e91bafc0d1..edf5d4f9e770 100644
--- a/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild
+++ b/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild,v 1.9 2005/01/16 16:57:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild,v 1.10 2005/05/02 08:45:26 flameeyes Exp $
 
 inherit flag-o-matic gcc eutils
 
+PATCHLEVEL="3"
 DESCRIPTION="quicktime library for linux"
 HOMEPAGE="http://heroinewarrior.com/quicktime.php3"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
+	http://digilander.libero.it/dgp85/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -33,8 +35,9 @@ src_unpack() {
 	rm -rf decore2 encore2 ffmpeg-0.4.6 jpeg jpeg-mmx-0.1.4 \
 		lame-3.93.1 libdv-0.99 libogg-1.0 libvorbis-1.0
 	ln -s /usr/include jpeg
-	epatch ${FILESDIR}/${PV}-external-libs.patch
-	[ `gcc-major-version` -eq 2 ] && epatch ${FILESDIR}/${PV}-gcc2.patch
+
+	[ `gcc-major-version` -eq 2 ] || EPATCH_EXCLUDE="00_all_gcc2.patch"
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
 }
 
 src_compile() {
diff --git a/media-libs/quicktime4linux/quicktime4linux-2.0.0.ebuild b/media-libs/quicktime4linux/quicktime4linux-2.0.0.ebuild
index e2269ee1178b..a312375839b4 100644
--- a/media-libs/quicktime4linux/quicktime4linux-2.0.0.ebuild
+++ b/media-libs/quicktime4linux/quicktime4linux-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-2.0.0.ebuild,v 1.7 2005/01/16 16:57:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-2.0.0.ebuild,v 1.8 2005/05/02 08:45:26 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -23,12 +23,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gentoo-libmpeg3.patch
-#	epatch ${FILESDIR}/${PV}-gentoo-sharedlib.patch
-#	[ "${ARCH}" == "ppc" ] && sed -i 's:-mno-ieee-fp::g' `find -name 'Makefile*' -o -name 'configure*'`
 }
 
 src_compile() {
-#	append-flags -I${S}/libdv-0.98/libdv -I${S}/libdv-0.98
 	make || die
 	make util || die
 }