old

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

9 files changed, 0 insertions, 1042 deletions

diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index fc9e72884137..a672fa45bf8a 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,19 +1,9 @@
 AUX lame-3.96-ccc.patch 658 RMD160 c598ad66543cc63897e0212e220a436da563ee71 SHA1 1e291ea8dbde132a22760a5279abe624e2835fae SHA256 60f0a60a72711827222cbb2d934a285199a62f9899e84097f851a53c61c4e6dd
-AUX lame-3.96.1-asneeded.patch 9027 RMD160 5456182576a331feb00d1d8931ba598e37f08804 SHA1 16ca5409f6710e3bf061f1fc3e339a0b265ac8a8 SHA256 6f9874c2f79c129a6d0d8d59d5887e8dbceff4a4bad2ad0b35987dc7d3f09809
-AUX lame-3.96.1-shared-frontend.patch 483 RMD160 bbcd78d61c25a92cdbcc04f10cf11f1a455846a2 SHA1 f2c7442d84e3d437e3c5d76064cf3e960ea6fad7 SHA256 b4b62098d61bc4e252b03abaea2f92d812ba0a8b16bb5fdf45d4b926e6c8c417
-AUX lame-3.98-echo.patch 361 RMD160 bc51688461367c85fcffa76b52d39f814037ceda SHA1 f7736b32ab06f9f0e9bda8e59b6d98779b8bfdf3 SHA256 1917632a5fb5c55a85582c3e3dc23681bb91eefc700aad29e17d5d5e9f2f5eec
-AUX lame-3.98-execstacks.patch 471 RMD160 047433da9998efc8110d592d7e1ed0862599302d SHA1 a8d44c4bddb1f6ad1b5a9dda5ed8a6f37c0335df SHA256 13cba5c2bcdcb58da1ff7b3d68e0422bc05f234da0896e3cd755a0ea003b9520
 AUX lame-3.98-gtk-path.patch 8606 RMD160 8bca3b986edf75853bfaee6837f9eb4832b664fa SHA1 dc77fbe83f167eeb3f77b6677a90765395b17de9 SHA256 0728822c0eb05b6dc70c0ae8e064c9be3b2a3448d10a53764397c70b7489a3b8
-AUX lame-3.98-pic-fix.patch 14804 RMD160 443e4b1fc6a54be4d2c356ea7b4cc857f26b2a1c SHA1 551d364c34c30f6486b034f6e0789247450aae95 SHA256 f77ededd6e067a4d47ad49a0fa939290de5b248ef83a4b8a1aba52dbb0649381
 AUX lame-3.98-shared-frontend.patch 1008 RMD160 8e12e752a325926e1376e45ffd3b72cac61ebf4a SHA1 af371fe673e42c4ba2e6e07255d6196d76d8ef79 SHA256 fb40bfb00e47964acbe0de428cc7a3e4b3a0e0ade120bf547891bf78031f6916
-AUX lame-3.98-stdint.patch 651 RMD160 84a732f356ac05941d90c2a261f9d624fc38bc5b SHA1 b4ebe2a3e8c343180b7d82e2bd2edb81a7c0d1bd SHA256 2fc25342cf5b5d5fd465c76f7899b0276e6e9f21b948f6005de0724a35dcc567
 AUX lame-3.98.2-ffmpeg-0.5.patch 2950 RMD160 71628a5b2d9ac7365ccbac3dbf3de7cea6006b5d SHA1 1f7c0a6c90bdc133921f999f1ed0855e95d39a5a SHA256 f9de77da233d81485463cf6c51a3b7ff21be78b17f7d91741532f9a9f5577500
-DIST lame-3.97.tar.gz 1328058 RMD160 5c4cf02c0f4e10c4cd2ab610d62478b554cd0873 SHA1 acf56065f4e31ce023b0f99002d537adb1ec09df SHA256 0a2334a6d11085298a9a3c46d5d310cca012f2e61d6efae90840a76a364dbe17
 DIST lame-398-2.tar.gz 1327643 RMD160 767dd94271eef221170469535db2bf388149715a SHA1 b2db41dbc9c0824caa102e8c932b820c79ccd5ec SHA256 a17a28569d8ed1e514915c1f12bdf4eedac506e5fbdf9a429ba97d5d42c9af32
-DIST lame-398.tar.gz 1415983 RMD160 754343791ac80d2403291c63f99eb409bca6b62f SHA1 287979d076834882c99d0cc01ddbd9b3697ceaae SHA256 8396bcb425ddcbfb8027d5712fa8878a2257006ccbe3ac7a772e1652e43d19b1
-EBUILD lame-3.97-r1.ebuild 2346 RMD160 640321c290688319b76aa9af77c455663876a0a5 SHA1 324c0c257957ea16a3d0d71d328adc4aaab92194 SHA256 d518c0d5494dcfd88dff9da0111619fc15fc3cc1da99140a06d3fbf83b14ebce
 EBUILD lame-3.98.2-r1.ebuild 2581 RMD160 4c1e331d6c0bf5fd58650ae768fbf3449a85d48d SHA1 f482092ddd0838683aa99feffba5fb45404e8685 SHA256 1c4ad788d1029a32466088e160ea105b19fc850d788c96c1635a6975415fb17d
 EBUILD lame-3.98.2.ebuild 2487 RMD160 480899b5d010590bffda719c4ec7c87436f5aaef SHA1 5b4d56364722e36a9ed6acd78e9a5471a4e7d49e SHA256 6f1371b7a71f64eda8f77f98422931b73f936ca58ac2bfbe48f299fe9f6a7a5a
-EBUILD lame-3.98.ebuild 2900 RMD160 1115408b86138ee84e0ea96013b4d1c07f799ab1 SHA1 864bf23db9e04cd7bfd56d96325c7aaabd20e89e SHA256 5b06c3416d3361cc5403ddf9c5fbc66274b7f09a8b4fb696f5fb74dbf1a21797
 MISC ChangeLog 15855 RMD160 32713c445e2924d1d2dc02cfe82a3d603014e8bc SHA1 84c3fd9d3adad84ad81c8809185aceaf4978c426 SHA256 2b829a1518438606d0b19321eb015bfb41d022cbd6d31dc16188ae8b35542c3e
 MISC metadata.xml 264 RMD160 a6be36fe4dffbf9280e34fafcf40571d0f960580 SHA1 7e6bff4996ab638c7e04e31197d3b45f9752c00f SHA256 69ff3c8176be87b9e058cf261280c392e026742616602914b8ee3e3b6eaa2280
