Remove unused version.

(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27.7 i686)

4 files changed, 0 insertions, 615 deletions

diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 2f9ae2f0fd09..1e1da45db286 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,15 +1,11 @@
-AUX sox-13.0.0-flac113.patch 19319 RMD160 952b00a3f12c01b9f36f703eeebad3852bc7f34e SHA1 e25b6e87131e21d4e75ac54154ceb7037a320010 SHA256 71898675ddf57d04638cf28336b929636f09eef019d3e57593934efc5a942053
-AUX sox-13.0.0-oggautomagic.patch 820 RMD160 b4cc247ad85c6c46378fdc44dc22de1f18cb8907 SHA1 1edb55e8b8163435bdcec0a699c09c3d608aba56 SHA256 fd65d7d75ec4b0418451486b02bef5fea90da087f4f11285d6f533da1c91951b
 AUX sox-14.0.1-cross.patch 427 RMD160 a4597f73560b4013e7ea26b58d6e79a41d3e5b40 SHA1 85618d48fc98236079939ef930cabc63d8b3a416 SHA256 16c3effde09823c8550594b545e635b3db5d39af6fe8e6841b062ddd5fe2a14b
 AUX sox-14.0.1-ffmpegheaders.patch 1655 RMD160 8ed54b523e16f6a0b1b978f2b584c43ff469b16b SHA1 db09ff70d6503dcc8055ee6cfcf2268347f3ac9a SHA256 3a0286f3c752e1d414517f7f422f187edae9de8ce18564e64021d1670bbec9f8
 AUX sox-14.1.0-lavc.patch 534 RMD160 9088ed507a43c3e0edc97f502a76099e2c425b1f SHA1 d635b8c413c969056c78cf05ba768c8e247bcfe7 SHA256 5713fcbb50c681d7026387d92bfb1a1940e515518b4f57d00b1225addc63ab16
 AUX sox-14.1.0-runsox.patch 517 RMD160 622deff871038c1fa9b9490c322830e38b7367f2 SHA1 1d5b0104d489cdf3fe111b651acbf0e43f66e5e9 SHA256 bc2d682e06f61956995f49e4bdb0bd9cf8581249f4ab568cd20c687611551823
 AUX sox-14.2.0-distro.patch 1245 RMD160 a0ea4f0ab40113d8ffd4f6e5be7b1f2189c6aa76 SHA1 4aba29093e30720e785bac8e51e2a661ad2d9716 SHA256 6bee373206b67fe9040ca34e98d08b32ac45330ec48f68ac665398baab97a9f6
-DIST sox-13.0.0.tar.gz 725259 RMD160 84e7c8dea4f3a9145f9b42f7f03ac2329f3b83f2 SHA1 db0e6a7356b8fcbc72cf0dca1d81782fc3fa48f4 SHA256 c66c52cfa42fe126592563c3d8974007a9858bd35d2c1136389a721eeebb9f8e
 DIST sox-14.0.1.tar.gz 859538 RMD160 b614c3006e9490876c299d768009656704ecfbc8 SHA1 b4b07e9905728209d3c97b9fb0fc65e75b4c45a1 SHA256 52398a49bef64aa6e06b158cb59b3e1790fa1bf94262b896688bcfdcf539ca73
 DIST sox-14.1.0.tar.gz 912057 RMD160 df4067b874b0ff1df594f1986aa350cf40fe5a3f SHA1 897cb68b2b4159f979e6ba33fabaa31b967a1c7e SHA256 319cf07ee06fcbfbcaced7307e23ca567739c278f76bc143a9258a9a23e42101
 DIST sox-14.2.0.tar.gz 964800 RMD160 7c76a2db5c5838fc3d9f8b5402e47d548fd094d5 SHA1 1b60e5af43f44a51247fb978f2423f0de7e27363 SHA256 8d1b8eb33a72a181369475c9da5fdcbe5f6820e6af3d86a0e84f6939e61a9dc1
