Removed orphan files and moved patches into a patchset tarball.

Package-Manager: portage-2.0.51.20-r5

24 files changed, 46 insertions, 948 deletions

diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index b04cfd3254b1..856812cc551a 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-libs/libmpeg3
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.35 2005/04/25 19:32:50 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.36 2005/05/02 09:14:08 flameeyes Exp $
+
+  02 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/1.5.1-gentoo-mpeg3split.patch, -files/1.5.1-gentoo-p1.patch,
+  -files/1.5.1-gentoo-p2.patch, -files/1.5.1-largefile.patch,
+  -files/1.5.1-proper-c.patch, -files/1.5.1-pthread.patch,
+  -files/1.5.2-gcc3.4.patch, -files/1.5.2-gcc4.patch,
+  -files/1.5.2-gentoo-mpeg3split.patch, -files/1.5.2-gentoo-multilib.patch,
+  -files/1.5.2-gentoo-p1.patch, -files/1.5.2-gentoo-p2.patch,
+  -files/1.5.2-largefile.patch, -files/1.5.2-no-nasm.patch,
+  -files/1.5.2-proper-c.patch, -files/1.5.2-pthread.patch,
+  -files/libmpeg3-gentoo-patch-part1, -files/libmpeg3-gentoo-patch-part2,
+  libmpeg3-1.5.2.ebuild, libmpeg3-1.5.2-r1.ebuild:
+  Removed orphan files and moved patches into a patchset tarball.
 
   25 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +files/1.5.2-gcc4.patch,
   libmpeg3-1.5.2-r1.ebuild:
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 8252ddbe6e30..4f2d36aa1daf 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,34 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 55451121e8a2d7edb247a6ab91966f08 libmpeg3-1.5.2-r1.ebuild 2803
-MD5 4811169eda355182993beccc5a95f440 libmpeg3-1.5.2.ebuild 2136
-MD5 a84a7be3a23b2545dc1b4be0c9bc711a ChangeLog 5356
+MD5 fc5477fc9ee4565983324d3abdf80a19 ChangeLog 6106
+MD5 db084212997238821b5201dc00888c34 libmpeg3-1.5.2-r1.ebuild 2637
+MD5 c486bd3d199eced5e27bc795be43b3c8 libmpeg3-1.5.2.ebuild 1996
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 d350249b0ff07ff5969ce4368d5ebbe5 files/libmpeg3-gentoo-patch-part2 4180
-MD5 8d7c2891c2e4e8bcb6f8003718d5e74c files/1.5.2-gcc4.patch 355
-MD5 0335a104cfdf11350198751a1f3aff8c files/1.5.1-largefile.patch 291
-MD5 4434d248764e42d26e3ad3a08cfbc4ae files/1.5.2-no-nasm.patch 553
-MD5 793abbb0f0a5b2d5593ffc4be358bd80 files/libmpeg3-gentoo-patch-part1 1358
-MD5 4c1de213cd8a773b0742da874a882100 files/1.5.2-gcc3.4.patch 5963
-MD5 0335a104cfdf11350198751a1f3aff8c files/1.5.2-largefile.patch 291
-MD5 4e83631ff34cc2e5505210c328e55a88 files/1.5.2-gentoo-p2.patch 3461
-MD5 07e228685340f8108b870543728f43cf files/1.5.2-proper-c.patch 601
-MD5 c945b2843e8b1d32fc4af70cf5026912 files/1.5.2-pthread.patch 204
-MD5 8c1c4667609bae1089a66ea6c8ee1f28 files/1.5.1-gentoo-p1.patch 1376
-MD5 d3a05866020d3e1f064974f5363c6c53 files/1.5.1-gentoo-mpeg3split.patch 2315
-MD5 8c1c4667609bae1089a66ea6c8ee1f28 files/1.5.2-gentoo-p1.patch 1376
-MD5 c945b2843e8b1d32fc4af70cf5026912 files/1.5.1-pthread.patch 204
-MD5 81b6cc87dac447d9be64d2327bd6193c files/digest-libmpeg3-1.5.2 71
-MD5 81b6cc87dac447d9be64d2327bd6193c files/digest-libmpeg3-1.5.2-r1 71
-MD5 4e83631ff34cc2e5505210c328e55a88 files/1.5.1-gentoo-p2.patch 3461
-MD5 07e228685340f8108b870543728f43cf files/1.5.1-proper-c.patch 601
-MD5 9b759ebc2fff68e033053285e5a450c8 files/1.5.2-gentoo-mpeg3split.patch 2083
-MD5 c132ad46a3ae646bb3cb0f2f283db3ca files/1.5.2-gentoo-multilib.patch 877
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCbUbz1ZcsMnZjRyIRAmgQAJ0QvSk1cPnBE/C5kUgcs+h7vbe+ogCfQEYY
-RcAyiH1DaFPiSdkH5UxlsPQ=
-=oguw
------END PGP SIGNATURE-----
+MD5 eab6c819f36fbf2566019eee669caa90 files/digest-libmpeg3-1.5.2 140
+MD5 eab6c819f36fbf2566019eee669caa90 files/digest-libmpeg3-1.5.2-r1 140
diff --git a/media-libs/libmpeg3/files/1.5.1-gentoo-mpeg3split.patch b/media-libs/libmpeg3/files/1.5.1-gentoo-mpeg3split.patch
deleted file mode 100644
index 2176eedaaed8..000000000000
--- a/media-libs/libmpeg3/files/1.5.1-gentoo-mpeg3split.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- Makefile	2003-07-26 17:53:04.000000000 -0400
-+++ Makefile.blah	2003-07-26 17:50:44.000000000 -0400
-@@ -63,10 +63,9 @@
- UTILOBJS = \
- 	$(OBJDIR)/mpeg3cat.o \
- 	$(OBJDIR)/mpeg3dump.o \
-+	$(OBJDIR)/mpeg3split.o \
- 	$(OBJDIR)/mpeg3toc.o
- 
--#	$(OBJDIR)/mpeg3split.o \
--
- 
- 
- 
-@@ -152,9 +151,8 @@
- 
- 
- OUTPUT = $(OBJDIR)/libmpeg3.a
--UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc 
--
--#$(OBJDIR)/mpeg3split
-+SHAREDOUTPUT = $(OBJDIR)/libmpeg3.so
-+UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split
- 
- 
- LIBS = -lm -lpthread
-@@ -165,7 +163,7 @@
- $(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
- $(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
- 
--all: $(DIRS) $(OUTPUT) util
-+all: $(DIRS) $(OUTPUT) $(SHAREDOUTPUT) util
- 
- $(DIRS):
- 	if ! test -d $@ ; then mkdir -p $@ ; fi
-@@ -173,6 +171,9 @@
- $(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS) $(UTILOBJS)
- 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
- 
-+$(SHAREDOUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
-+	gcc -shared -o $(SHAREDOUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS)
-+
- $(OBJDIR)/mpeg3dump: $(OUTPUT)
- 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS)
- 
-@@ -182,8 +183,8 @@
- $(OBJDIR)/mpeg3toc: $(OUTPUT)
- 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3toc mpeg3toc.c $(OUTPUT) $(LIBS)
- 
--#$(OBJDIR)/mpeg3split: $(OUTPUT)
--#	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
-+$(OBJDIR)/mpeg3split: $(OUTPUT)
-+	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
- 
- $(OBJDIR)/mpeg2qt: $(OUTPUT)
- 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg2qt mpeg2qt.c \
-@@ -239,7 +239,7 @@
- $(OBJDIR)/mpeg3demux.o: 			    mpeg3demux.c
- $(OBJDIR)/mpeg3ifo.o: 				    mpeg3ifo.c
- $(OBJDIR)/mpeg3io.o: 				    mpeg3io.c
--#$(OBJDIR)/mpeg3split.o: 			    mpeg3split.c
-+$(OBJDIR)/mpeg3split.o: 			    mpeg3split.c
- $(OBJDIR)/mpeg3title.o: 			    mpeg3title.c
- $(OBJDIR)/mpeg3toc.o: 				    mpeg3toc.c
- $(OBJDIR)/mpeg3toc3.o:  			    mpeg3toc3.c
---- mpeg3split.c.orig	2003-07-26 17:55:26.000000000 -0400
-+++ mpeg3split.c	2003-07-26 17:51:28.000000000 -0400
-@@ -3,6 +3,7 @@
- #include <string.h>
- 
- #include "mpeg3private.inc"
-+#include "mpeg3private.h"
- 
- void copy_data(FILE *out, FILE *in, long bytes)
- {
diff --git a/media-libs/libmpeg3/files/1.5.1-gentoo-p1.patch b/media-libs/libmpeg3/files/1.5.1-gentoo-p1.patch
deleted file mode 100644
index 5a9013c6361e..000000000000
--- a/media-libs/libmpeg3/files/1.5.1-gentoo-p1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urN libmpeg3.orig/Makefile libmpeg3/Makefile
---- libmpeg3.orig/Makefile	Wed Dec 26 07:40:52 2001
-+++ libmpeg3/Makefile	Mon Apr 15 13:54:22 2002
-@@ -105,6 +105,30 @@
- 	$(OBJDIR)/video/vlc.o \
- 	$(OBJDIR)/workarounds.o
- 
-+INSTALL_HEADERS = \
-+	bitstream.h \
-+	libmpeg3.h \
-+	mpeg3atrack.h \
-+	mpeg3css.h \
-+	mpeg3demux.h \
-+	mpeg3io.h \
-+	mpeg3private.h \
-+	mpeg3private.inc \
-+	mpeg3protos.h \
-+	mpeg3title.h \
-+	mpeg3vtrack.h \
-+	timecode.h \
-+
-+INSTALL_AHEADERS = \
-+	audio/ac3.h \
-+	audio/mpeg3audio.h \
-+
-+INSTALL_VHEADERS = \
-+	video/idct.h \
-+	video/slice.h \
-+	video/mpeg3video.h
-+
-+
- OUTPUT = $(OBJDIR)/libmpeg3.a
- SHAREDOUTPUT = $(OBJDIR)/libmpeg3.so
- UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split
-@@ -148,7 +171,17 @@
- util: $(UTILS)
- 
- install: 
--	cp $(UTILS) /usr/bin
-+	install -d $(DESTDIR)/bin
-+	install -d $(DESTDIR)/include/libmpeg3
-+	install -d $(DESTDIR)/include/libmpeg3/audio
-+	install -d $(DESTDIR)/include/libmpeg3/video
-+	install -d $(DESTDIR)/lib
-+	install $(UTILS) $(DESTDIR)/bin
-+	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3
-+	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio
-+	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video
-+	install -m 644 $(OUTPUT) $(DESTDIR)/lib
-+	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/lib
- 
- clean:
- 	rm -rf $(OBJDIR)
diff --git a/media-libs/libmpeg3/files/1.5.1-gentoo-p2.patch b/media-libs/libmpeg3/files/1.5.1-gentoo-p2.patch
deleted file mode 100644
index 18e66dcca01b..000000000000
--- a/media-libs/libmpeg3/files/1.5.1-gentoo-p2.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -urN libmpeg3.orig/bitstream.h libmpeg3/bitstream.h
---- libmpeg3.orig/bitstream.h	Fri Dec 21 14:00:01 2001
-+++ libmpeg3/bitstream.h	Mon Apr 15 14:13:12 2002
-@@ -1,7 +1,7 @@
- #ifndef BITSTREAM_H
- #define BITSTREAM_H
- 
--#include "mpeg3demux.h"
-+#include <libmpeg3/mpeg3demux.h>
- #include <sys/types.h>
- 
- //                                    next bit in forward direction
-diff -urN libmpeg3.orig/libmpeg3.h libmpeg3/libmpeg3.h
---- libmpeg3.orig/libmpeg3.h	Fri Dec 21 10:48:14 2001
-+++ libmpeg3/libmpeg3.h	Mon Apr 15 14:13:12 2002
-@@ -5,7 +5,7 @@
- extern "C" {
- #endif
- 
--#include "mpeg3private.h"
-+#include <libmpeg3/mpeg3private.h>
- 
- 
- /* Supported color models for mpeg3_read_frame */
-diff -urN libmpeg3.orig/mpeg3css.h libmpeg3/mpeg3css.h
---- libmpeg3.orig/mpeg3css.h	Sun Sep 30 20:18:31 2001
-+++ libmpeg3/mpeg3css.h	Mon Apr 15 14:13:12 2002
-@@ -2,7 +2,7 @@
- #define MPEG3CSS_H
- 
- 
--#include "mpeg3private.inc"
-+#include <libmpeg3/mpeg3private.inc>
- 
- struct mpeg3_block 
- {
-diff -urN libmpeg3.orig/mpeg3demux.h libmpeg3/mpeg3demux.h
---- libmpeg3.orig/mpeg3demux.h	Fri Dec 21 14:02:21 2001
-+++ libmpeg3/mpeg3demux.h	Mon Apr 15 14:13:12 2002
-@@ -1,7 +1,7 @@
- #ifndef MPEG3DEMUX_H
- #define MPEG3DEMUX_H
- 
--#include "mpeg3title.h"
-+#include <libmpeg3/mpeg3title.h>
- #include <stdio.h>
- 
- typedef struct
-diff -urN libmpeg3.orig/mpeg3io.h libmpeg3/mpeg3io.h
---- libmpeg3.orig/mpeg3io.h	Mon Dec 17 06:05:07 2001
-+++ libmpeg3/mpeg3io.h	Mon Apr 15 14:13:12 2002
-@@ -4,8 +4,8 @@
- 
- #include <stdio.h>
- #include <stdint.h>
--#include "mpeg3css.h"
--#include "mpeg3private.inc"
-+#include <libmpeg3/mpeg3css.h>
-+#include <libmpeg3/mpeg3private.inc>
- 
- /* Filesystem structure */
- /* We buffer in MPEG3_IO_SIZE buffers.  Stream IO would require back */
-diff -urN libmpeg3.orig/mpeg3title.h libmpeg3/mpeg3title.h
---- libmpeg3.orig/mpeg3title.h	Wed Dec 19 06:28:25 2001
-+++ libmpeg3/mpeg3title.h	Mon Apr 15 14:13:12 2002
-@@ -1,7 +1,7 @@
- #ifndef MPEG3TITLE_H
- #define MPEG3TITLE_H
- 
--#include "mpeg3io.h"
-+#include <libmpeg3/mpeg3io.h>
- 
- // May get rid of time values and rename to a cell offset table.
- // May also get rid of end byte.
-diff -urN libmpeg3.orig/mpeg3vtrack.h libmpeg3/mpeg3vtrack.h
---- libmpeg3.orig/mpeg3vtrack.h	Thu Dec 20 08:19:18 2001
-+++ libmpeg3/mpeg3vtrack.h	Mon Apr 15 14:13:12 2002
-@@ -1,8 +1,8 @@
- #ifndef MPEG3_VTRACK_H
- #define MPEG3_VTRACK_H
- 
--#include "mpeg3demux.h"
--#include "video/mpeg3video.h"
-+#include <libmpeg3/mpeg3demux.h>
-+#include <libmpeg3/video/mpeg3video.h>
- 
- typedef struct
- {
-diff -urN libmpeg3.orig/video/mpeg3video.h libmpeg3/video/mpeg3video.h
---- libmpeg3.orig/video/mpeg3video.h	Sun Sep 30 20:18:31 2001
-+++ libmpeg3/video/mpeg3video.h	Mon Apr 15 14:13:12 2002
-@@ -1,9 +1,9 @@
- #ifndef MPEGVIDEO_H
- #define MPEGVIDEO_H
- 
--#include "../bitstream.h"
--#include "../mpeg3private.inc"
--#include "idct.h"
--#include "slice.h"
--#include "../timecode.h"
-+#include <libmpeg3/bitstream.h>
-+#include <libmpeg3/mpeg3private.inc>
-+#include <libmpeg3/video/idct.h>
-+#include <libmpeg3/video/slice.h>
-+#include <libmpeg3/timecode.h>
- #endif
-diff -urN libmpeg3.orig/mpeg3atrack.h libmpeg3/atrack.h
---- libmpeg3.orig/mpeg3atrack.h	2003-07-26 17:31:58.000000000 -0400
-+++ libmpeg3/mpeg3atrack.h	2003-07-26 17:32:27.000000000 -0400
-@@ -1,7 +1,7 @@
- #ifndef MPEG3ATRACK_H
- #define MPEG3ATRACK_H
- 
--#include "mpeg3demux.h"
--#include "audio/mpeg3audio.h"
-+#include <libmpeg3/mpeg3demux.h>
-+#include <libmpeg3/audio/mpeg3audio.h>
- 
- #endif
diff --git a/media-libs/libmpeg3/files/1.5.1-largefile.patch b/media-libs/libmpeg3/files/1.5.1-largefile.patch
deleted file mode 100644
index 229349115712..000000000000
--- a/media-libs/libmpeg3/files/1.5.1-largefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2002-06-21 08:35:24.000000000 -0400
-+++ Makefile	2003-07-28 09:15:44.000000000 -0400
-@@ -33,7 +33,7 @@
- 
- 
- ifeq ($(USE_CSS), 1)
--  CFLAGS += -DHAVE_CSS
-+  CFLAGS += -DHAVE_CSS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
- endif
- 
- ifeq ($(USE_MMX), 1)
diff --git a/media-libs/libmpeg3/files/1.5.1-proper-c.patch b/media-libs/libmpeg3/files/1.5.1-proper-c.patch
deleted file mode 100644
index 135dfb633562..000000000000
--- a/media-libs/libmpeg3/files/1.5.1-proper-c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mpeg3toc.c.orig	2003-07-28 09:04:05.000000000 -0400
-+++ mpeg3toc.c	2003-07-28 09:06:26.000000000 -0400
-@@ -196,9 +196,9 @@
- 				if(!mpeg3_end_of_audio(input, j))
- 				{
- // Don't want to maintain separate vectors for offset and title.
--					title_number = mpeg3demux_tell_title(input->atrack[j]->demuxer);
- 					int64_t position = mpeg3demux_tell(input->atrack[j]->demuxer);
- 					int64_t result;
-+					title_number = mpeg3demux_tell_title(input->atrack[j]->demuxer);
- 					if(position < MPEG3_IO_SIZE) position = MPEG3_IO_SIZE;
- 					result = (title_number << 56) | (position - MPEG3_IO_SIZE);
- 
diff --git a/media-libs/libmpeg3/files/1.5.1-pthread.patch b/media-libs/libmpeg3/files/1.5.1-pthread.patch
deleted file mode 100644
index 2adeed9bab8c..000000000000
--- a/media-libs/libmpeg3/files/1.5.1-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mpeg3private.h.orig	2003-07-26 17:18:33.000000000 -0400
-+++ mpeg3private.h	2003-07-26 17:18:40.000000000 -0400
-@@ -3,7 +3,7 @@
- 
- #include <stdint.h>
- #include <stdio.h>
--
-+#include <pthread.h>
- 
- 
- 
diff --git a/media-libs/libmpeg3/files/1.5.2-gcc3.4.patch b/media-libs/libmpeg3/files/1.5.2-gcc3.4.patch
deleted file mode 100644
index 2d46489cf3ff..000000000000
--- a/media-libs/libmpeg3/files/1.5.2-gcc3.4.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Only in libmpeg3-1.5.2-orig: i686
-diff -urbB libmpeg3-1.5.2-orig/video/output.c libmpeg3-1.5.2/video/output.c
---- libmpeg3-1.5.2-orig/video/output.c	2002-06-21 12:35:24.000000000 +0000
-+++ libmpeg3-1.5.2/video/output.c	2004-05-04 12:47:31.153075072 +0000
-@@ -6,21 +6,21 @@
- 
- static long long mpeg3_MMX_0 = 0L;
- static unsigned long  mpeg3_MMX_10w[]         = {0x00100010, 0x00100010};                     /*dd    00010 0010h, 000100010h */
--static unsigned long  mpeg3_MMX_80w[]         = {0x00800080, 0x00800080};                     /*dd    00080 0080h, 000800080h */
-+static unsigned long  __attribute__((used)) mpeg3_MMX_80w[]         = {0x00800080, 0x00800080};                     /*dd    00080 0080h, 000800080h */
- 
--static unsigned long  mpeg3_MMX_00FFw[]       = {0x00ff00ff, 0x00ff00ff};                     /*dd    000FF 00FFh, 000FF00FFh */
-+static unsigned long  __attribute__((used)) mpeg3_MMX_00FFw[]       = {0x00ff00ff, 0x00ff00ff};                     /*dd    000FF 00FFh, 000FF00FFh */
- 
--static unsigned short mpeg3_MMX_Ublucoeff[]   = {0x81, 0x81, 0x81, 0x81};                     /*dd    00081 0081h, 000810081h */
--static unsigned short mpeg3_MMX_Vredcoeff[]   = {0x66, 0x66, 0x66, 0x66};                     /*dd    00066 0066h, 000660066h */
-+static unsigned short __attribute__((used)) mpeg3_MMX_Ublucoeff[]   = {0x81, 0x81, 0x81, 0x81};                     /*dd    00081 0081h, 000810081h */
-+static unsigned short __attribute__((used)) mpeg3_MMX_Vredcoeff[]   = {0x66, 0x66, 0x66, 0x66};                     /*dd    00066 0066h, 000660066h */
- 
--static unsigned short mpeg3_MMX_Ugrncoeff[]   = {0xffe8, 0xffe8, 0xffe8, 0xffe8};             /*dd    0FFE7 FFE7h, 0FFE7FFE7h */
--static unsigned short mpeg3_MMX_Vgrncoeff[]   = {0xffcd, 0xffcd, 0xffcd, 0xffcd};             /*dd    0FFCC FFCCh, 0FFCCFFCCh */
-+static unsigned short __attribute__((used)) mpeg3_MMX_Ugrncoeff[]   = {0xffe8, 0xffe8, 0xffe8, 0xffe8};             /*dd    0FFE7 FFE7h, 0FFE7FFE7h */
-+static unsigned short __attribute__((used)) mpeg3_MMX_Vgrncoeff[]   = {0xffcd, 0xffcd, 0xffcd, 0xffcd};             /*dd    0FFCC FFCCh, 0FFCCFFCCh */
- 
--static unsigned short mpeg3_MMX_Ycoeff[]      = {0x4a, 0x4a, 0x4a, 0x4a};                     /*dd    0004A 004Ah, 0004A004Ah */
-+static unsigned short __attribute__((used)) mpeg3_MMX_Ycoeff[]      = {0x4a, 0x4a, 0x4a, 0x4a};                     /*dd    0004A 004Ah, 0004A004Ah */
- 
--static unsigned short mpeg3_MMX_redmask[]     = {0xf800, 0xf800, 0xf800, 0xf800};             /*dd    07c00 7c00h, 07c007c00h */
-+static unsigned short __attribute__((used)) mpeg3_MMX_redmask[]     = {0xf800, 0xf800, 0xf800, 0xf800};             /*dd    07c00 7c00h, 07c007c00h */
- 
--static unsigned short mpeg3_MMX_grnmask[]     = {0x7e0, 0x7e0, 0x7e0, 0x7e0};                 /*dd    003e0 03e0h, 003e003e0h */
-+static unsigned short __attribute__((used)) mpeg3_MMX_grnmask[]     = {0x7e0, 0x7e0, 0x7e0, 0x7e0};                 /*dd    003e0 03e0h, 003e003e0h */
- 
- static unsigned char mpeg3_601_to_rgb[256];
- 
-@@ -207,12 +207,12 @@
- 		);
- }
- 
--static unsigned long long  mpeg3_MMX_U_80 = 0x0000008000800000;
--static unsigned long long  mpeg3_MMX_V_80 = 0x0000000000800080;
--static long long  mpeg3_MMX_U_COEF        = 0x00000058ffd30000;
--static long long  mpeg3_MMX_V_COEF        = 0x00000000ffea006f;
--static long long  mpeg3_MMX_601_Y_COEF    = 0x0000004800480048;
--static long long  mpeg3_MMX_601_Y_DIFF    = 0x0000000000000010;
-+static unsigned long long  __attribute__((used)) mpeg3_MMX_U_80 = 0x0000008000800000;
-+static unsigned long long  __attribute__((used)) mpeg3_MMX_V_80 = 0x0000000000800080;
-+static long long  __attribute__((used)) mpeg3_MMX_U_COEF        = 0x00000058ffd30000;
-+static long long  __attribute__((used)) mpeg3_MMX_V_COEF        = 0x00000000ffea006f;
-+static long long  __attribute__((used)) mpeg3_MMX_601_Y_COEF    = 0x0000004800480048;
-+static long long  __attribute__((used)) mpeg3_MMX_601_Y_DIFF    = 0x0000000000000010;
- 
- inline void mpeg3_bgra32_mmx(unsigned long y, 
- 		unsigned long u, 
-@@ -297,10 +297,10 @@
- : "r" (&y), "r" (&u), "r" (&v), "r" (output));
- }
- 
--static unsigned long long  mpeg3_MMX_U_80_RGB    = 0x0000000000800080;
--static unsigned long long  mpeg3_MMX_V_80_RGB    = 0x0000008000800000;
--static long long  mpeg3_MMX_U_COEF_RGB    = 0x00000000ffd30058;
--static long long  mpeg3_MMX_V_COEF_RGB    = 0x0000006fffea0000;
-+static unsigned long long  __attribute__((used)) mpeg3_MMX_U_80_RGB    = 0x0000000000800080;
-+static unsigned long long  __attribute__((used)) mpeg3_MMX_V_80_RGB    = 0x0000008000800000;
-+static long long  __attribute__((used)) mpeg3_MMX_U_COEF_RGB    = 0x00000000ffd30058;
-+static long long  __attribute__((used)) mpeg3_MMX_V_COEF_RGB    = 0x0000006fffea0000;
- 
- inline void mpeg3_rgba32_mmx(unsigned long y, 
- 		unsigned long u, 
-diff -urbB libmpeg3-1.5.2-orig/video/reconstruct.c libmpeg3-1.5.2/video/reconstruct.c
---- libmpeg3-1.5.2-orig/video/reconstruct.c	2002-06-21 12:35:24.000000000 +0000
-+++ libmpeg3-1.5.2/video/reconstruct.c	2004-05-04 12:51:36.933710736 +0000
-@@ -271,8 +271,8 @@
- }
- 
- #else  // HAVE_3DNOW
--	static long long ADD_1	=	0x0101010101010101LL;
--	static long long MASK_AND = 0x7f7f7f7f7f7f7f7fLL;
-+	static long long __attribute__((used)) ADD_1	= 0x0101010101010101LL;
-+	static long long __attribute__((used)) MASK_AND = 0x7f7f7f7f7f7f7f7fLL;
- #endif
- 
- static inline void rec_mmx(unsigned char *s, unsigned char *d, int lx2, int h)
-diff -urbB libmpeg3-1.5.2-orig/video/slice.c libmpeg3-1.5.2/video/slice.c
---- libmpeg3-1.5.2-orig/video/slice.c	2002-06-21 12:35:24.000000000 +0000
-+++ libmpeg3-1.5.2/video/slice.c	2004-05-04 12:50:17.111845504 +0000
-@@ -6,7 +6,7 @@
- 
- #define CLIP(x)  ((x) >= 0 ? ((x) < 255 ? (x) : 255) : 0)
- 
--static unsigned long long MMX_128 = 0x80008000800080LL;
-+static unsigned long long __attribute__((used)) MMX_128 = 0x80008000800080LL;
- 
- int mpeg3_new_slice_buffer(mpeg3_slice_buffer_t *slice_buffer)
- {
diff --git a/media-libs/libmpeg3/files/1.5.2-gcc4.patch b/media-libs/libmpeg3/files/1.5.2-gcc4.patch
deleted file mode 100644
index 11dee13b3593..000000000000
--- a/media-libs/libmpeg3/files/1.5.2-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpeg3-1.5.2/video/output.c.orig	2005-04-25 19:14:02.000000000 +0000
-+++ libmpeg3-1.5.2/video/output.c	2005-04-25 19:14:15.000000000 +0000
-@@ -497,7 +497,7 @@
- 	*data++ = 0;
- 
- #define STORE_PIXEL_RGB565 \
--	*((unsigned short*)data)++ = \
-+	*data++ = \
- 		((CLIP(r_l) & 0xf8) << 8) | \
- 		((CLIP(g_l) & 0xfc) << 3) | \
- 		((CLIP(b_l) & 0xf8) >> 3);
diff --git a/media-libs/libmpeg3/files/1.5.2-gentoo-mpeg3split.patch b/media-libs/libmpeg3/files/1.5.2-gentoo-mpeg3split.patch
deleted file mode 100644
index 5412b61ee6a6..000000000000
--- a/media-libs/libmpeg3/files/1.5.2-gentoo-mpeg3split.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- Makefile.orig	2003-11-03 21:31:31.154535784 -0500
-+++ Makefile	2003-11-03 21:32:32.385227304 -0500
-@@ -138,9 +138,8 @@
- 
- 
- OUTPUT = $(OBJDIR)/libmpeg3.a
--UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3toc  $(OBJDIR)/mpeg3cat
--
--#$(OBJDIR)/mpeg3split
-+SHAREDOUTPUT = $(OBJDIR)/libmpeg3.so
-+UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3toc  $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3split
- 
- 
- LIBS = -lm -lpthread
-@@ -152,13 +151,14 @@
- $(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
- $(shell mkdir -p $(DIRS) )
- 
--all: $(OUTPUT) $(UTILS)
-+all: $(OUTPUT) $(SHAREDOUTPUT) $(UTILS)
- 
- 
- $(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
- 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
- 
--
-+$(SHAREDOUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
-+	gcc -shared -o $(SHAREDOUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS) $(LIBS)
- 
- $(OBJDIR)/mpeg3dump: $(OUTPUT) mpeg3dump.c
- 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS)
-@@ -169,8 +169,8 @@
- $(OBJDIR)/mpeg3cat: $(OUTPUT) mpeg3cat.c
- 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS)
- 
--#$(OBJDIR)/mpeg3split: $(OUTPUT)
--#	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
-+$(OBJDIR)/mpeg3split: $(OUTPUT)
-+	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
- 
- $(OBJDIR)/mpeg2qt: $(OUTPUT)
- 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg2qt mpeg2qt.c \
-@@ -213,7 +213,7 @@
- $(OBJDIR)/mpeg3demux.o: 			    mpeg3demux.c
- $(OBJDIR)/mpeg3ifo.o: 				    mpeg3ifo.c
- $(OBJDIR)/mpeg3io.o: 				    mpeg3io.c
--#$(OBJDIR)/mpeg3split.o: 			    mpeg3split.c
-+$(OBJDIR)/mpeg3split.o: 			    mpeg3split.c
- $(OBJDIR)/mpeg3title.o: 			    mpeg3title.c
- $(OBJDIR)/mpeg3toc.o: 				    mpeg3toc.c
- $(OBJDIR)/mpeg3toc3.o:  			    mpeg3toc3.c
---- mpeg3split.c.orig	2003-11-03 21:33:17.923304464 -0500
-+++ mpeg3split.c	2003-11-03 21:33:36.419492616 -0500
-@@ -2,6 +2,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
-+#include "mpeg3private.h"
- #include "mpeg3private.inc"
- 
- void copy_data(FILE *out, FILE *in, long bytes)
diff --git a/media-libs/libmpeg3/files/1.5.2-gentoo-multilib.patch b/media-libs/libmpeg3/files/1.5.2-gentoo-multilib.patch
deleted file mode 100644
index 795e1ac7bea5..000000000000
--- a/media-libs/libmpeg3/files/1.5.2-gentoo-multilib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur libmpeg3-1.5.2.orig/Makefile libmpeg3-1.5.2/Makefile
---- libmpeg3-1.5.2.orig/Makefile	2004-10-08 02:31:11.839597000 -0700
-+++ libmpeg3-1.5.2/Makefile	2004-10-08 02:33:42.627740299 -0700
-@@ -212,13 +212,13 @@
- 	install -d $(DESTDIR)/include/libmpeg3
- 	install -d $(DESTDIR)/include/libmpeg3/audio
- 	install -d $(DESTDIR)/include/libmpeg3/video
--	install -d $(DESTDIR)/lib
-+	install -d $(DESTDIR)/$(LIBDIR)
- 	install $(UTILS) $(DESTDIR)/bin
- 	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3
- 	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio
- 	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video
--	install -m 644 $(OUTPUT) $(DESTDIR)/lib
--	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/lib
-+	install -m 644 $(OUTPUT) $(DESTDIR)/$(LIBDIR)
-+	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/$(LIBDIR)
- 
- clean:
- 	rm -rf $(OBJDIR)
diff --git a/media-libs/libmpeg3/files/1.5.2-gentoo-p1.patch b/media-libs/libmpeg3/files/1.5.2-gentoo-p1.patch
deleted file mode 100644
index 5a9013c6361e..000000000000
--- a/media-libs/libmpeg3/files/1.5.2-gentoo-p1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urN libmpeg3.orig/Makefile libmpeg3/Makefile
---- libmpeg3.orig/Makefile	Wed Dec 26 07:40:52 2001
-+++ libmpeg3/Makefile	Mon Apr 15 13:54:22 2002
-@@ -105,6 +105,30 @@
- 	$(OBJDIR)/video/vlc.o \
- 	$(OBJDIR)/workarounds.o
- 
-+INSTALL_HEADERS = \
-+	bitstream.h \
-+	libmpeg3.h \
-+	mpeg3atrack.h \
-+	mpeg3css.h \
-+	mpeg3demux.h \
-+	mpeg3io.h \
-+	mpeg3private.h \
-+	mpeg3private.inc \
-+	mpeg3protos.h \
-+	mpeg3title.h \
-+	mpeg3vtrack.h \
-+	timecode.h \
-+
-+INSTALL_AHEADERS = \
-+	audio/ac3.h \
-+	audio/mpeg3audio.h \
-+
-+INSTALL_VHEADERS = \
-+	video/idct.h \
-+	video/slice.h \
-+	video/mpeg3video.h
-+
-+
- OUTPUT = $(OBJDIR)/libmpeg3.a
- SHAREDOUTPUT = $(OBJDIR)/libmpeg3.so
- UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split
-@@ -148,7 +171,17 @@
- util: $(UTILS)
- 
- install: 
--	cp $(UTILS) /usr/bin
-+	install -d $(DESTDIR)/bin
-+	install -d $(DESTDIR)/include/libmpeg3
-+	install -d $(DESTDIR)/include/libmpeg3/audio
-+	install -d $(DESTDIR)/include/libmpeg3/video
-+	install -d $(DESTDIR)/lib
-+	install $(UTILS) $(DESTDIR)/bin
-+	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3
-+	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio
-+	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video
-+	install -m 644 $(OUTPUT) $(DESTDIR)/lib
-+	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/lib
- 
- clean:
- 	rm -rf $(OBJDIR)
diff --git a/media-libs/libmpeg3/files/1.5.2-gentoo-p2.patch b/media-libs/libmpeg3/files/1.5.2-gentoo-p2.patch
deleted file mode 100644
index 18e66dcca01b..000000000000
--- a/media-libs/libmpeg3/files/1.5.2-gentoo-p2.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -urN libmpeg3.orig/bitstream.h libmpeg3/bitstream.h
---- libmpeg3.orig/bitstream.h	Fri Dec 21 14:00:01 2001
-+++ libmpeg3/bitstream.h	Mon Apr 15 14:13:12 2002
-@@ -1,7 +1,7 @@
- #ifndef BITSTREAM_H
- #define BITSTREAM_H
- 
--#include "mpeg3demux.h"
-+#include <libmpeg3/mpeg3demux.h>
- #include <sys/types.h>
- 
- //                                    next bit in forward direction
-diff -urN libmpeg3.orig/libmpeg3.h libmpeg3/libmpeg3.h
---- libmpeg3.orig/libmpeg3.h	Fri Dec 21 10:48:14 2001
-+++ libmpeg3/libmpeg3.h	Mon Apr 15 14:13:12 2002
-@@ -5,7 +5,7 @@
- extern "C" {
- #endif
- 
--#include "mpeg3private.h"
-+#include <libmpeg3/mpeg3private.h>
- 
- 
- /* Supported color models for mpeg3_read_frame */
-diff -urN libmpeg3.orig/mpeg3css.h libmpeg3/mpeg3css.h
---- libmpeg3.orig/mpeg3css.h	Sun Sep 30 20:18:31 2001
-+++ libmpeg3/mpeg3css.h	Mon Apr 15 14:13:12 2002
-@@ -2,7 +2,7 @@
- #define MPEG3CSS_H
- 
- 
--#include "mpeg3private.inc"
-+#include <libmpeg3/mpeg3private.inc>
- 
- struct mpeg3_block 
- {
-diff -urN libmpeg3.orig/mpeg3demux.h libmpeg3/mpeg3demux.h
---- libmpeg3.orig/mpeg3demux.h	Fri Dec 21 14:02:21 2001
-+++ libmpeg3/mpeg3demux.h	Mon Apr 15 14:13:12 2002
-@@ -1,7 +1,7 @@
- #ifndef MPEG3DEMUX_H
- #define MPEG3DEMUX_H
- 
--#include "mpeg3title.h"
-+#include <libmpeg3/mpeg3title.h>
- #include <stdio.h>
- 
- typedef struct
-diff -urN libmpeg3.orig/mpeg3io.h libmpeg3/mpeg3io.h
---- libmpeg3.orig/mpeg3io.h	Mon Dec 17 06:05:07 2001
-+++ libmpeg3/mpeg3io.h	Mon Apr 15 14:13:12 2002
-@@ -4,8 +4,8 @@
- 
- #include <stdio.h>
- #include <stdint.h>
--#include "mpeg3css.h"
--#include "mpeg3private.inc"
-+#include <libmpeg3/mpeg3css.h>
-+#include <libmpeg3/mpeg3private.inc>
- 
- /* Filesystem structure */
- /* We buffer in MPEG3_IO_SIZE buffers.  Stream IO would require back */
-diff -urN libmpeg3.orig/mpeg3title.h libmpeg3/mpeg3title.h
---- libmpeg3.orig/mpeg3title.h	Wed Dec 19 06:28:25 2001
-+++ libmpeg3/mpeg3title.h	Mon Apr 15 14:13:12 2002
-@@ -1,7 +1,7 @@
- #ifndef MPEG3TITLE_H
- #define MPEG3TITLE_H
- 
--#include "mpeg3io.h"
-+#include <libmpeg3/mpeg3io.h>
- 
- // May get rid of time values and rename to a cell offset table.
- // May also get rid of end byte.
-diff -urN libmpeg3.orig/mpeg3vtrack.h libmpeg3/mpeg3vtrack.h
---- libmpeg3.orig/mpeg3vtrack.h	Thu Dec 20 08:19:18 2001
-+++ libmpeg3/mpeg3vtrack.h	Mon Apr 15 14:13:12 2002
-@@ -1,8 +1,8 @@
- #ifndef MPEG3_VTRACK_H
- #define MPEG3_VTRACK_H
- 
--#include "mpeg3demux.h"
--#include "video/mpeg3video.h"
-+#include <libmpeg3/mpeg3demux.h>
-+#include <libmpeg3/video/mpeg3video.h>
- 
- typedef struct
- {
-diff -urN libmpeg3.orig/video/mpeg3video.h libmpeg3/video/mpeg3video.h
---- libmpeg3.orig/video/mpeg3video.h	Sun Sep 30 20:18:31 2001
-+++ libmpeg3/video/mpeg3video.h	Mon Apr 15 14:13:12 2002
-@@ -1,9 +1,9 @@
- #ifndef MPEGVIDEO_H
- #define MPEGVIDEO_H
- 
--#include "../bitstream.h"
--#include "../mpeg3private.inc"
--#include "idct.h"
--#include "slice.h"
--#include "../timecode.h"
-+#include <libmpeg3/bitstream.h>
-+#include <libmpeg3/mpeg3private.inc>
-+#include <libmpeg3/video/idct.h>
-+#include <libmpeg3/video/slice.h>
-+#include <libmpeg3/timecode.h>
- #endif
-diff -urN libmpeg3.orig/mpeg3atrack.h libmpeg3/atrack.h
---- libmpeg3.orig/mpeg3atrack.h	2003-07-26 17:31:58.000000000 -0400
-+++ libmpeg3/mpeg3atrack.h	2003-07-26 17:32:27.000000000 -0400
-@@ -1,7 +1,7 @@
- #ifndef MPEG3ATRACK_H
- #define MPEG3ATRACK_H
- 
--#include "mpeg3demux.h"
--#include "audio/mpeg3audio.h"
-+#include <libmpeg3/mpeg3demux.h>
-+#include <libmpeg3/audio/mpeg3audio.h>
- 
- #endif
diff --git a/media-libs/libmpeg3/files/1.5.2-largefile.patch b/media-libs/libmpeg3/files/1.5.2-largefile.patch
deleted file mode 100644
index 229349115712..000000000000
--- a/media-libs/libmpeg3/files/1.5.2-largefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2002-06-21 08:35:24.000000000 -0400
-+++ Makefile	2003-07-28 09:15:44.000000000 -0400
-@@ -33,7 +33,7 @@
- 
- 
- ifeq ($(USE_CSS), 1)
--  CFLAGS += -DHAVE_CSS
-+  CFLAGS += -DHAVE_CSS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
- endif
- 
- ifeq ($(USE_MMX), 1)
diff --git a/media-libs/libmpeg3/files/1.5.2-no-nasm.patch b/media-libs/libmpeg3/files/1.5.2-no-nasm.patch
deleted file mode 100644
index 73acfc29c270..000000000000
--- a/media-libs/libmpeg3/files/1.5.2-no-nasm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	2003-11-05 09:35:19.787583544 -0500
-+++ Makefile	2003-11-05 09:35:26.617545232 -0500
-@@ -6,9 +6,9 @@
- 
- HAVE_NASM := $(shell if [ -x /usr/bin/nasm -o -x /usr/local/bin/nasm ]; then echo y; else echo n; fi)
-                                                                                 
--ifeq ($(HAVE_NASM), n)
--$(error "Nasm is required.  Download it from nasm.sourceforge.net.")
--endif
-+#ifeq ($(HAVE_NASM), n)
-+#$(error "Nasm is required.  Download it from nasm.sourceforge.net.")
-+#endif
- 
- 
- ifeq ($(origin CFLAGS), environment)
diff --git a/media-libs/libmpeg3/files/1.5.2-proper-c.patch b/media-libs/libmpeg3/files/1.5.2-proper-c.patch
deleted file mode 100644
index 135dfb633562..000000000000
--- a/media-libs/libmpeg3/files/1.5.2-proper-c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mpeg3toc.c.orig	2003-07-28 09:04:05.000000000 -0400
-+++ mpeg3toc.c	2003-07-28 09:06:26.000000000 -0400
-@@ -196,9 +196,9 @@
- 				if(!mpeg3_end_of_audio(input, j))
- 				{
- // Don't want to maintain separate vectors for offset and title.
--					title_number = mpeg3demux_tell_title(input->atrack[j]->demuxer);
- 					int64_t position = mpeg3demux_tell(input->atrack[j]->demuxer);
- 					int64_t result;
-+					title_number = mpeg3demux_tell_title(input->atrack[j]->demuxer);
- 					if(position < MPEG3_IO_SIZE) position = MPEG3_IO_SIZE;
- 					result = (title_number << 56) | (position - MPEG3_IO_SIZE);
- 
diff --git a/media-libs/libmpeg3/files/1.5.2-pthread.patch b/media-libs/libmpeg3/files/1.5.2-pthread.patch
deleted file mode 100644
index 2adeed9bab8c..000000000000
--- a/media-libs/libmpeg3/files/1.5.2-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mpeg3private.h.orig	2003-07-26 17:18:33.000000000 -0400
-+++ mpeg3private.h	2003-07-26 17:18:40.000000000 -0400
-@@ -3,7 +3,7 @@
- 
- #include <stdint.h>
- #include <stdio.h>
--
-+#include <pthread.h>
- 
- 
- 
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2
index f02917ce1539..86706bf5725d 100644
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2
+++ b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2
@@ -1 +1,2 @@
 MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
+MD5 2ae9393b4a201b0d6416cb8d3d338b9d libmpeg3-patches-1.tar.bz2 4176
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1
index f02917ce1539..86706bf5725d 100644
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1
+++ b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r1
@@ -1 +1,2 @@
 MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
+MD5 2ae9393b4a201b0d6416cb8d3d338b9d libmpeg3-patches-1.tar.bz2 4176
diff --git a/media-libs/libmpeg3/files/libmpeg3-gentoo-patch-part1 b/media-libs/libmpeg3/files/libmpeg3-gentoo-patch-part1
deleted file mode 100644
index 7662157b7c0a..000000000000
--- a/media-libs/libmpeg3/files/libmpeg3-gentoo-patch-part1
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -urN libmpeg3.orig/Makefile libmpeg3/Makefile
---- libmpeg3.orig/Makefile	Wed Dec 26 07:40:52 2001
-+++ libmpeg3/Makefile	Mon Apr 15 13:54:22 2002
-@@ -105,6 +105,29 @@
- 	$(OBJDIR)/video/vlc.o \
- 	$(OBJDIR)/workarounds.o
- 
-+INSTALL_HEADERS = \
-+	bitstream.h \
-+	libmpeg3.h \
-+	mpeg3atrack.h \
-+	mpeg3css.h \
-+	mpeg3demux.h \
-+	mpeg3io.h \
-+	mpeg3private.h \
-+	mpeg3private.inc \
-+	mpeg3title.h \
-+	mpeg3vtrack.h \
-+	timecode.h \
-+
-+INSTALL_AHEADERS = \
-+	audio/ac3.h \
-+	audio/mpeg3audio.h \
-+
-+INSTALL_VHEADERS = \
-+	video/idct.h \
-+	video/slice.h \
-+	video/mpeg3video.h
-+
-+
- OUTPUT = $(OBJDIR)/libmpeg3.a
- SHAREDOUTPUT = $(OBJDIR)/libmpeg3.so
- UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split
-@@ -148,7 +171,17 @@
- util: $(UTILS)
- 
- install: 
--	cp $(UTILS) /usr/bin
-+	install -d $(DESTDIR)/bin
-+	install -d $(DESTDIR)/include/libmpeg3
-+	install -d $(DESTDIR)/include/libmpeg3/audio
-+	install -d $(DESTDIR)/include/libmpeg3/video
-+	install -d $(DESTDIR)/lib
-+	install $(UTILS) $(DESTDIR)/bin
-+	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3
-+	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio
-+	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video
-+	install -m 644 $(OUTPUT) $(DESTDIR)/lib
-+	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/lib
- 
- clean:
- 	rm -rf $(OBJDIR)
diff --git a/media-libs/libmpeg3/files/libmpeg3-gentoo-patch-part2 b/media-libs/libmpeg3/files/libmpeg3-gentoo-patch-part2
deleted file mode 100644
index c340a9e0fce4..000000000000
--- a/media-libs/libmpeg3/files/libmpeg3-gentoo-patch-part2
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -urN libmpeg3.orig/audio/mpeg3audio.h libmpeg3/audio/mpeg3audio.h
---- libmpeg3.orig/audio/mpeg3audio.h	Fri Dec 21 10:46:16 2001
-+++ libmpeg3/audio/mpeg3audio.h	Mon Apr 15 14:13:12 2002
-@@ -1,8 +1,8 @@
- #ifndef MPEG3AUDIO_H
- #define MPEG3AUDIO_H
- 
--#include "ac3.h"
--#include "../bitstream.h"
-+#include <libmpeg3/audio/ac3.h>
-+#include <libmpeg3/bitstream.h>
- 
- #define MAXFRAMESIZE 1792
- #define HDRCMPMASK 0xfffffd00
-diff -urN libmpeg3.orig/bitstream.h libmpeg3/bitstream.h
---- libmpeg3.orig/bitstream.h	Fri Dec 21 14:00:01 2001
-+++ libmpeg3/bitstream.h	Mon Apr 15 14:13:12 2002
-@@ -1,7 +1,7 @@
- #ifndef BITSTREAM_H
- #define BITSTREAM_H
- 
--#include "mpeg3demux.h"
-+#include <libmpeg3/mpeg3demux.h>
- #include <sys/types.h>
- 
- //                                    next bit in forward direction
-diff -urN libmpeg3.orig/libmpeg3.h libmpeg3/libmpeg3.h
---- libmpeg3.orig/libmpeg3.h	Fri Dec 21 10:48:14 2001
-+++ libmpeg3/libmpeg3.h	Mon Apr 15 14:13:12 2002
-@@ -5,7 +5,7 @@
- extern "C" {
- #endif
- 
--#include "mpeg3private.h"
-+#include <libmpeg3/mpeg3private.h>
- 
- 
- /* Supported color models for mpeg3_read_frame */
-diff -urN libmpeg3.orig/mpeg3css.h libmpeg3/mpeg3css.h
---- libmpeg3.orig/mpeg3css.h	Sun Sep 30 20:18:31 2001
-+++ libmpeg3/mpeg3css.h	Mon Apr 15 14:13:12 2002
-@@ -2,7 +2,7 @@
- #define MPEG3CSS_H
- 
- 
--#include "mpeg3private.inc"
-+#include <libmpeg3/mpeg3private.inc>
- 
- struct mpeg3_block 
- {
-diff -urN libmpeg3.orig/mpeg3demux.h libmpeg3/mpeg3demux.h
---- libmpeg3.orig/mpeg3demux.h	Fri Dec 21 14:02:21 2001
-+++ libmpeg3/mpeg3demux.h	Mon Apr 15 14:13:12 2002
-@@ -1,7 +1,7 @@
- #ifndef MPEG3DEMUX_H
- #define MPEG3DEMUX_H
- 
--#include "mpeg3title.h"
-+#include <libmpeg3/mpeg3title.h>
- #include <stdio.h>
- 
- typedef struct
-diff -urN libmpeg3.orig/mpeg3io.h libmpeg3/mpeg3io.h
---- libmpeg3.orig/mpeg3io.h	Mon Dec 17 06:05:07 2001
-+++ libmpeg3/mpeg3io.h	Mon Apr 15 14:13:12 2002
-@@ -4,8 +4,8 @@
- 
- #include <stdio.h>
- #include <stdint.h>
--#include "mpeg3css.h"
--#include "mpeg3private.inc"
-+#include <libmpeg3/mpeg3css.h>
-+#include <libmpeg3/mpeg3private.inc>
- 
- /* Filesystem structure */
- /* We buffer in MPEG3_IO_SIZE buffers.  Stream IO would require back */
-diff -urN libmpeg3.orig/mpeg3private.h libmpeg3/mpeg3private.h
---- libmpeg3.orig/mpeg3private.h	Thu Dec 20 07:38:54 2001
-+++ libmpeg3/mpeg3private.h	Mon Apr 15 14:13:12 2002
-@@ -1,12 +1,12 @@
- #ifndef MPEG3PRIVATE_H
- #define MPEG3PRIVATE_H
- 
--#include "mpeg3atrack.h"
--#include "mpeg3css.h"
--#include "mpeg3io.h"
--#include "mpeg3private.inc"
--#include "mpeg3title.h"
--#include "mpeg3vtrack.h"
-+#include <libmpeg3/mpeg3atrack.h>
-+#include <libmpeg3/mpeg3css.h>
-+#include <libmpeg3/mpeg3io.h>
-+#include <libmpeg3/mpeg3private.inc>
-+#include <libmpeg3/mpeg3title.h>
-+#include <libmpeg3/mpeg3vtrack.h>
- 
- typedef struct
- {
-diff -urN libmpeg3.orig/mpeg3title.h libmpeg3/mpeg3title.h
---- libmpeg3.orig/mpeg3title.h	Wed Dec 19 06:28:25 2001
-+++ libmpeg3/mpeg3title.h	Mon Apr 15 14:13:12 2002
-@@ -1,7 +1,7 @@
- #ifndef MPEG3TITLE_H
- #define MPEG3TITLE_H
- 
--#include "mpeg3io.h"
-+#include <libmpeg3/mpeg3io.h>
- 
- // May get rid of time values and rename to a cell offset table.
- // May also get rid of end byte.
-diff -urN libmpeg3.orig/mpeg3vtrack.h libmpeg3/mpeg3vtrack.h
---- libmpeg3.orig/mpeg3vtrack.h	Thu Dec 20 08:19:18 2001
-+++ libmpeg3/mpeg3vtrack.h	Mon Apr 15 14:13:12 2002
-@@ -1,8 +1,8 @@
- #ifndef MPEG3_VTRACK_H
- #define MPEG3_VTRACK_H
- 
--#include "mpeg3demux.h"
--#include "video/mpeg3video.h"
-+#include <libmpeg3/mpeg3demux.h>
-+#include <libmpeg3/video/mpeg3video.h>
- 
- typedef struct
- {
-diff -urN libmpeg3.orig/video/mpeg3video.h libmpeg3/video/mpeg3video.h
---- libmpeg3.orig/video/mpeg3video.h	Sun Sep 30 20:18:31 2001
-+++ libmpeg3/video/mpeg3video.h	Mon Apr 15 14:13:12 2002
-@@ -1,11 +1,11 @@
- #ifndef MPEGVIDEO_H
- #define MPEGVIDEO_H
- 
--#include "../bitstream.h"
--#include "../mpeg3private.inc"
--#include "idct.h"
--#include "slice.h"
--#include "../timecode.h"
-+#include <libmpeg3/bitstream.h>
-+#include <libmpeg3/mpeg3private.inc>
-+#include <libmpeg3/video/idct.h>
-+#include <libmpeg3/video/slice.h>
-+#include <libmpeg3/timecode.h>
- 
- /* zig-zag scan */
- extern unsigned char mpeg3_zig_zag_scan_nommx[64];
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild
index d7c4d05f3717..1aa7d4bc570e 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2-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/libmpeg3/libmpeg3-1.5.2-r1.ebuild,v 1.6 2005/04/25 19:32:50 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild,v 1.7 2005/05/02 09:14:08 flameeyes Exp $
 
 inherit flag-o-matic eutils gcc
 
+PATCHLEVEL="1"
 DESCRIPTION="An mpeg library for linux"
 HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,18 +27,13 @@ src_unpack() {
 	# The Makefile is patched to install the header files as well.
 	# This patch was generated using the info in the src.rpm that
 	# SourceForge provides for this package.
-	epatch ${FILESDIR}/${PV}-gentoo-p1.patch
-	# Add in support for mpeg3split
-	epatch ${FILESDIR}/${PV}-gentoo-mpeg3split.patch
-	epatch ${FILESDIR}/${PV}-pthread.patch
-	epatch ${FILESDIR}/${PV}-largefile.patch
-	epatch ${FILESDIR}/${PV}-proper-c.patch
-	epatch ${FILESDIR}/${PV}-no-nasm.patch
-	epatch ${FILESDIR}/${PV}-gentoo-multilib.patch
-	[ "`gcc-version`" == "3.4" -o "`gcc-major-version`" -ge 4 ] && \
-		epatch ${FILESDIR}/${PV}-gcc3.4.patch #49452
-	[ "`gcc-major-version`" -ge 4 ] && \
-		epatch ${FILESDIR}/${PV}-gcc4.patch
+	[ "`gcc-version`" == "3.4" -o "`gcc-major-version`" -ge 4 ] || \
+		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 08_all_gcc34.patch"
+	[ "`gcc-major-version`" -ge 4 ] || \
+		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 09_all_gcc4.patch"
+
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
+
 	# remove a52 crap
 	echo > Makefile.a52
 	rm -rf a52dec-0.7.3/*
@@ -85,7 +82,7 @@ src_install() {
 	# This patch patches the .h files that get installed into /usr/include
 	# to show the correct include syntax '<>' instead of '""'  This patch
 	# was also generated using info from SF's src.rpm
-	epatch ${FILESDIR}/${PV}-gentoo-p2.patch
+	epatch ${WORKDIR}/${PV}/gentoo-p2.patch
 	make DESTDIR="${D}/usr" LIBDIR="$(get_libdir)" install || die
 	dohtml -r docs
 }
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild
index e3c7f151cd69..1956f838297b 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5.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/libmpeg3/libmpeg3-1.5.2.ebuild,v 1.17 2005/04/08 02:32:22 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild,v 1.18 2005/05/02 09:14:08 flameeyes Exp $
 
 inherit flag-o-matic eutils gcc
 
+PATCHLEVEL="1"
 DESCRIPTION="An mpeg library for linux"
 HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,15 +27,14 @@ src_unpack() {
 	# The Makefile is patched to install the header files as well.
 	# This patch was generated using the info in the src.rpm that
 	# SourceForge provides for this package.
-	epatch ${FILESDIR}/${PV}-gentoo-p1.patch
-	# Add in support for mpeg3split
-	epatch ${FILESDIR}/${PV}-gentoo-mpeg3split.patch
-	epatch ${FILESDIR}/${PV}-pthread.patch
-	epatch ${FILESDIR}/${PV}-largefile.patch
-	epatch ${FILESDIR}/${PV}-proper-c.patch
-	epatch ${FILESDIR}/${PV}-no-nasm.patch
-	epatch ${FILESDIR}/${PV}-gentoo-multilib.patch
-	[ "`gcc-version`" == "3.4" ] && epatch ${FILESDIR}/${PV}-gcc3.4.patch #49452
+
+	EPATCH_EXCLUDE="09_all_gcc4.patch"
+
+	#49452
+	[ "`gcc-version`" == "3.4" ] || EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 08_all_gcc34.patch"
+
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
+
 	# remove a52 crap
 	echo > Makefile.a52
 	rm -rf a52dec-0.7.3/*
@@ -62,7 +63,7 @@ src_install() {
 	# This patch patches the .h files that get installed into /usr/include
 	# to show the correct include syntax '<>' instead of '""'  This patch
 	# was also generated using info from SF's src.rpm
-	epatch ${FILESDIR}/${PV}-gentoo-p2.patch
+	epatch ${WORKDIR}/${PV}/gentoo-p2.patch
 	make DESTDIR="${D}/usr" LIBDIR="$(get_libdir)" install || die
 	dohtml -r docs
 }