diff --git a/media-sound/lame/files/lame-3.96.1-asneeded.patch b/media-sound/lame/files/lame-3.96.1-asneeded.patch
deleted file mode 100644
index 1ee68cf384c2..000000000000
--- a/media-sound/lame/files/lame-3.96.1-asneeded.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-Index: libmp3lame/Makefile.am
-===================================================================
---- libmp3lame/Makefile.am.orig
-+++ libmp3lame/Makefile.am
-@@ -18,7 +18,7 @@ else
- decoder_ldadd =
- endif
- 
--libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
-+libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
- libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
- 			-no-undefined
- 
-Index: gtk.m4
-===================================================================
---- gtk.m4.orig
-+++ gtk.m4
-@@ -0,0 +1,194 @@
-+# Configure paths for GTK+
-+# Owen Taylor     97-11-3
-+
-+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-+dnl
-+AC_DEFUN(AM_PATH_GTK,
-+[dnl 
-+dnl Get the cflags and libraries from the gtk-config script
-+dnl
-+AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
-+            gtk_config_prefix="$withval", gtk_config_prefix="")
-+AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-+            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
-+		    , enable_gtktest=yes)
-+
-+  for module in . $4
-+  do
-+      case "$module" in
-+         gthread) 
-+             gtk_config_args="$gtk_config_args gthread"
-+         ;;
-+      esac
-+  done
-+
-+  if test x$gtk_config_exec_prefix != x ; then
-+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-+     if test x${GTK_CONFIG+set} != xset ; then
-+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+     fi
-+  fi
-+  if test x$gtk_config_prefix != x ; then
-+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-+     if test x${GTK_CONFIG+set} != xset ; then
-+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+     fi
-+  fi
-+
-+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+  min_gtk_version=ifelse([$1], ,0.99.7,$1)
-+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-+  no_gtk=""
-+  if test "$GTK_CONFIG" = "no" ; then
-+    no_gtk=yes
-+  else
-+    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-+    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-+    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_gtktest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $GTK_CFLAGS"
-+      LIBS="$GTK_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GTK is sufficiently new. (Also sanity
-+dnl checks the results of gtk-config to some extent
-+dnl
-+      rm -f conf.gtktest
-+      AC_TRY_RUN([
-+#include <gtk/gtk.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int 
-+main ()
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  system ("touch conf.gtktest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = g_strdup("$min_gtk_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_gtk_version");
-+     exit(1);
-+   }
-+
-+  if ((gtk_major_version != $gtk_config_major_version) ||
-+      (gtk_minor_version != $gtk_config_minor_version) ||
-+      (gtk_micro_version != $gtk_config_micro_version))
-+    {
-+      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-+             gtk_major_version, gtk_minor_version, gtk_micro_version);
-+      printf ("*** was found! If gtk-config was correct, then it is best\n");
-+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-+      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-+      printf("*** before re-running configure\n");
-+    } 
-+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-+           (gtk_micro_version != GTK_MICRO_VERSION))
-+    {
-+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-+      printf("*** library (version %d.%d.%d)\n",
-+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-+    }
-+#endif /* defined (GTK_MAJOR_VERSION) ... */
-+  else
-+    {
-+      if ((gtk_major_version > major) ||
-+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-+      {
-+        return 0;
-+       }
-+     else
-+      {
-+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-+               gtk_major_version, gtk_minor_version, gtk_micro_version);
-+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-+	       major, minor, micro);
-+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-+        printf("***\n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-+        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+     fi
-+  fi
-+  if test "x$no_gtk" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$GTK_CONFIG" = "no" ; then
-+       echo "*** The gtk-config script installed by GTK could not be found"
-+       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-+       echo "*** full path to gtk-config."
-+     else
-+       if test -f conf.gtktest ; then
-+        :
-+       else
-+          echo "*** Could not run GTK test program, checking why..."
-+          CFLAGS="$CFLAGS $GTK_CFLAGS"
-+          LIBS="$LIBS $GTK_LIBS"
-+          AC_TRY_LINK([
-+#include <gtk/gtk.h>
-+#include <stdio.h>
-+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-+          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+          echo "***"
-+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-+          echo "*** came with the system with the command"
-+          echo "***"
-+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-+          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-+          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     GTK_CFLAGS=""
-+     GTK_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(GTK_CFLAGS)
-+  AC_SUBST(GTK_LIBS)
-+  rm -f conf.gtktest
-+])
diff --git a/media-sound/lame/files/lame-3.96.1-shared-frontend.patch b/media-sound/lame/files/lame-3.96.1-shared-frontend.patch
deleted file mode 100644
index db194b7f6c45..000000000000
--- a/media-sound/lame/files/lame-3.96.1-shared-frontend.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur lame-3.96.1.orig/frontend/Makefile.am lame-3.96.1/frontend/Makefile.am
---- lame-3.96.1.orig/frontend/Makefile.am	2004-01-21 01:41:36.000000000 -0800
-+++ lame-3.96.1/frontend/Makefile.am	2004-10-03 16:39:12.415901779 -0700
-@@ -50,7 +50,7 @@
- endif
- 
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
- 
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
- 
diff --git a/media-sound/lame/files/lame-3.98-echo.patch b/media-sound/lame/files/lame-3.98-echo.patch
deleted file mode 100644
index 6d3edbaee31a..000000000000
--- a/media-sound/lame/files/lame-3.98-echo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lame-398/libmp3lame/i386/Makefile.am
-===================================================================
---- lame-398.orig/libmp3lame/i386/Makefile.am
-+++ lame-398/libmp3lame/i386/Makefile.am
-@@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign $(top_srcdir)
- 
- DEFS = @DEFS@ @CONFIG_DEFS@
- 
-+ECHO ?= echo
-+
- nasm_sources = \
- 	choose_table.nas \
- 	cpu_feat.nas \
diff --git a/media-sound/lame/files/lame-3.98-execstacks.patch b/media-sound/lame/files/lame-3.98-execstacks.patch
deleted file mode 100644
index d2c7d4de47fd..000000000000
--- a/media-sound/lame/files/lame-3.98-execstacks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lame-398/libmp3lame/i386/nasm.h
-===================================================================
---- lame-398.orig/libmp3lame/i386/nasm.h
-+++ lame-398/libmp3lame/i386/nasm.h
-@@ -36,7 +36,7 @@ BITS 32
- 	%define segment_data segment .data
- 	%define segment_bss  segment .bss
- %else
--%ifdef LINUX
-+%ifidn __OUTPUT_FORMAT__,elf
- 	section .note.GNU-stack progbits noalloc noexec nowrite align=1
- %endif
- 	%define segment_code segment .text align=16 class=CODE use32
diff --git a/media-sound/lame/files/lame-3.98-pic-fix.patch b/media-sound/lame/files/lame-3.98-pic-fix.patch
deleted file mode 100644
index 8874611cf49f..000000000000
--- a/media-sound/lame/files/lame-3.98-pic-fix.patch
+++ /dev/null
@@ -1,585 +0,0 @@
-diff -urp lame-398-orig/libmp3lame/i386/choose_table.nas lame-398/libmp3lame/i386/choose_table.nas
---- lame-398-orig/libmp3lame/i386/choose_table.nas	2008-07-16 21:47:19.000000000 +0200
-+++ lame-398/libmp3lame/i386/choose_table.nas	2008-07-16 21:47:30.000000000 +0200
-@@ -111,33 +111,42 @@ choose_table_H
- 	dw	0x1d16, 0x1e16, 0x1e17, 0x1f17, 0x1f17
- 
- choose_jump_table_L:
--	dd	table_MMX.L_case_0
--	dd	table_MMX.L_case_1
--	dd	table_MMX.L_case_2
--	dd	table_MMX.L_case_3
--	dd	table_MMX.L_case_45
--	dd	table_MMX.L_case_45
--	dd	table_MMX.L_case_67
--	dd	table_MMX.L_case_67
--	dd	table_MMX.L_case_8_15
--	dd	table_MMX.L_case_8_15
--	dd	table_MMX.L_case_8_15
--	dd	table_MMX.L_case_8_15
--	dd	table_MMX.L_case_8_15
--	dd	table_MMX.L_case_8_15
--	dd	table_MMX.L_case_8_15
--	dd	table_MMX.L_case_8_15
-+	dd	table_MMX.L_case_0    - choose_table_MMX
-+	dd	table_MMX.L_case_1    - choose_table_MMX
-+	dd	table_MMX.L_case_2    - choose_table_MMX
-+	dd	table_MMX.L_case_3    - choose_table_MMX
-+	dd	table_MMX.L_case_45   - choose_table_MMX
-+	dd	table_MMX.L_case_45   - choose_table_MMX
-+	dd	table_MMX.L_case_67   - choose_table_MMX
-+	dd	table_MMX.L_case_67   - choose_table_MMX
-+	dd	table_MMX.L_case_8_15 - choose_table_MMX
-+	dd	table_MMX.L_case_8_15 - choose_table_MMX
-+	dd	table_MMX.L_case_8_15 - choose_table_MMX
-+	dd	table_MMX.L_case_8_15 - choose_table_MMX
-+	dd	table_MMX.L_case_8_15 - choose_table_MMX
-+	dd	table_MMX.L_case_8_15 - choose_table_MMX
-+	dd	table_MMX.L_case_8_15 - choose_table_MMX
-+	dd	table_MMX.L_case_8_15 - choose_table_MMX
- 
- 	segment_code
- ;
- ; use MMX
- ;
- 
-+extern  _GLOBAL_OFFSET_TABLE_
-+get_pc.bp:
-+	mov ebp, [esp]
-+	retn
-+
- 	align	16
- ; int choose_table(int *ix, int *end, int *s)
- choose_table_MMX:
--	mov	ecx,[esp+4]	;ecx = begin
--	mov	edx,[esp+8]	;edx = end
-+	push	ebp
-+	call	get_pc.bp
-+	add	ebp, _GLOBAL_OFFSET_TABLE_ + $$ - $ wrt ..gotpc
-+
-+	mov	ecx,[esp+8]	;ecx = begin
-+	mov	edx,[esp+12]	;edx = end
- 	sub	ecx,edx		;ecx = begin-end(should be minus)
- 	test	ecx,8
-  	pxor	mm0,mm0		;mm0=[0:0]
-@@ -169,13 +178,16 @@ choose_table_MMX:
- 
- 	cmp	eax,15
- 	ja	.with_ESC
--	jmp	[choose_jump_table_L+eax*4]
-+	lea	ecx,[ebp + choose_table_MMX wrt ..gotoff]
-+	add	ecx,[ebp + choose_jump_table_L+eax*4 wrt ..gotoff]
-+	jmp 	ecx
- 
- .with_ESC1:
- 	emms
--	mov	ecx, [esp+12]	; *s
-+	mov	ecx, [esp+16]	; *s
- 	mov	[ecx], eax
- 	or	eax,-1
-+	pop	ebp
- 	ret
- 
- .with_ESC:
-@@ -187,12 +199,12 @@ choose_table_MMX:
- 	push	esi
- 	bsr	eax, eax
- %assign _P 4*2
--	movq    mm5, [D15_15_15_15]
--	movq	mm6, [D14_14_14_14]
--	movq	mm3, [mul_add]
-+	movq    mm5, [ebp + D15_15_15_15 wrt ..gotoff]
-+	movq	mm6, [ebp + D14_14_14_14 wrt ..gotoff]
-+	movq	mm3, [ebp + mul_add wrt ..gotoff]
- 
--	mov	ecx, [esp+_P+4]		; = ix
--;	mov	edx, [esp+_P+8]		; = end
-+	mov	ecx, [esp+_P+8]		; = ix
-+;	mov	edx, [esp+_P+12]	; = end
- 	sub	ecx, edx
- 
- 	xor	esi, esi	; sum = 0
-@@ -209,7 +221,7 @@ choose_table_MMX:
- 	psubw	mm7, mm2	; 14$B$h$jBg$-$$$H$-(B linbits_sum++;
- 	pmaddwd	mm0, mm3	; {0, 0, y, x}*{1, 16, 1, 16}
- 	movd	ebx, mm0
--	mov	esi, [largetbl+ebx*4+(16*16+16)*4]
-+	mov	esi, [ebp + largetbl+ebx*4+(16*16+16)*4 wrt ..gotoff]
- 
- 	jz	.H_dual_exit
- 
-@@ -224,9 +236,9 @@ choose_table_MMX:
- 	pmaddwd	mm0, mm3	; {y, x, y, x}*{1, 16, 1, 16}
- 	movd	ebx, mm0
- 	punpckhdq	mm0,mm0
--	add	esi, [largetbl+ebx*4+(16*16+16)*4]
-+	add	esi, [ebp + largetbl+ebx*4+(16*16+16)*4 wrt ..gotoff]
- 	movd	ebx, mm0
--	add	esi, [largetbl+ebx*4+(16*16+16)*4]
-+	add	esi, [ebp + largetbl+ebx*4+(16*16+16)*4 wrt ..gotoff]
- 	add	ecx, 16
- 	psubw	mm7, mm2	; 14$B$h$jBg$-$$$H$-(B linbits_sum++;
- 	jnz	.H_dual_lp1
-@@ -237,8 +249,8 @@ choose_table_MMX:
- 	paddd	mm7,mm1
- 	punpckldq	mm7,mm7
- 
--	pmaddwd	mm7, [linbits32+eax*8]	; linbits
--	mov	ax, [choose_table_H+eax*2]
-+	pmaddwd	mm7, [ebp + linbits32+eax*8 wrt ..gotoff]	; linbits
-+	mov	ax, [ebp + choose_table_H+eax*2 wrt ..gotoff]
- 
- 	movd	ecx, mm7
- 	punpckhdq	mm7,mm7
-@@ -261,54 +273,57 @@ choose_table_MMX:
- 	mov	edx, ecx
- 	shr	eax, 8
- .chooseE_s1:
--	mov	ecx, [esp+12] ; *s
-+	mov	ecx, [esp+16] ; *s
- 	and	eax, 0xff
- 	add	[ecx], edx
-+	pop	ebp
- 	ret
- 
- table_MMX.L_case_0:
- 	emms
-+	pop	ebp
- 	ret
- 
- table_MMX.L_case_1:
- 	emms
--	mov	eax, [esp+12] ; *s
--	mov	ecx, [esp+4] ; *ix
-+	mov	eax, [esp+16] ; *s
-+	mov	ecx, [esp+8] ; *ix
- 	sub	ecx, edx
- 	push	ebx
- .lp:
- 	mov	ebx, [edx+ecx]
- 	add	ebx, ebx
- 	add	ebx, [edx+ecx+4]
--	movzx	ebx, byte [ebx+t1l]
-+	movzx	ebx, byte [ebp + ebx+t1l wrt ..gotoff]
- 	add	[eax], ebx
- 	add	ecx, 8
- 	jnz	.lp
- 	pop	ebx
- 	mov	eax, 1
-+	pop	ebp
- 	ret
- 
- table_MMX.L_case_45:
- 	push	dword 7
--	mov	ecx, tableABC+9*8
-+	lea	ecx, [ebp + tableABC+9*8 wrt ..gotoff]
- 	jmp	from3
- 
- table_MMX.L_case_67:
- 	push	dword 10
--	mov	ecx, tableABC
-+	lea	ecx, [ebp + tableABC wrt ..gotoff]
- 	jmp	from3
- 
- table_MMX.L_case_8_15:
- 	push	dword 13
--	mov	ecx, tableDEF
-+	lea	ecx, [ebp + tableDEF wrt ..gotoff]
- from3:
--	mov	eax,[esp+8]	;eax = *begin
--;	mov	edx,[esp+12]	;edx = *end
-+	mov	eax,[esp+12]	;eax = *begin
-+;	mov	edx,[esp+16]	;edx = *end
- 
- 	push	ebx
- 	sub	eax, edx
- 
--	movq	mm5,[mul_add]
-+	movq	mm5,[ebp + mul_add wrt ..gotoff]
- 	pxor	mm2,mm2	;mm2 = sum
- 
- 	test	eax, 8
-@@ -361,22 +376,23 @@ from3:
- .choose3_s2:
- 	pop	ecx
- 	add	eax, ecx
--	mov	ecx, [esp+12] ; *s
-+	mov	ecx, [esp+16] ; *s
- 	add	[ecx], edx
-+	pop	ebp
- 	ret
- 
- table_MMX.L_case_2:
- 	push	dword 2
--	mov	ecx,table23
--	pmov	mm5,[mul_add23]
-+	lea	ecx,[ebp + table23 wrt ..gotoff]
-+	pmov	mm5,[ebp + mul_add23 wrt ..gotoff]
- 	jmp	from2
- table_MMX.L_case_3:
- 	push	dword 5
--	mov	ecx,table56
--	pmov	mm5,[mul_add56]
-+	lea	ecx,[ebp + table56 wrt ..gotoff]
-+	pmov	mm5,[ebp + mul_add56 wrt ..gotoff]
- from2:
--	mov	eax,[esp+8]	;eax = *begin
--;	mov	edx,[esp+12]	;edx = *end
-+	mov	eax,[esp+12]	;eax = *begin
-+;	mov	edx,[esp+16]	;edx = *end
- 	push	ebx
- 	push	edi
- 
-@@ -426,8 +442,9 @@ from2:
- 	mov	edx, ecx
- 	inc	eax
- .choose2_s1:
--	mov	ecx, [esp+12] ; *s
-+	mov	ecx, [esp+16] ; *s
- 	add	[ecx], edx
-+	pop	ebp
- 	ret
- 
- 	end
-diff -urp lame-398-orig/libmp3lame/i386/fft3dn.nas lame-398/libmp3lame/i386/fft3dn.nas
---- lame-398-orig/libmp3lame/i386/fft3dn.nas	2008-07-16 21:47:19.000000000 +0200
-+++ lame-398/libmp3lame/i386/fft3dn.nas	2008-07-16 21:47:30.000000000 +0200
-@@ -24,26 +24,35 @@ D_1_0_0_0	dd	0.0		, 1.0
- 
- 	segment_code
- 
-+extern  _GLOBAL_OFFSET_TABLE_
-+get_pc.bp:
-+	mov ebp, [esp]
-+	retn
-+
- ;void fht_3DN(float *fz, int nn);
- 
- proc	fht_3DN
- 
- 	pushd	ebp, ebx, esi, edi
- 
--	mov	r0, [esp+20]		;fi
--	mov	r1, [esp+24]		;r1 = nn
--	sub	esp, 16
-+	sub	esp, 20
-+
-+	call	get_pc.bp
-+	add	ebp, _GLOBAL_OFFSET_TABLE_ + $$ - $ wrt ..gotpc
- 
-+	mov	r0, [esp+40]		;fi
-+	mov	r1, [esp+44]		;r1 = nn
-+	lea	r3, [ebp + costab wrt ..gotoff]		;tri = costab
-+	lea	r4, [r0+r1*8]		;r4 = fn = &fz[n]
-+	mov	[esp+16], r4
- 	mov	r4, 8			;kx = k1/2
--	mov	r3, costab		;tri = costab
--	lea	r6, [r0+r1*8]		;r6 = fn = &fz[n]
- 
- 	pmov	mm7, [r3]
- 
- 	loopalign 16
- .do1
- 	lea	r3, [r3+16]	;tri += 2;
--	pmov	mm6, [costab+8]
-+	pmov	mm6, [ebp + costab+8 wrt ..gotoff]
- 	lea	r2, [r4+r4*2]		;k3*fsize/2
- 	mov	r5, 4		;i = 1*fsize
- 
-@@ -104,7 +113,7 @@ proc	fht_3DN
- 	pmovd	[r1+r4*4], mm4	;gi[k2]
- 	puphdq	mm4, mm4
- 
--	cmp	r0, r6
-+	cmp	r0, [esp + 16]
- 	pmovd	[r1+r4*2], mm0	;gi[k1]
- 	pmovd	[r1+r2*2], mm4	;gi[k3]
- 
-@@ -119,12 +128,12 @@ proc	fht_3DN
- ; mm7 = 0x800000000 | 0
- ;
- 	pmov	mm1, mm6
--	mov	r0, [esp+36]	; fz
-+	mov	r0, [esp+40]	; fz
- 	puphdq	mm1, mm1	; c1 | c1
- 	lea	r1, [r0+r4*2]
- 	pfadd	mm1, mm1	; c1+c1 | c1+c1
- 	pfmul	mm1, mm6	; 2*c1*c1 | 2*c1*s1
--	pfsub	mm1, [D_1_0_0_0] ; 2*c1*c1-1.0 | 2*c1*s1 = -c2 | s2
-+	pfsub	mm1, [ebp + D_1_0_0_0 wrt ..gotoff] ; 2*c1*c1-1.0 | 2*c1*s1 = -c2 | s2
- 
- 	pmov	mm0, mm1
- 	pxor	mm7, mm6	; c1 | -s1
-@@ -134,7 +143,7 @@ proc	fht_3DN
- 	puphdq	mm0, mm2	; s2 | c2
- 	puphdq	mm6, mm3	;-s1 | c1
- 
--	pxor	mm0, [costab]	; c2 | -s2
-+	pxor	mm0, [ebp + costab wrt ..gotoff]	; c2 | -s2
- 
- ; mm0 =  s2| c2
- ; mm1 = -c2| s2
-@@ -233,7 +242,7 @@ proc	fht_3DN
- 
- 	lea	r0, [r0+r4*8]
- 	lea	r1, [r1+r4*8]
--	cmp	r0, r6
-+	cmp	r0, [esp + 16]
- 	pmov	mm0, [esp]
- 	pmov	mm1, [esp+8]
- 
-@@ -249,17 +258,17 @@ proc	fht_3DN
- 	pfsub	mm6, mm7	; c1*a-s1*b | s1*a+c1*b
- 	pupldq	mm7,mm6
- 	puphdq	mm6,mm7
--	pmov	mm7, [costab]
-+	pmov	mm7, [ebp + costab wrt ..gotoff]
- 	jb near	.for
- 
--	mov	r0, [esp+36]	;fi
--	cmp	r4, [esp+36+4]
-+	mov	r0, [esp+40]	;fi
-+	cmp	r4, [esp+40+4]
- 	lea	r4, [r4*4]	;kx *= 4
- 
- 	jb near	.do1
- .exitttt
- 	femms
--	add	esp,16
-+	add	esp,20
- 	popd	ebp, ebx, esi, edi
- endproc
- 
-@@ -270,20 +279,24 @@ proc	fht_E3DN
- 
- 	pushd	ebp, ebx, esi, edi
- 
--	mov	r0, [esp+20]		;fi
--	mov	r1, [esp+24]		;r1 = nn
--	sub	esp, 16
-+	sub	esp, 20
-+
-+	call	get_pc.bp
-+	add	ebp, _GLOBAL_OFFSET_TABLE_ + $$ - $ wrt ..gotpc
- 
-+	mov	r0, [esp+40]		;fi
-+	mov	r1, [esp+44]		;r1 = nn
-+	lea	r3, [ebp + costab wrt ..gotoff]		;tri = costab
-+	lea	r4, [r0+r1*8]		;r4 = fn = &fz[n]
-+	mov	[esp+16], r4
- 	mov	r4, 8			;kx = k1/2
--	mov	r3, costab		;tri = costab
--	lea	r6, [r0+r1*8]		;r6 = fn = &fz[n]
- 
- 	pmov	mm7, [r3]
- 
- 	loopalign 16
- .do1
- 	lea	r3, [r3+16]	;tri += 2;
--	pmov	mm6, [costab+8]
-+	pmov	mm6, [ebp + costab+8 wrt ..gotoff]
- 	lea	r2, [r4+r4*2]		;k3*fsize/2
- 	mov	r5, 4		;i = 1*fsize
- 
-@@ -324,7 +337,7 @@ proc	fht_E3DN
- 	pfadd	mm3, mm4	;f0+f2|f1+f3
- 	pfsub	mm5, mm4	;f0-f2|f1-f3
- 
--	cmp	r0, r6
-+	cmp	r0, [esp + 16]
- 	pmovd	[r1+r4*2], mm3	;gi[k1]
- 	pmovd	[r1+r2*2], mm5	;gi[k3]
- 	puphdq	mm3, mm3
-@@ -343,12 +356,12 @@ proc	fht_E3DN
- ; mm7 = 0x800000000 | 0
- ;
- 	pmov	mm5, mm6
--	mov	r0, [esp+36]	; fz
-+	mov	r0, [esp+40]	; fz
- 	puphdq	mm5, mm5	; c1 | c1
- 	lea	r1, [r0+r4*2]
- 	pfadd	mm5, mm5	; c1+c1 | c1+c1
- 	pfmul	mm5, mm6	; 2*c1*c1 | 2*c1*s1
--	pfsub	mm5, [D_1_0_0_0] ; 2*c1*c1-1.0 | 2*c1*s1 = -c2 | s2
-+	pfsub	mm5, [ebp + D_1_0_0_0 wrt ..gotoff] ; 2*c1*c1-1.0 | 2*c1*s1 = -c2 | s2
- 
- 	pswapd	mm4, mm5	; s2 |-c2
- 	pxor	mm4, mm7	; s2 | c2
-@@ -447,7 +460,7 @@ proc	fht_E3DN
- 
- 	lea	r0, [r0+r4*8]
- 	lea	r1, [r1+r4*8]
--	cmp	r0, r6
-+	cmp	r0, [esp + 16]
- 	pmov	mm4, [esp]
- 	pmov	mm5, [esp+8]
- 
-@@ -462,16 +475,16 @@ proc	fht_E3DN
- 
- 	pfsub	mm6, mm7	; c1*a-s1*b | s1*a+c1*b
- 	pswapd	mm6, mm6 ; ???	; s1*a+c1*b | c1*a-s1*b
--	pmov	mm7, [costab]
-+	pmov	mm7, [ebp + costab wrt ..gotoff]
- 	jb near	.for
- 
--	mov	r0, [esp+36]	;fi
--	cmp	r4, [esp+36+4]
-+	mov	r0, [esp+40]	;fi
-+	cmp	r4, [esp+40+4]
- 	lea	r4, [r4*4]	;kx *= 4
- 
- 	jb near	.do1
- .exitttt
- 	femms
--	add	esp,16
-+	add	esp,20
- 	popd	ebp, ebx, esi, edi
- endproc
-diff -urp lame-398-orig/libmp3lame/i386/fftsse.nas lame-398/libmp3lame/i386/fftsse.nas
---- lame-398-orig/libmp3lame/i386/fftsse.nas	2008-07-16 21:47:19.000000000 +0200
-+++ lame-398/libmp3lame/i386/fftsse.nas	2008-07-16 21:48:10.000000000 +0200
-@@ -25,6 +25,12 @@ costab_fft:

- S_SQRT2	dd	1.414213562

- 

- 	segment_code

-+

-+extern  _GLOBAL_OFFSET_TABLE_

-+get_pc.bp:

-+	mov ebp, [esp]

-+	retn

-+

- ;------------------------------------------------------------------------

- ;	by K. SAKAI

- ;	99/08/18	PIII 23k[clk]

-@@ -40,15 +46,20 @@ fht_SSE:

- 	push	esi

- 	push	edi

- 	push	ebp

--%assign _P 4*4

-+

-+%assign _P 4*5

- 

- 	;2つ目のループ

--	mov	eax,[esp+_P+4]	;eax=fz

--	mov	ebp,[esp+_P+8]	;=n

-+	mov	eax,[esp+_P+0]	;eax=fz

-+	mov	ebp,[esp+_P+4]	;=n

- 	shl	ebp,3

- 	add	ebp,eax		; fn  = fz + n, この関数終了まで不変

-+	push	ebp

-+

-+	call	get_pc.bp

-+	add	ebp, _GLOBAL_OFFSET_TABLE_ + $$ - $ wrt ..gotpc

- 

--	lea	ecx,[costab_fft]

-+	lea	ecx,[ebp + costab_fft wrt ..gotoff]

- 	xor	eax,eax

- 	mov	al,8		; =k1=1*(sizeof float)	// 4, 16, 64, 256,...

- .lp2:				; do{

-@@ -101,12 +112,12 @@ fht_SSE:

- ;                       gi[k3] = g1     - g3;

- 	fld	dword [edi]

- 	fadd	dword [edi+eax*2]

--	fld	dword [S_SQRT2]

-+	fld	dword [ebp + S_SQRT2 wrt ..gotoff]

- 	fmul	dword [edi+eax*4]

- 

- 	fld	dword [edi]

- 	fsub	dword [edi+eax*2]

--	fld	dword [S_SQRT2]

-+	fld	dword [ebp + S_SQRT2 wrt ..gotoff]

- 	fmul	dword [edi+edx*2]

- 

- 	fld	st1

-@@ -121,7 +132,7 @@ fht_SSE:

- 	fsubp	st1,st0

- 	fstp	dword [edi+eax*4]

- 

--	cmp	ebx,ebp

-+	cmp	ebx,[esp]

- 	jl	near .lp20		; while (fi<fn);

- 

- 

-@@ -136,17 +147,17 @@ fht_SSE:

- ;                       s2 = c1*s1 + s1*c1 = 2*s1*c1;

- 	shufps	xmm7,xmm7,R4(1,0,0,1)

- 	movss	xmm5,xmm7		; = { --,  --,  --, s1}

--	xorps	xmm7,[Q_MMPP]	; = {-s1, -c1, +c1, +s1} -> 必要

-+	xorps	xmm7,[ebp + Q_MMPP wrt ..gotoff]	; = {-s1, -c1, +c1, +s1} -> 必要

- 

- 	addss	xmm5,xmm5		; = (--, --,  --, 2*s1)

- 	add	esi,4		; esi = fi = fz + i

- 	shufps	xmm5,xmm5,R4(0,0,0,0)	; = (2*s1, 2*s1, 2*s1, 2*s1)

- 	mulps	xmm5,xmm6		; = (2*s1*c1, 2*s1*s1, 2*s1*s1, 2*s1*c1)

--	subps	xmm5,[D_1100]		; = (--, 2*s1*s1-1, --, 2*s1*c1) = {-- -c2 -- s2}

-+	subps	xmm5,[ebp + D_1100 wrt ..gotoff]		; = (--, 2*s1*s1-1, --, 2*s1*c1) = {-- -c2 -- s2}

- 	movaps	xmm4,xmm5

- 	shufps	xmm5,xmm5,R4(2,0,2,0)	; = {-c2, s2, -c2, s2} -> 必要

- 

--	xorps	xmm4,[Q_MMPP]		; = {--, c2, --, s2}

-+	xorps	xmm4,[ebp + Q_MMPP wrt ..gotoff]		; = {--, c2, --, s2}

- 	shufps	xmm4,xmm4,R4(0,2,0,2)	; = {s2, c2, s2, c2} -> 必要

- 

- 	loopalign	16

-@@ -222,7 +233,7 @@ fht_SSE:

- 	movss	[edi+eax*4],xmm2

- 	movss	[esi+edx*2],xmm0

- 	lea	esi,[esi + eax*8] ; fi += (k1 * 4);

--	cmp	esi,ebp

-+	cmp	esi,[esp]

- 	jl	near .lp21		; while (fi<fn);

- 

- 

-@@ -247,7 +258,7 @@ fht_SSE:

- 	shufps	xmm0,xmm0,R4(1,1,0,0)	; = {t_s, t_s, t_c, t_c}

- 	mulps	xmm6,xmm0	; = {c3*ts, s3*ts, s3*tc, c3*tc}

- 	movhlps	xmm4,xmm6	; = {--,    --,    c3*ts, s3*ts}

--	xorps	xmm4,[Q_MPMP]	; = {--,    --,   -c3*ts, s3*ts}

-+	xorps	xmm4,[ebp + Q_MPMP wrt ..gotoff]	; = {--,    --,   -c3*ts, s3*ts}

- 	subps	xmm6,xmm4	; = {-,-, c3*ts+s3*tc, c3*tc-s3*ts}={-,-,s1,c1}

- 

- ;                       c3 = c1*t_c - s1*t_s;

-@@ -255,7 +266,7 @@ fht_SSE:

- 	shufps	xmm6,xmm6,0x14	; = {c1, s1, s1, c1}

- 	mulps	xmm0,xmm6	; = {ts*c1 ts*s1 tc*s1 tc*c1}

- 	movhlps	xmm3,xmm0

--	xorps	xmm3,[Q_MPMP]

-+	xorps	xmm3,[ebp + Q_MPMP wrt ..gotoff]

- 	subps	xmm0,xmm3	; = {--, --, s3, c3}

- 

- ; {s2 s4 c4 c2} = {2*s1*c1 2*s3*c3 1-2*s3*s3 1-2*s1*s1}

-@@ -268,7 +279,7 @@ fht_SSE:

- 	sub	edi,ebx			; edi = fz - i/2

- 	mulps	xmm7, xmm6		; {s1*s1*2, s3*s3*2, s3*c3*2, s1*c1*2}

- 	lea	esi,[edi + ebx*2]	; esi = fi = fz +i/2

--	subps	xmm7, [D_1100]		; {-c2, -c4, s4, s2}

-+	subps	xmm7, [ebp + D_1100 wrt ..gotoff]		; {-c2, -c4, s4, s2}

- 	lea	edi,[edi + eax*2-4]	; edi = gi = fz +k1-i/2

- 

- ;                       fi = fz +i;

-@@ -286,7 +297,7 @@ fht_SSE:

- ;                               d       = s2*fi[k3  ] - c2*gi[k3  ];

- 

- 	movaps	xmm4,xmm7	; = {-c2 -c4  s4  s2}

--	xorps	xmm4,[Q_MMPP]	; = { c2  c4  s4  s2}

-+	xorps	xmm4,[ebp + Q_MMPP wrt ..gotoff]	; = { c2  c4  s4  s2}

- 	shufps	xmm4,xmm4,0x1B	; = { s2  s4  c4  c2}

- 	movlps	xmm0,[esi+eax*2]

- 	movlps	xmm1,[edi+eax*2]

-@@ -390,7 +401,7 @@ fht_SSE:

- ;                               fi     += k4;

- 	lea	edi,[edi + eax*8] ; gi += (k1 * 4);

- 	lea	esi,[esi + eax*8] ; fi += (k1 * 4);

--	cmp	esi,ebp

-+	cmp	esi,[esp]

- 	jl	near .lp220		; while (fi<fn);

- ;                       } while (fi<fn);

- 

-@@ -405,6 +416,7 @@ fht_SSE:

- 	cmp	eax,[esp+_P+8]	; while ((k1 * 4)<n);

- 	jle	near .lp2

- 	pop	ebp

-+	pop	ebp

- 	pop	edi

- 	pop	esi

- 	pop	ebx

diff --git a/media-sound/lame/files/lame-3.98-stdint.patch b/media-sound/lame/files/lame-3.98-stdint.patch
deleted file mode 100644
index c2561ec91270..000000000000
--- a/media-sound/lame/files/lame-3.98-stdint.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: lame-398/frontend/mp3rtp.c
-===================================================================
---- lame-398.orig/frontend/mp3rtp.c
-+++ lame-398/frontend/mp3rtp.c
-@@ -12,8 +12,6 @@
- 
- #ifdef HAVE_CONFIG_H
- # include <config.h>
--/* std int types already defined in config.h */
--#define _STDINT_H
- #endif
- 
- #ifdef STDC_HEADERS
-Index: lame-398/frontend/rtp.c
-===================================================================
---- lame-398.orig/frontend/rtp.c
-+++ lame-398/frontend/rtp.c
-@@ -2,8 +2,6 @@
- 
- #ifdef HAVE_CONFIG_H
- # include <config.h>
--/* std int types already defined in config.h */
--# define _STDINT_H
- #endif
- 
- #ifndef __GNUC__
diff --git a/media-sound/lame/lame-3.97-r1.ebuild b/media-sound/lame/lame-3.97-r1.ebuild
deleted file mode 100644
index c9befe57cb97..000000000000
--- a/media-sound/lame/lame-3.97-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.97-r1.ebuild,v 1.11 2008/11/09 21:06:42 loki_val Exp $
-
-inherit flag-o-matic toolchain-funcs eutils autotools
-
-DESCRIPTION="LAME Ain't an MP3 Encoder"
-HOMEPAGE="http://lame.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug mp3rtp"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# The frontened tries to link staticly, but we prefer shared libs
-	epatch "${FILESDIR}"/${PN}-3.96.1-shared-frontend.patch
-
-	# If ccc (alpha compiler) is installed on the system, the default
-	# configure is broken, fix it to respect CC.  This is only
-	# directly broken for ARCH=alpha but would affect anybody with a
-	# ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
-	epatch "${FILESDIR}"/${PN}-3.96-ccc.patch
-
-	# Make sure -lm is linked in the library to fix other programs linking to
-	# this while using --as-needed
-	epatch "${FILESDIR}"/${PN}-3.96.1-asneeded.patch
-
-	AT_M4DIR="${S}" eautoreconf || die
-	epunt_cxx # embedded bug #74498
-}
-
-src_compile() {
-	# take out -fomit-frame-pointer from CFLAGS if k6-2
-	is-flag "-march=k6-3" && filter-flags "-fomit-frame-pointer"
-	is-flag "-march=k6-2" && filter-flags "-fomit-frame-pointer"
-	is-flag "-march=k6" && filter-flags "-fomit-frame-pointer"
-
-	# The user sets compiler optimizations... But if you'd like
-	# lame to choose it's own... uncomment one of these (experiMENTAL)
-	# myconf="${myconf} --enable-expopt=full \
-	# myconf="${myconf} --enable-expopt=norm \
-
-	econf \
-		--enable-shared \
-		$(use_enable debug debug norm) \
-		--disable-mp3x \
-		$(use_enable mp3rtp mp3rtp) \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkghtmldir="/usr/share/doc/${PF}/html" install || die
-
-	dodoc API ChangeLog HACKING README* STYLEGUIDE TODO USAGE
-	dohtml misc/lameGUI.html Dll/LameDLLInterface.htm
-
-	dobin "${S}"/misc/mlame || die
-}
-
-pkg_postinst(){
-	if use mp3rtp ; then
-	    ewarn "Warning, support for the encode-to-RTP program, 'mp3rtp'"
-	    ewarn "is broken as of August 2001."
-	    ewarn " "
-	fi
-}
diff --git a/media-sound/lame/lame-3.98.ebuild b/media-sound/lame/lame-3.98.ebuild
deleted file mode 100644
index 1d1f3e33e016..000000000000
--- a/media-sound/lame/lame-3.98.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.ebuild,v 1.7 2009/03/29 17:14:16 beandog Exp $
-
-inherit flag-o-matic toolchain-funcs eutils autotools versionator
-
-DESCRIPTION="LAME Ain't an MP3 Encoder"
-HOMEPAGE="http://lame.sourceforge.net"
-
-MY_PV=$(replace_version_separator 1 '')
-S=${WORKDIR}/${PN}-${MY_PV}
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug mmx mp3rtp sndfile"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	mmx? ( dev-lang/nasm )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# The frontened tries to link staticly, but we prefer shared libs
-	epatch "${FILESDIR}"/${P}-shared-frontend.patch
-
-	# If ccc (alpha compiler) is installed on the system, the default
-	# configure is broken, fix it to respect CC.  This is only
-	# directly broken for ARCH=alpha but would affect anybody with a
-	# ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
-	epatch "${FILESDIR}"/${PN}-3.96-ccc.patch
-
-	# Patch gtk stuff, otherwise eautoreconf dies
-	epatch "${FILESDIR}"/${PN}-3.98-gtk-path.patch
-
-	# Fix build of mp3rtp, bug #231541
-	# Dont prevent stdint.h from being included when it's in fact needed
-	epatch "${FILESDIR}"/${PN}-3.98-stdint.patch
-
-	# PIC Fix by the PaX Team, bug #93279
-	epatch "${FILESDIR}"/${PN}-3.98-pic-fix.patch
-
-	# Let it use proper %if statements for marking stacks as non executable
-	epatch "${FILESDIR}"/${PN}-3.98-execstacks.patch
-
-	# It needs $(ECHO) to be defined but it seems libtool 2.2 doesn't define it
-	# anymore
-	epatch "${FILESDIR}/${P}-echo.patch"
-
-	# It fails parallel make otherwise when enabling nasm...
-	mkdir "${S}/libmp3lame/i386/.libs" || die
-
-	AT_M4DIR="${S}" eautoreconf
-	epunt_cxx # embedded bug #74498
-}
-
-src_compile() {
-	use sndfile && myconf="--with-fileio=sndfile"
-	# The user sets compiler optimizations... But if you'd like
-	# lame to choose it's own... uncomment one of these (experiMENTAL)
-	# myconf="${myconf} --enable-expopt=full \
-	# myconf="${myconf} --enable-expopt=norm \
-
-	econf \
-		--enable-shared \
-		$(use_enable debug debug norm) \
-		--disable-mp3x \
-		$(use_enable mmx nasm) \
-		$(use_enable mp3rtp) \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkghtmldir="/usr/share/doc/${PF}/html" install || die
-
-	dodoc API ChangeLog HACKING README* STYLEGUIDE TODO USAGE || die
-	dohtml misc/lameGUI.html Dll/LameDLLInterface.htm || die
-
-	dobin "${S}"/misc/mlame || die
-}
-
-pkg_postinst(){
-	if use mp3rtp ; then
-	    ewarn "Warning, support for the encode-to-RTP program, 'mp3rtp'"
-	    ewarn "is broken as of August 2001."
-	    ewarn " "
-	fi
-}