-EBUILD sox-13.0.0.ebuild 1634 RMD160 557c72a16eadc4b9f14139ccd51821cbce3ed2f8 SHA1 3085199ef73f69e603f9d9802d3561ba530d23b9 SHA256 4e1584cdb9b9051b0424e5708030ad505c323fc6b3edc50396bf75ee408e8c0e
 EBUILD sox-14.0.1.ebuild 1999 RMD160 246a5a7a5c5a958726e3c626a52f6bdd79a5ddea SHA1 36135d2360eac323be162bd33abf988db9e3c091 SHA256 84bd0c2dae1b70c82f1887e5362eaf0aa8b9f566dfc694c30e27629138b51644
 EBUILD sox-14.1.0.ebuild 1986 RMD160 0cc0984883af35dd8d9df625bac177c34ba7b05a SHA1 ca241c9e6b31e69e17133e8b2d66892d383d9181 SHA256 c8c0677a3b71b989f2b01ee68f15b5cf561f9224298205bc651e3f390dcd1b31
 EBUILD sox-14.2.0.ebuild 1995 RMD160 cd719a658fddda75ab99140566adb607022485dd SHA1 0b4d8483158a69b1c68938fa4a104efd9ddeade4 SHA256 b54a83eb39d0996d48a3cdec7db715ceb4412199feb09f140d8cbcb282e72113
diff --git a/media-sound/sox/files/sox-13.0.0-flac113.patch b/media-sound/sox/files/sox-13.0.0-flac113.patch
deleted file mode 100644
index 68705adbc15b..000000000000
--- a/media-sound/sox/files/sox-13.0.0-flac113.patch
+++ /dev/null
@@ -1,527 +0,0 @@
-Index: sox-13.0.0/configure.ac
-===================================================================
---- sox-13.0.0.orig/configure.ac
-+++ sox-13.0.0/configure.ac
-@@ -134,8 +134,8 @@ AC_ARG_WITH(flac,
-         [with_flac=$withval],
-         [with_flac=yes])
- if test "$with_flac" = yes; then
--    AC_CHECK_HEADER(FLAC/file_encoder.h,
--        [AC_CHECK_LIB(FLAC, FLAC__file_encoder_new,,with_flac=no)],
-+    AC_CHECK_HEADER(FLAC/all.h,
-+        [AC_CHECK_LIB(FLAC, FLAC__stream_encoder_new,,with_flac=no)],
-         with_flac=no)
- fi
- 
-Index: sox-13.0.0/src/flac.c
-===================================================================
---- sox-13.0.0.orig/src/flac.c
-+++ sox-13.0.0/src/flac.c
-@@ -1,18 +1,17 @@
- /*
-- * This library is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as
-- * published by the Free Software Foundation; either version 2 of the
-- * License, or (at your option) any later version.
-+ * This library is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU Lesser General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or (at
-+ * your option) any later version.
-  *
-  * This library is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
-+ * General Public License for more details.
-  *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library.  If not, write to the Free Software
-- * Foundation, Fifth Floor, 51 Franklin Street, Boston, MA 02111-1301,
-- * USA.
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this library.  If not, write to the Free Software Foundation,
-+ * Fifth Floor, 51 Franklin Street, Boston, MA 02111-1301, USA.
-  */
- 
- /* File format: FLAC   (c) 2006 robs@users.sourceforge.net */
-@@ -28,14 +27,24 @@
- 
- #include <FLAC/all.h>
- 
--/* Workaround for older flac versions */
-+/* Workaround for flac versions < 1.1.2 */
- #define FLAC__metadata_object_vorbiscomment_append_comment(object, entry, copy)\
-   FLAC__metadata_object_vorbiscomment_insert_comment(object, object->data.vorbis_comment.num_comments, entry, copy)
- 
-+#if !defined(FLAC_API_VERSION_CURRENT)
-+#define FLAC_API_VERSION_CURRENT 7
-+#define FLAC__StreamDecoder FLAC__FileDecoder
-+#define FLAC__stream_decoder_new FLAC__file_decoder_new
-+#define FLAC__stream_decoder_set_metadata_respond_all FLAC__file_decoder_set_metadata_respond_all
-+#define FLAC__stream_decoder_set_md5_checking FLAC__file_decoder_set_md5_checking
-+#define FLAC__stream_decoder_process_until_end_of_metadata FLAC__file_decoder_process_until_end_of_metadata
-+#define FLAC__stream_decoder_process_single FLAC__file_decoder_process_single
-+#define FLAC__stream_decoder_finish FLAC__file_decoder_finish
-+#define FLAC__stream_decoder_delete FLAC__file_decoder_delete
-+#endif
- 
- 
--typedef struct
--{
-+typedef struct {
-   /* Info: */
-   unsigned bits_per_sample;
-   unsigned channels;
-@@ -47,7 +56,7 @@ typedef struct
-   unsigned number_of_wide_samples;
-   unsigned wide_sample_number;
- 
--  FLAC__FileDecoder * flac;
-+  FLAC__StreamDecoder * flac;
-   FLAC__bool eof;
- } Decoder;
- 
-@@ -57,56 +66,46 @@ assert_static(sizeof(Decoder) <= ST_MAX_
- 
- 
- 
--static void FLAC__decoder_metadata_callback(FLAC__FileDecoder const * const flac, FLAC__StreamMetadata const * const metadata, void * const client_data)
-+static void FLAC__decoder_metadata_callback(FLAC__StreamDecoder const * const flac, FLAC__StreamMetadata const * const metadata, void * const client_data)
- {
-   ft_t format = (ft_t) client_data;
-   Decoder * decoder = (Decoder *) format->priv;
- 
-   (void) flac;
- 
--  if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
--  {
-+  if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
-     decoder->bits_per_sample = metadata->data.stream_info.bits_per_sample;
-     decoder->channels = metadata->data.stream_info.channels;
-     decoder->sample_rate = metadata->data.stream_info.sample_rate;
-     decoder->total_samples = metadata->data.stream_info.total_samples;
-   }
--  else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT)
--  {
-+  else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
-     size_t i, comment_size = 0;
- 
-     if (metadata->data.vorbis_comment.num_comments == 0)
--    {
-       return;
--    }
- 
--    if (format->comment != NULL)
--    {
-+    if (format->comment != NULL) {
-       st_warn("FLAC: multiple Vorbis comment block ignored");
-       return;
-     }
- 
-     for (i = 0; i < metadata->data.vorbis_comment.num_comments; ++i)
--    {
-       comment_size += metadata->data.vorbis_comment.comments[i].length + 1;
--    }
- 
-     format->comment = (char *) xcalloc(comment_size, sizeof(char));
- 
--    for (i = 0; i < metadata->data.vorbis_comment.num_comments; ++i)
--    {
-+    for (i = 0; i < metadata->data.vorbis_comment.num_comments; ++i) {
-       strcat(format->comment, (char const *) metadata->data.vorbis_comment.comments[i].entry);
-       if (i != metadata->data.vorbis_comment.num_comments - 1)
--      {
-         strcat(format->comment, "\n");
--      }
-     }
-   }
- }
- 
- 
- 
--static void FLAC__decoder_error_callback(FLAC__FileDecoder const * const flac, FLAC__StreamDecoderErrorStatus const status, void * const client_data)
-+static void FLAC__decoder_error_callback(FLAC__StreamDecoder const * const flac, FLAC__StreamDecoderErrorStatus const status, void * const client_data)
- {
-   ft_t format = (ft_t) client_data;
- 
-@@ -117,15 +116,14 @@ static void FLAC__decoder_error_callback
- 
- 
- 
--static FLAC__StreamDecoderWriteStatus FLAC__frame_decode_callback(FLAC__FileDecoder const * const flac, FLAC__Frame const * const frame, FLAC__int32 const * const buffer[], void * const client_data)
-+static FLAC__StreamDecoderWriteStatus FLAC__frame_decode_callback(FLAC__StreamDecoder const * const flac, FLAC__Frame const * const frame, FLAC__int32 const * const buffer[], void * const client_data)
- {
-   ft_t format = (ft_t) client_data;
-   Decoder * decoder = (Decoder *) format->priv;
- 
-   (void) flac;
- 
--  if (frame->header.bits_per_sample != decoder->bits_per_sample || frame->header.channels != decoder->channels || frame->header.sample_rate != decoder->sample_rate)
--  {
-+  if (frame->header.bits_per_sample != decoder->bits_per_sample || frame->header.channels != decoder->channels || frame->header.sample_rate != decoder->sample_rate) {
-     st_fail_errno(format, ST_EINVAL, "FLAC ERROR: parameters differ between frame and header");
-     return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
-   }
-@@ -138,40 +136,50 @@ static FLAC__StreamDecoderWriteStatus FL
- 
- 
- 
--static int st_format_start_read(ft_t const format)
-+static int start_read(ft_t const format)
- {
-   Decoder * decoder = (Decoder *) format->priv;
- 
-   memset(decoder, 0, sizeof(*decoder));
--  decoder->flac = FLAC__file_decoder_new();
--  if (decoder->flac == NULL)
--  {
-+  decoder->flac = FLAC__stream_decoder_new();
-+  if (decoder->flac == NULL) {
-     st_fail_errno(format, ST_ENOMEM, "FLAC ERROR creating the decoder instance");
-     return ST_EOF;
-   }
- 
--  FLAC__file_decoder_set_md5_checking(decoder->flac, st_true);
-+  FLAC__stream_decoder_set_md5_checking(decoder->flac, st_true);
-+  FLAC__stream_decoder_set_metadata_respond_all(decoder->flac);
-+#if FLAC_API_VERSION_CURRENT <= 7
-   FLAC__file_decoder_set_filename(decoder->flac, format->filename);
-   FLAC__file_decoder_set_write_callback(decoder->flac, FLAC__frame_decode_callback);
-   FLAC__file_decoder_set_metadata_callback(decoder->flac, FLAC__decoder_metadata_callback);
-   FLAC__file_decoder_set_error_callback(decoder->flac, FLAC__decoder_error_callback);
--  FLAC__file_decoder_set_metadata_respond_all(decoder->flac);
-   FLAC__file_decoder_set_client_data(decoder->flac, format);
--
--  if (FLAC__file_decoder_init(decoder->flac) != FLAC__FILE_DECODER_OK)
--  {
-+  if (FLAC__file_decoder_init(decoder->flac) != FLAC__FILE_DECODER_OK) {
-+#else
-+  if (FLAC__stream_decoder_init_file(
-+    decoder->flac,
-+    format->filename,
-+    FLAC__frame_decode_callback,
-+    FLAC__decoder_metadata_callback,
-+    FLAC__decoder_error_callback,
-+    format) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+#endif
-     st_fail_errno(format, ST_EHDR, "FLAC ERROR initialising decoder");
-     return ST_EOF;
-   }
- 
--  if (!FLAC__file_decoder_process_until_end_of_metadata(decoder->flac))
--  {
-+
-+  if (!FLAC__stream_decoder_process_until_end_of_metadata(decoder->flac)) {
-     st_fail_errno(format, ST_EHDR, "FLAC ERROR whilst decoding metadata");
-     return ST_EOF;
-   }
- 
--  if (FLAC__file_decoder_get_state(decoder->flac) != FLAC__FILE_DECODER_OK && FLAC__file_decoder_get_state(decoder->flac) != FLAC__FILE_DECODER_END_OF_FILE)
--  {
-+#if FLAC_API_VERSION_CURRENT <= 7
-+  if (FLAC__file_decoder_get_state(decoder->flac) != FLAC__FILE_DECODER_OK && FLAC__file_decoder_get_state(decoder->flac) != FLAC__FILE_DECODER_END_OF_FILE) {
-+#else
-+  if (FLAC__stream_decoder_get_state(decoder->flac) > FLAC__STREAM_DECODER_END_OF_STREAM) {
-+#endif
-     st_fail_errno(format, ST_EHDR, "FLAC ERROR during metadata decoding");
-     return ST_EOF;
-   }
-@@ -185,15 +193,14 @@ static int st_format_start_read(ft_t con
- }
- 
- 
--static st_size_t st_format_read(ft_t const format, st_sample_t * sampleBuffer, st_size_t const requested)
-+static st_size_t read(ft_t const format, st_sample_t * sampleBuffer, st_size_t const requested)
- {
-   Decoder * decoder = (Decoder *) format->priv;
-   size_t actual = 0;
- 
--  while (!decoder->eof && actual < requested)
--  {
-+  while (!decoder->eof && actual < requested) {
-     if (decoder->wide_sample_number >= decoder->number_of_wide_samples)
--      FLAC__file_decoder_process_single(decoder->flac);
-+      FLAC__stream_decoder_process_single(decoder->flac);
-     if (decoder->wide_sample_number >= decoder->number_of_wide_samples)
-       decoder->eof = st_true;
-     else {
-@@ -216,22 +223,19 @@ static st_size_t st_format_read(ft_t con
- 
- 
- 
--static int st_format_stop_read(ft_t const format)
-+static int stop_read(ft_t const format)
- {
-   Decoder * decoder = (Decoder *) format->priv;
- 
--  if (!FLAC__file_decoder_finish(decoder->flac) && decoder->eof)
--  {
-+  if (!FLAC__stream_decoder_finish(decoder->flac) && decoder->eof)
-     st_warn("FLAC decoder MD5 checksum mismatch.");
--  }
--  FLAC__file_decoder_delete(decoder->flac);
-+  FLAC__stream_decoder_delete(decoder->flac);
-   return ST_SUCCESS;
- }
- 
- 
- 
--typedef struct
--{
-+typedef struct {
-   /* Info: */
-   unsigned bits_per_sample;
- 
-@@ -266,30 +270,61 @@ static void flac_stream_encoder_metadata
- 
- 
- 
--static int st_format_start_write(ft_t const format)
-+#if FLAC_API_VERSION_CURRENT >= 8
-+static FLAC__StreamEncoderSeekStatus flac_stream_encoder_seek_callback(FLAC__StreamEncoder const * encoder, FLAC__uint64 absolute_byte_offset, void * client_data)
-+{
-+  ft_t const format = (ft_t) client_data;
-+  (void) encoder;
-+  if (!format->seekable)
-+    return FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
-+  else if (st_seeki(format, (st_size_t)absolute_byte_offset, SEEK_SET) != ST_SUCCESS)
-+    return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR;
-+  else
-+    return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
-+}
-+
-+
-+
-+static FLAC__StreamEncoderTellStatus flac_stream_encoder_tell_callback(FLAC__StreamEncoder const * encoder, FLAC__uint64 * absolute_byte_offset, void * client_data)
-+{
-+  ft_t const format = (ft_t) client_data;
-+  off_t pos;
-+  (void) encoder;
-+  if (!format->seekable)
-+    return FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED;
-+  else if ((pos = ftello(format->fp)) < 0)
-+    return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR;
-+  else {
-+    *absolute_byte_offset = (FLAC__uint64)pos;
-+    return FLAC__STREAM_ENCODER_TELL_STATUS_OK;
-+  }
-+}
-+#endif
-+
-+
-+
-+static int start_write(ft_t const format)
- {
-   Encoder * encoder = (Encoder *) format->priv;
-   FLAC__StreamEncoderState status;
- 
-   memset(encoder, 0, sizeof(*encoder));
-   encoder->flac = FLAC__stream_encoder_new();
--  if (encoder->flac == NULL)
--  {
-+  if (encoder->flac == NULL) {
-     st_fail_errno(format, ST_ENOMEM, "FLAC ERROR creating the encoder instance");
-     return ST_EOF;
-   }
-   encoder->decoded_samples = xmalloc(ST_BUFSIZ * sizeof(FLAC__int32));
- 
-   {     /* Select and set FLAC encoder options: */
--    static struct
--    {
--      int blocksize;
-+    static struct {
-+      unsigned blocksize;
-       FLAC__bool do_exhaustive_model_search;
-       FLAC__bool do_mid_side_stereo;
-       FLAC__bool loose_mid_side_stereo;
-       unsigned max_lpc_order;
--      int max_residual_partition_order;
--      int min_residual_partition_order;
-+      unsigned max_residual_partition_order;
-+      unsigned min_residual_partition_order;
-     } const options[] = {
-       {1152, st_false, st_false, st_false, 0, 2, 2},
-       {1152, st_false, st_true, st_true, 0, 2, 2},
-@@ -303,12 +338,10 @@ static int st_format_start_write(ft_t co
-     };
-     unsigned compression_level = array_length(options) - 1; /* Default to "best" */
- 
--    if (format->signal.compression != HUGE_VAL)
--    {
-+    if (format->signal.compression != HUGE_VAL) {
-       compression_level = format->signal.compression;
-       if (compression_level != format->signal.compression || 
--          compression_level >= array_length(options))
--      {
-+          compression_level >= array_length(options)) {
-         st_fail_errno(format, ST_EINVAL,
-                       "FLAC compression level must be a whole number from 0 to %i",
-                       array_length(options) - 1);
-@@ -325,8 +358,7 @@ static int st_format_start_write(ft_t co
-     SET_OPTION(max_lpc_order);
-     SET_OPTION(max_residual_partition_order);
-     SET_OPTION(min_residual_partition_order);
--    if (format->signal.channels == 2)
--    {
-+    if (format->signal.channels == 2) {
-       SET_OPTION(do_mid_side_stereo);
-       SET_OPTION(loose_mid_side_stereo);
-     }
-@@ -351,23 +383,17 @@ static int st_format_start_write(ft_t co
-     size_t i;
-     st_bool streamable = st_false;
-     for (i = 0; !streamable && i < array_length(streamable_rates); ++i)
--    {
-        streamable = (streamable_rates[i] == format->signal.rate);
--    }
--    if (!streamable)
--    {
-+    if (!streamable) {
-       st_report("FLAC: non-standard rate; output may not be streamable");
-       FLAC__stream_encoder_set_streamable_subset(encoder->flac, st_false);
-     }
-   }
- 
-   if (format->length != 0)
--  {
-     FLAC__stream_encoder_set_total_samples_estimate(encoder->flac, (FLAC__uint64)format->length);
--  }
- 
--  if (format->comment != NULL && * format->comment != '\0')
--  {
-+  if (format->comment != NULL && * format->comment != '\0') {
-     FLAC__StreamMetadata * metadata[1];
-     FLAC__StreamMetadata_VorbisComment_Entry entry;
-     char * comments, * comment, * end_of_comment;
-@@ -375,8 +401,7 @@ static int st_format_start_write(ft_t co
-     encoder->metadata = metadata[0] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
- 
-     /* Check if there is a FIELD=value pair already in the comment; if not, add one */
--    if (strchr(format->comment, '=') == NULL) 
--    {
-+    if (strchr(format->comment, '=') == NULL) {
-       static const char prepend[] = "COMMENT=";
-       comments = xmalloc(strlen(format->comment) + sizeof(prepend));
-       strcpy(comments, prepend);
-@@ -387,12 +412,10 @@ static int st_format_start_write(ft_t co
- 
-     comment = comments;
- 
--    do
--    {
-+    do {
-       entry.entry = (FLAC__byte *) comment;
-       end_of_comment = strchr(comment, '\n');
--      if (end_of_comment != NULL)
--      {
-+      if (end_of_comment != NULL) {
-         *end_of_comment = '\0';
-         comment = end_of_comment + 1;
-       }
-@@ -405,13 +428,17 @@ static int st_format_start_write(ft_t co
-     free(comments);
-   }
- 
-+#if FLAC_API_VERSION_CURRENT <= 7
-   FLAC__stream_encoder_set_write_callback(encoder->flac, flac_stream_encoder_write_callback);
-   FLAC__stream_encoder_set_metadata_callback(encoder->flac, flac_stream_encoder_metadata_callback);
-   FLAC__stream_encoder_set_client_data(encoder->flac, format);
--
-   status = FLAC__stream_encoder_init(encoder->flac);
--  if (status != FLAC__STREAM_ENCODER_OK)
--  {
-+#else
-+  status = FLAC__stream_encoder_init_stream(encoder->flac, flac_stream_encoder_write_callback,
-+      flac_stream_encoder_seek_callback, flac_stream_encoder_tell_callback, flac_stream_encoder_metadata_callback, format);
-+#endif
-+
-+  if (status != FLAC__STREAM_ENCODER_OK) {
-     st_fail_errno(format, ST_EINVAL, "%s", FLAC__StreamEncoderStateString[status]);
-     return ST_EOF;
-   }
-@@ -420,19 +447,17 @@ static int st_format_start_write(ft_t co
- 
- 
- 
--static st_size_t st_format_write(ft_t const format, st_sample_t const * const sampleBuffer, st_size_t const len)
-+static st_size_t write(ft_t const format, st_sample_t const * const sampleBuffer, st_size_t const len)
- {
-   Encoder * encoder = (Encoder *) format->priv;
-   unsigned i;
- 
--  for (i = 0; i < len; ++i)
--  {
--    switch (encoder->bits_per_sample)
--    {
-+  for (i = 0; i < len; ++i) {
-+    switch (encoder->bits_per_sample) {
-       case  8: encoder->decoded_samples[i] = ST_SAMPLE_TO_SIGNED_BYTE(sampleBuffer[i], format->clips); break;
-       case 16: encoder->decoded_samples[i] = ST_SAMPLE_TO_SIGNED_WORD(sampleBuffer[i], format->clips); break;
-       case 24: encoder->decoded_samples[i] = ST_SAMPLE_TO_SIGNED_24BIT(sampleBuffer[i],format->clips); break;
--      case 32: encoder->decoded_samples[i] = ST_SAMPLE_TO_SIGNED_DWORD(sampleBuffer[i],); break;
-+      case 32: encoder->decoded_samples[i] = ST_SAMPLE_TO_SIGNED_DWORD(sampleBuffer[i],format->clips); break;
-     }
-   }
-   FLAC__stream_encoder_process_interleaved(encoder->flac, encoder->decoded_samples, len / format->signal.channels);
-@@ -441,7 +466,7 @@ static st_size_t st_format_write(ft_t co
- 
- 
- 
--static int st_format_stop_write(ft_t const format)
-+static int stop_write(ft_t const format)
- {
-   Encoder * encoder = (Encoder *) format->priv;
-   FLAC__StreamEncoderState state = FLAC__stream_encoder_get_state(encoder->flac);
-@@ -450,8 +475,7 @@ static int st_format_stop_write(ft_t con
-   FLAC__stream_encoder_finish(encoder->flac);
-   FLAC__stream_encoder_delete(encoder->flac);
-   free(encoder->decoded_samples);
--  if (state != FLAC__STREAM_ENCODER_OK)
--  {
-+  if (state != FLAC__STREAM_ENCODER_OK) {
-     st_fail_errno(format, ST_EINVAL, "FLAC ERROR: failed to encode to end of stream");
-     return ST_EOF;
-   }
-@@ -460,33 +484,16 @@ static int st_format_stop_write(ft_t con
- 
- 
- 
--static char const * const st_format_names[] =
--{
--  "flac",
--  NULL
--};
--
--
--
--static st_format_t const st_format =
--{
--  st_format_names,
--  NULL,
--  0,
--  st_format_start_read,
--  st_format_read,
--  st_format_stop_read,
--  st_format_start_write,
--  st_format_write,
--  st_format_stop_write,
--  st_format_nothing_seek
--};
--
--
--
- st_format_t const * st_flac_format_fn(void)
- {
--  return &st_format;
-+  static char const * const names[] = {"flac", NULL};
-+  static st_format_t const driver = {
-+    names, NULL, 0,
-+    start_read, read, stop_read,
-+    start_write, write, stop_write,
-+    0
-+  };
-+  return &driver;
- }
- 
- 
diff --git a/media-sound/sox/files/sox-13.0.0-oggautomagic.patch b/media-sound/sox/files/sox-13.0.0-oggautomagic.patch
deleted file mode 100644
index 2288538849b9..000000000000
--- a/media-sound/sox/files/sox-13.0.0-oggautomagic.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: sox-13.0.0/configure.ac
-===================================================================
---- sox-13.0.0.orig/configure.ac
-+++ sox-13.0.0/configure.ac
-@@ -120,12 +120,19 @@ AC_SUBST(SNDFILE_CFLAGS)
- AC_SUBST(SNDFILE_LIBS)
-         
- dnl Check for Ogg Vorbis libraries
-+AC_ARG_WITH(oggvorbis, AC_HELP_STRING([--with-oggvorbis], 
-+	[Use oggvorbis if present (default is yes)]),
-+	[with_ogg_vorbis=$withval],
-+	[with_ogg_vorbis=yes])
-+
-+if test "$with_ogg_vorbis" = yes; then
- AC_CHECK_HEADER(vorbis/codec.h,
-     [with_ogg_vorbis=yes
-     AC_CHECK_LIB(ogg, ogg_packet_clear,, with_ogg_vorbis=no)
-     AC_CHECK_LIB(vorbisfile, ov_clear,, with_ogg_vorbis=no)
-     AC_CHECK_LIB(vorbisenc, vorbis_encode_init_vbr,, with_ogg_vorbis=no)],
-     with_ogg_vorbis=no)
-+fi
- 
- dnl Check for FLAC libraries
- AC_ARG_WITH(flac,
diff --git a/media-sound/sox/sox-13.0.0.ebuild b/media-sound/sox/sox-13.0.0.ebuild
deleted file mode 100644
index 4aebb285988f..000000000000
--- a/media-sound/sox/sox-13.0.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-13.0.0.ebuild,v 1.2 2007/03/15 23:26:33 aballier Exp $
-
-inherit flag-o-matic eutils autotools
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa debug flac encode mad ogg libsamplerate ogg sndfile"
-
-DEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )
-	encode? ( media-sound/lame )
-	flac? ( media-libs/flac )
-	mad? ( media-libs/libmad )
-	sndfile? ( media-libs/libsndfile )
-	libsamplerate? ( media-libs/libsamplerate )
-	ogg? ( media-libs/libvorbis	media-libs/libogg )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-flac113.patch"
-	epatch "${FILESDIR}/${P}-oggautomagic.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile () {
-	# Fixes wav segfaults. See Bug #35745.
-	append-flags -fsigned-char
-
-	econf $(use_enable alsa alsa-dsp) \
-		$(use_with encode lame) \
-		$(use_with mad) \
-		$(use_enable debug) \
-		$(use_with sndfile) \
-		$(use_with flac) \
-		$(use_with ogg oggvorbis) \
-		$(use_with libsamplerate samplerate) \
-		--enable-oss-dsp \
-		--enable-fast-ulaw \
-		--enable-fast-alaw \
-		|| die "configure failed"
-
-	#workaround for flac, it wants to include a damn config.h file
-	touch src/config.h
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc NEWS ChangeLog README AUTHORS
-}