Remove old.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

15 files changed, 19 insertions, 701 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index e32932173787..138942411b1c 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/flac
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.193 2014/12/24 14:45:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.194 2014/12/24 17:08:42 radhermit Exp $
+
+  24 Dec 2014; Tim Harder <radhermit@gentoo.org> -flac-1.2.1-r3.ebuild,
+  -flac-1.2.1-r4.ebuild, -flac-1.2.1-r5.ebuild, -flac-1.3.0.ebuild,
+  -flac-1.3.0-r1.ebuild, -files/flac-1.2.1-asm.patch,
+  -files/flac-1.2.1-asneeded.patch, -files/flac-1.2.1-cflags.patch,
+  -files/flac-1.2.1-dontbuild-examples.patch,
+  -files/flac-1.2.1-dontbuild-tests.patch,
+  -files/flac-1.2.1-gcc-4.3-includes.patch, -files/flac-1.2.1-ogg-m4.patch,
+  -files/flac-1.3.0-metaflac_strcat.patch:
+  Remove old.
 
   24 Dec 2014; Agostino Sarubbo <ago@gentoo.org> flac-1.3.1-r1.ebuild:
   Stable for ppc64, wrt bug #530288
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index ac9073c6c9b6..18d4dfc80c78 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,44 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX flac-1.2.1-asm.patch 2844 SHA256 b9a6d2011b9902924372316f3544e94cb066fe202e256b9696bf6cd6ee8a490b SHA512 0719b23921ec3617abd1baefda6d0806c21e0f31dda713cace9f2a5b9d208d692f8d82e5aea0a7b488f4283c0b7c49e7b1a087f0f04f1a0d67553655336f3f75 WHIRLPOOL 4c0150e0e75e7008da79cd41322e7f35a6c78690ec935ffd24399c0f1410667a29a6be267aaef10e2cf2a6fbcce77d40c61e3aac3e44b291b8219547fdf463a7
-AUX flac-1.2.1-asneeded.patch 840 SHA256 cb112fcc85fa57fb68e9fb0d1f735225132fb25b3cd41bb08febfc2d2154bb63 SHA512 586182aafc011e6d8af885491e3d9be7c70bf6b4c5a68dcbf87a7d23c8d142da6103b2a001810dac551c008edcacdfbb7d9be4e7bc95874d26156a7c980c4148 WHIRLPOOL 42b93fbe0c64381c1b2be811bd3d653fe1e1e0278590e5cf5958e0e432b02c08b2f94e04af4dc5ade8b851394b41a5f38add2c4978fecf0ca60206c64a7fd5e6
-AUX flac-1.2.1-cflags.patch 435 SHA256 cc9397825c966839edcd4a30406ff3590a21c825d4e1cb043bd35145a608bc21 SHA512 8f3ae0534e50f94b97d0ae800a845be0e091e38f19b68aa3907143ea1a47a2223bb2462b167485e993e849fb4c0f491b688c4135c98702e543a15a926e541aad WHIRLPOOL caac12c516412c8d8633758231c68f7d21887e4ee4f5521621e4c783af9c49daa193675b00ecb47a03363562ac5a8988d3f9e062e0563db9065f13638d04eb5d
-AUX flac-1.2.1-dontbuild-examples.patch 1014 SHA256 73e3ac8aa17bbe6d22f6c1b28993de35061e967a3a6c27d8e68261ba740d5e85 SHA512 65f53d4bf40f7e6ee0b08be6c54f1696c5ac301a2d83e8c3680ef93307376a1714dbb585d92b2139f8848951ef666d89527a266efa2cc8fb4a25bee54a4e7a6f WHIRLPOOL 3b5a7ec4a0ca803507724f70eb6e39f607b512b3d69cc06918bde0e6b09a6bba6adb0e048d2e28b712e3fd1a548c5751175abf1e0396518607f4415ab4a32ebf
-AUX flac-1.2.1-dontbuild-tests.patch 2721 SHA256 1fa075309ed3e42391d767a6401511b76baf0782702ff39eef06e38ea3bc3ed7 SHA512 5b131f011ea9e679ca4eda707dc0c652b9e3ff36a9825b5cf1b2edd70dfe8fe76329fd9dc732e220fdbad117fbfae4ba840bb464fb33b8645a3c813a4aa9e509 WHIRLPOOL f0cda1053794c8fd3d92783c4f89a3a4339f80d4bb0820c837e64dab214e6a752cd6cdc3d747695ddda6e814bad80b49a5071f359d73d43b860fff5b66b45a5d
-AUX flac-1.2.1-gcc-4.3-includes.patch 423 SHA256 b9826946fb8372cf7da1b68538bce9a6069c1be0e6e288cba5522ce977a1d8d4 SHA512 7e5fa05ab5284898352a9cbd7786a6e76e8ab6e02133657d5700710503cba69ac980153b507abf7b6dde7b0a3ee6f3b3b282825b3aca5c9c207794d31577aa74 WHIRLPOOL 0636c4ae2956ebdf34c84499f656591ce53a56802551c13e1fcba49fa992b61208068da5a105dbdb60df91ac9c47f6048eefbb9aff98d44366f761ddfd09e6f4
-AUX flac-1.2.1-ogg-m4.patch 2852 SHA256 7c8c2c4685894d429472cff0630a3873b7654fa0fcfe5f1048b23a71298fcd47 SHA512 4649ab95e9cef77e1fc5ecdcc1a3c3770d1a4617e602ff4a288c354e02b94ae04a4bcbc11f56323406f00c9b854dd57ab0041b9d381d7b24a657c4e0400f3754 WHIRLPOOL eeeea99e44b395a14b00f5758345469af4572aa7ae1318b097072e4b6023e5dae738f97696251402a07ae61a250f3d141c769f5d0b16ff6ef02254f5e16ffe85
 AUX flac-1.3.0-asneeded.patch 644 SHA256 cc00133b8916f29e750b7eb80b9b3180a8f7c4b6cba9cf59540edbac3d1e21d5 SHA512 0fcf92e98b7ac03d5e4ecddfb0827591837bae4f8b3cb03027d1220f06d6422fec3636317c5229e6e0c086bc924e4d0780050abb2de65697b883e6cbf4bec85f WHIRLPOOL 6652f0ec8bf19dd854eb1992fa108dc3c243938574a75f8a12d6b16809759902177be28556d9c9e2117421ead90cf13383a9f05285859be890e113e96ec74bf5
 AUX flac-1.3.0-dontbuild-examples.patch 723 SHA256 8330ab837796cf94eb5c62c8ef787018b10c6a0e27cdb51a34953faffc653b7a SHA512 f5e8414956a3aab75f512c4dd5c28fa173198d28fec93ffd289f55d5ba5f604fed116854a1347f8bbfb6c0cfc59912707869177465cde346add97e485993e5a7 WHIRLPOOL 830f991657e9c816a2a19e70a674f11e57da03cbd985729e0e7b47e57da05f008f2f90f01208b4715ced2a69024677dc18a45fc96bf730973edc439076484b61
 AUX flac-1.3.0-dontbuild-tests.patch 2111 SHA256 31d1a8bb80d623db4cbac8182e3b2027b8498f9bf77d5baf38acea9558dea970 SHA512 50329cdb766111dbda41856363cbba74dc92e7348605e086697778e7004cce514ff9452c1d5bd72e327c9d7182af218e74d82625f6cdcb977a7dad1cf3d07995 WHIRLPOOL 4ab0ea936c6d4f9e28684f806c86dbe94bd082892ecdf4c5b4917cf3a738ad544e9f2336b678f904c2614b8e8c33aadf1326583605e5a6917e7fd87f1f5f4b00
-AUX flac-1.3.0-metaflac_strcat.patch 503 SHA256 0a2efaa33e933d2fb3b8aca8cba7704e222edf68552ec283bf2c4f40e513a5a9 SHA512 461e0f11dd5e04e4ba05e535ff38fc8ae7a085686945b809715de232a1c14ff5721d6e7fb70f40025c2740789d90cda464ff008dda7880e1f147c936d0e41903 WHIRLPOOL 906503c9a8702c6e5d08efd6a0389648e4845b498e6db8fb4f7b959a53370777a2816ec85a91e008128f7bd9baafb80f9dd62b4470356fa518fc31abca3c4762
 AUX flac-1.3.1-cflags.patch 786 SHA256 077cbb1c3254218e257bcee5ae1b22b5cadd02eba085163c8bc51da2041e1862 SHA512 4c639023861b8508d7a1be2bdafd4ff33d398b2399ce97350890b25394c4ebd9745d622053305723cc85acb2391b46364caba1cdbf3b3723a9cf05971306b7b0 WHIRLPOOL 54a918b35e656568663f0abb134191d5520866811a9c37631e5d48602987e2db2f842884c4c7eb1f764da82eb6bdbb27ec1a25e7e0cffbea60b159e347796985
-DIST flac-1.2.1-embedded-m4.tar.bz2 8545 SHA256 a32bd229ba454be595e66fa257805951c4484aff9f8ec2116727ca2b8a48fea9 SHA512 e0aee18748ad5d47dd637597a30824fab81b70def18184471a61c5a6315df0b3dfdaa0e12f22b69ac88d0c52ec848e15b488e345a5e2920369b85c0666051c0f WHIRLPOOL c72b485a023c45643e13e2c640157a62140cb25dd09e7f646050073ec90e6ec74dc1ba93031dcce9552b55f5bdf6faab88bffb326babec2f2867317194b86030
-DIST flac-1.2.1.tar.gz 2009217 SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf SHA512 39b216239341fbfe210c3a2fc0d0531ecae26c425365c4b6d4fc1081e44e6dc7a9aba8d4c79cc8025386d0a7bb0d25c413c9b64cf7da9ab04ca34a56d2699787 WHIRLPOOL e38815e1c365f26a990752779bc1fb84a76d9d422cac9d66f1e55b5fcacad675006939a1d4ab72f20c36d8a80be4218a109317cc6e90f12abc9e1570dbe27319
-DIST flac-1.3.0.tar.xz 1084256 SHA256 fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc SHA512 9f62a83c2041ec6f02c0df65b796a920a0cd6ba6c2c034bb69535bca5df57ed69f96fe4bb41c0d5ccc229241d90efd2c7ec3785662b5a582a8e20e2e991e6477 WHIRLPOOL e328f41db3aa7f6404a1596ac2fddd437fefc031fc9f1ea91420104054d338029120d526ac58b2a6994811a8f2f7cc107e120789113340e48dec842ea9013196
 DIST flac-1.3.1.tar.xz 941848 SHA256 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c SHA512 923cd0ffe2155636febf2b4633791bc83370d57080461b97ebb69ea21a4b1be7c0ff376c7fc8ca3979af4714e761112114a24b49ff6c80228b58b929db6e96d5 WHIRLPOOL abda096c0c1392499a613cc99c917cd519a20936bb98390a466c971ee981385a0e249e80f0bdac27b1eb6566a3392c1a4cb6ff9a6695952f16127a0b290fa5d4
-EBUILD flac-1.2.1-r3.ebuild 1727 SHA256 4dcca775581535ad7083186296931e090bccd4971978d977fb89c3f2695eac47 SHA512 7081ff361cd75c2d470ee693175539272871e437d890f2a6a5aa8abbf2d175fdfa600f119b771ae47c8dbd27f3449771ce47d21f75f78ec58be61b4db089a5c5 WHIRLPOOL 46f7a003161241836b91cf8e3829cf9f8cba6844d4ee64e42f305a4059e624043730ea121c17b61b63d8ba8e6ed43780951d2ff5e1f9562f4c5e5791cb89039d
-EBUILD flac-1.2.1-r4.ebuild 1853 SHA256 410b029efcc50e0ca4a75210adaab4043408e0fdf8f2f98783c89493cd35da5b SHA512 57ce7a8aefb2bd00618c68190e0e886571fbdfd4b436714deb1e47825d4c3cdfc32ccf7364662d2f9985e2e6080e9bd2acedd55349a845c9e7ebbf43002d2099 WHIRLPOOL 0984eb79950b63714555d082d85acbb2fca91bbf69ededfd5be6ef7cc865d0a24d7037d36bfd84f0d272329add083b2347533d747b800df826829050eca41fd2
-EBUILD flac-1.2.1-r5.ebuild 2099 SHA256 1ea1082ea6e3831f18a7c965fa5a16cb591e543c1d1318acb37eb308feecd01c SHA512 1887550da9da6e927b039bc2b8695affe526b06d72ae1ca42f38362f710a751e5b5aa0b1301b1709640e08d8d940e5691f53014bf9c30ef0a38659ec7af94e2a WHIRLPOOL 6109d2d0d6e6f85f2baf358f83ce0828e72b6bd0816d4f3d1447e23c72ef5ed965f7fd62c1515f415818c2d8c12f9662545eef7ce9b742bef5b64ebab272437e
-EBUILD flac-1.3.0-r1.ebuild 1760 SHA256 90c3097f525c69b998a3463aa92c78ba972d2b3a939a2c529786b30cb6be5d21 SHA512 8a07b8bb8ec269249ac2f35e076405b90cffddbf8fe9acc93bc0dd09c7658abb75d8a55866374562145cda59d5ec3409381cd99a5d12ab8571b36b487187eb4a WHIRLPOOL c1493ed6f539604b1691d719aed6bd326dd592b91a51e1707517baba4961508e9230c21f744a8f197af6097989f25500b8967e6c18e30d6df15f6d9e45ace6b4
-EBUILD flac-1.3.0.ebuild 1703 SHA256 594e99afaf11466a1ed44cbdceced56fd7dda08b41d216795bbe51cabe0fdb53 SHA512 d9c1dfa07702188f292aadfeb07fe7b8240494c6969c94caf0fdaf1dfeb20733338e88fb39754d9c511eed60f4502264ab65c0bdbd5faf7fd9ef50265cfcc93e WHIRLPOOL b8fbf4175ca4fec9e2ef084a28fc49493c832ac1b28d4a00b8fa51b673131bc0639bce86133975964440cb5a5eb8d70ef814bfa583da80f346300a8c0a54eecc
 EBUILD flac-1.3.1-r1.ebuild 2002 SHA256 dff8f19f0e090a655cdf8fc0359d452f40b79636118bf4233ac41c240dc47865 SHA512 ee9da0ad9588864fe496964bad92baa1a3def98b357f84a6ee57fc39d3c1b919fd8dbccdc8b2ec6ae4285c38196ac51a06c09cb7ef1d3d0d9db4b943d9a9ff79 WHIRLPOOL 0b3aeedac5784014576687ab54182c7892df226b3de19de661533a91ff28848aa536627437db30d9f65084e04ef037f20f8b638e955c5cdc9c33bbb7a1905a41
-MISC ChangeLog 26975 SHA256 d8ed3e43ab8d557f0c2008ca98ddbc30d382f151c413c3bc522ac21083d92d8b SHA512 3d748037e508dcfdd5a0c054111d98b5973035ac4736b95ebdf485a333ca2ef7bdee762b77dda65a60173938ef8296abd0c2612285eafd88257d4258a7d90222 WHIRLPOOL bc863192ae7f33c1639fecb5d409441ccee60b790da4d9b71ceed6ed9c9b9cd6bb694eddb5c7f4b96bf914c56ce359e48a77cfdc6d2811e12b1b44b0232319db
+MISC ChangeLog 27466 SHA256 fdfddd6abe923fba250c8c1689e1e94bd9a97baebc1da51e11c32985ba47b389 SHA512 28085cd3a28bae29dca5f23b1e62e144a6d74de1f8009b2f8ad4caf675fe8bfc6bf6c2d432f5a076c2f62c0a35809064411296c7077dbf35fef32a1c05556805 WHIRLPOOL 261763742c3c4b7d3c5cb5469759342a28db2645978b0895fb3c1eee1056999887db623abd0cb7f09eb9058459a931e981960104a7e45b5d755fb2ffc964e190
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUmtGIAAoJELp701BxlEWftJUQALq1jiEb3I7sGXr27EVtbDMB
-LmJU8ukphi74L9AP3mkTbGbDD7SmemvfAXy8eDKkWw+gK7mIdGbGirHUF4vfCKQK
-n7QBoECflaqg16U3YHeYVob7Gzm9V2JREHviDiWXJKbfb11WiJXvdcCaT5UPcbqM
-wxPxRaj2LM6rXXG2fe89LSryz1WOAZhiDHL6zdjFFIVX2fxwsLESePVbBo8VuyhJ
-fOZVZiujYg/8bvBSiWJuh3FxiONUzjPHUEAfizLOQzruSULdYiAcFX1w/mcaovxy
-7NY5TMQkLVdhUR+vFBG9i8VcQdyufrcWnM5FOUrpOhFJe/nTNYUochnklF5SIomg
-HRQ1vIzkk1nhb+pw7peaV/c/EAe+0zlcMmbH38iWp8ypem+BMS8SYhgcPq0buWt1
-ERFGhA7L0+jLTIXWcsBNOKc6Aa4LVXAjNwtRFfOzMP7piz1kTF/FH2p5qAeXEJNu
-DkKie1k+hpSMxhxCLVHXYvtwwFGiLkLtxhVCCtrIcNLVQcGLclvgFfw1Qu4d54Iy
-6xVcJbHDpKhZJEmQppo9X9bz2sZ0RaJHgaSgr1lrnvJYsRUMZlbxaIsGIvsvJ8hd
-YSIvZ9mYw2a25tuFvOxcOLfrlDEWKSG1pqMM72OaunmYseR1LA+cSIswaeR6ut6B
-FZPV+YiEL1Gxj1g9b60H
-=AUbS
+iQEcBAEBCAAGBQJUmvMsAAoJEEqz6FtPBkyjwzwH/0WaIChVI5glczUgs8Fn9RjJ
+MFXjUzTbMRn1nZQyJZCuu0PweKcCCqi6h7C4V+xa0iWu1s9/xBIOzu7WfU7iO5Yx
+hn/OsbLFB6k9HXWtNjy49bdchKPuqZb9nzcMv4QUoj6RKZp4LxJGiYmTb0SFrhjU
+mdR8JfRXyUlMK2CJblokf1fLojuh2mxL+8UVguW4abUmnGCGFpbFtBaAu8mgW56z
+j5afrD0iEErSFUKfZSxLoqIcH8DOSn/ICMJUk3/EOvtpbILty+SHlWJ3WXPCWW6i
+RA8dHVGo88EBirZEjRqjPWmNucslCuuUwTFSKIO9FK4nZUGRWt1qpq11hixpvY4=
+=3ddA
 -----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/flac-1.2.1-asm.patch b/media-libs/flac/files/flac-1.2.1-asm.patch
deleted file mode 100644
index cc832eec74a2..000000000000
--- a/media-libs/flac/files/flac-1.2.1-asm.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -urp flac-1.2.1-old/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm
---- flac-1.2.1-old/src/libFLAC/ia32/bitreader_asm.nasm	2007-03-30 02:54:53.000000000 +0200
-+++ flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm	2007-09-27 21:39:45.000000000 +0200
-@@ -140,8 +140,13 @@ cident FLAC__bitreader_read_rice_signed_
- %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
- 	mov	edi, _FLAC__crc16_table
- %else
-+%ifdef OBJ_FORMAT_elf
-+	mov	edi, [esp + 16]		;		saved ebx (GOT base)
-+	lea	edi, [edi + FLAC__crc16_table wrt ..gotoff]
-+%else
- 	mov	edi, FLAC__crc16_table
- %endif
-+%endif
- 	;; eax (ax)	crc a.k.a. br->read_crc
- 	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]
- 	;; ecx		br->crc16_align
-@@ -216,8 +221,13 @@ cident FLAC__bitreader_read_rice_signed_
- %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
- 	mov	edi, _FLAC__crc16_table
- %else
-+%ifdef OBJ_FORMAT_elf
-+	mov	edi, [esp + 16]		;		saved ebx (GOT base)
-+	lea	edi, [edi + FLAC__crc16_table wrt ..gotoff]
-+%else
- 	mov	edi, FLAC__crc16_table
- %endif
-+%endif
- 	;; eax (ax)	crc a.k.a. br->read_crc
- 	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]
- 	;; ecx		br->crc16_align
-@@ -315,8 +325,13 @@ cident FLAC__bitreader_read_rice_signed_
- %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
- 	call	_bitreader_read_from_client_
- %else
-+%ifdef OBJ_FORMAT_elf
-+	mov	ebx, [esp + 20]		;		saved ebx (GOT base)
-+	call	bitreader_read_from_client_ wrt ..plt
-+%else
- 	call	bitreader_read_from_client_
- %endif
-+%endif
- 	pop	edx			;     /* discard, unused */
- 	pop	ecx			;     /* restore */
- 	mov	esi, [ebp + 16]		;     cwords = br->consumed_words;
-@@ -362,13 +377,20 @@ cident FLAC__bitreader_read_rice_signed_
- 	mov	[ebp + 16], esi		;       br->consumed_words = cwords;
- 	mov	[ebp + 20], ecx		;       br->consumed_bits = cbits;
- 	push	ecx			;       /* save */
-+	push	ebx			;       /* save */
- 	push	ebp			;       /* push br argument */
- %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
- 	call	_bitreader_read_from_client_
- %else
-+%ifdef OBJ_FORMAT_elf
-+	mov	ebx, [esp + 24]		;		saved ebx (GOT base)
-+	call	bitreader_read_from_client_ wrt ..plt
-+%else
- 	call	bitreader_read_from_client_
- %endif
-+%endif
- 	pop	edx			;       /* discard, unused */
-+	pop	ebx			;       /* restore */
- 	pop	ecx			;       /* restore */
- 	mov	esi, [ebp + 16]		;       cwords = br->consumed_words;
- 					;       ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits;
-@@ -437,8 +459,13 @@ cident FLAC__bitreader_read_rice_signed_
- %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
- 	mov	edi, _FLAC__crc16_table
- %else
-+%ifdef OBJ_FORMAT_elf
-+	mov	edi, [esp + 24]		;		saved ebx (GOT base)
-+	lea	edi, [edi + FLAC__crc16_table wrt ..gotoff]
-+%else
- 	mov	edi, FLAC__crc16_table
- %endif
-+%endif
- 	;; eax (ax)	crc a.k.a. br->read_crc
- 	;; ebx (bl)	intermediate result index into FLAC__crc16_table[]
- 	;; ecx		br->crc16_align
diff --git a/media-libs/flac/files/flac-1.2.1-asneeded.patch b/media-libs/flac/files/flac-1.2.1-asneeded.patch
deleted file mode 100644
index 0d6ffb968988..000000000000
--- a/media-libs/flac/files/flac-1.2.1-asneeded.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur flac-1.2.1.orig/src/flac/Makefile.am flac-1.2.1/src/flac/Makefile.am
---- flac-1.2.1.orig/src/flac/Makefile.am	2007-09-11 20:56:51.000000000 +0300
-+++ flac-1.2.1/src/flac/Makefile.am	2007-09-20 19:38:09.000000000 +0300
-@@ -53,6 +53,6 @@
- 	$(top_builddir)/src/share/utf8/libutf8.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la \
- 	@OGG_LIBS@ \
--	@LIBICONV@ \
-+	@LTLIBICONV@ \
- 	@MINGW_WINSOCK_LIBS@ \
- 	-lm
-diff -ur flac-1.2.1.orig/src/metaflac/Makefile.am flac-1.2.1/src/metaflac/Makefile.am
---- flac-1.2.1.orig/src/metaflac/Makefile.am	2007-09-11 20:59:25.000000000 +0300
-+++ flac-1.2.1/src/metaflac/Makefile.am	2007-09-20 19:38:25.000000000 +0300
-@@ -49,6 +49,6 @@
- 	$(top_builddir)/src/share/utf8/libutf8.la \
- 	$(top_builddir)/src/libFLAC/libFLAC.la \
- 	@OGG_LIBS@ \
--	@LIBICONV@ \
-+	@LTLIBICONV@ \
- 	@MINGW_WINSOCK_LIBS@ \
- 	-lm
diff --git a/media-libs/flac/files/flac-1.2.1-cflags.patch b/media-libs/flac/files/flac-1.2.1-cflags.patch
deleted file mode 100644
index 3910604a1e79..000000000000
--- a/media-libs/flac/files/flac-1.2.1-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur flac-1.2.1.orig/configure.in flac-1.2.1/configure.in
---- flac-1.2.1.orig/configure.in	2007-09-13 18:48:42.000000000 +0300
-+++ flac-1.2.1/configure.in	2007-09-20 19:26:05.000000000 +0300
-@@ -301,7 +301,7 @@
- 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
- 	if test "x$GCC" = xyes; then
- 		CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
--		CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
-+		CFLAGS="$CFLAGS"
- 	fi
- fi
- 
diff --git a/media-libs/flac/files/flac-1.2.1-dontbuild-examples.patch b/media-libs/flac/files/flac-1.2.1-dontbuild-examples.patch
deleted file mode 100644
index 2c1d55a62428..000000000000
--- a/media-libs/flac/files/flac-1.2.1-dontbuild-examples.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: flac-1.2.1/configure.in
-===================================================================
---- flac-1.2.1.orig/configure.in
-+++ flac-1.2.1/configure.in
-@@ -255,6 +255,12 @@ AC_DEFINE(FLAC__HAS_OGG)
- AH_TEMPLATE(FLAC__HAS_OGG, [define if you have the ogg library])
- fi
- 
-+dnl Build examples?
-+AC_ARG_ENABLE(examples,
-+       AS_HELP_STRING([--disable-examples], [Don't build examples during make]),,
-+       enable_examples="yes")
-+AM_CONDITIONAL(EXAMPLES, [test "$enable_examples" = "yes"])
-+
- dnl check for i18n(internationalization); these are from libiconv/gettext
- AM_ICONV
- AM_LANGINFO_CODESET
-Index: flac-1.2.1/Makefile.am
-===================================================================
---- flac-1.2.1.orig/Makefile.am
-+++ flac-1.2.1/Makefile.am
-@@ -30,7 +30,11 @@
- 
- AUTOMAKE_OPTIONS = foreign 1.7
- 
--SUBDIRS = doc include m4 man src examples test build obj
-+SUBDIRS = doc include m4 man src test build obj
-+
-+if EXAMPLES
-+SUBDIRS += examples
-+endif
- 
- DISTCLEANFILES = libtool-disable-static
- 
diff --git a/media-libs/flac/files/flac-1.2.1-dontbuild-tests.patch b/media-libs/flac/files/flac-1.2.1-dontbuild-tests.patch
deleted file mode 100644
index 4be64a120cee..000000000000
--- a/media-libs/flac/files/flac-1.2.1-dontbuild-tests.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: flac-1.2.1/src/test_grabbag/cuesheet/Makefile.am
-===================================================================
---- flac-1.2.1.orig/src/test_grabbag/cuesheet/Makefile.am
-+++ flac-1.2.1/src/test_grabbag/cuesheet/Makefile.am
-@@ -20,7 +20,7 @@ EXTRA_DIST = \
- 	test_cuesheet.dsp \
- 	test_cuesheet.vcproj
- 
--noinst_PROGRAMS = test_cuesheet
-+check_PROGRAMS = test_cuesheet
- test_cuesheet_SOURCES = \
- 	main.c
- test_cuesheet_LDADD = \
-Index: flac-1.2.1/src/test_grabbag/picture/Makefile.am
-===================================================================
---- flac-1.2.1.orig/src/test_grabbag/picture/Makefile.am
-+++ flac-1.2.1/src/test_grabbag/picture/Makefile.am
-@@ -20,7 +20,7 @@ EXTRA_DIST = \
- 	test_picture.dsp \
- 	test_picture.vcproj
- 
--noinst_PROGRAMS = test_picture
-+check_PROGRAMS = test_picture
- test_picture_SOURCES = \
- 	main.c
- test_picture_LDADD = \
-Index: flac-1.2.1/src/test_libFLAC/Makefile.am
-===================================================================
---- flac-1.2.1.orig/src/test_libFLAC/Makefile.am
-+++ flac-1.2.1/src/test_libFLAC/Makefile.am
-@@ -22,7 +22,7 @@ EXTRA_DIST = \
- 
- INCLUDES = -I$(top_srcdir)/src/libFLAC/include
- 
--noinst_PROGRAMS = test_libFLAC
-+check_PROGRAMS = test_libFLAC
- test_libFLAC_LDADD = \
- 	$(top_builddir)/src/share/grabbag/libgrabbag.la \
- 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
-Index: flac-1.2.1/src/test_libFLAC++/Makefile.am
-===================================================================
---- flac-1.2.1.orig/src/test_libFLAC++/Makefile.am
-+++ flac-1.2.1/src/test_libFLAC++/Makefile.am
-@@ -20,7 +20,7 @@ EXTRA_DIST = \
- 	test_libFLAC++.dsp \
- 	test_libFLAC++.vcproj
- 
--noinst_PROGRAMS = test_libFLAC++
-+check_PROGRAMS = test_libFLAC++
- test_libFLAC___LDADD = \
- 	$(top_builddir)/src/share/grabbag/libgrabbag.la \
- 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
-Index: flac-1.2.1/src/test_seeking/Makefile.am
-===================================================================
---- flac-1.2.1.orig/src/test_seeking/Makefile.am
-+++ flac-1.2.1/src/test_seeking/Makefile.am
-@@ -24,7 +24,7 @@ AM_CFLAGS = @OGG_CFLAGS@
- 
- INCLUDES = 
- 
--noinst_PROGRAMS = test_seeking
-+check_PROGRAMS = test_seeking
- test_seeking_LDADD = \
- 	$(top_builddir)/src/libFLAC/libFLAC.la \
- 	@OGG_LIBS@ \
-Index: flac-1.2.1/src/test_streams/Makefile.am
-===================================================================
---- flac-1.2.1.orig/src/test_streams/Makefile.am
-+++ flac-1.2.1/src/test_streams/Makefile.am
-@@ -20,7 +20,7 @@ EXTRA_DIST = \
- 	test_streams.dsp \
- 	test_streams.vcproj
- 
--noinst_PROGRAMS = test_streams
-+check_PROGRAMS = test_streams
- test_streams_SOURCES = \
- 	main.c
- test_streams_LDADD = -lm
diff --git a/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch b/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch
deleted file mode 100644
index 52fec8be5706..000000000000
--- a/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp	2007-09-13 09:58:03.000000000 -0600
-+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2007-11-18 12:59:45.000000000 -0600
-@@ -30,6 +30,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
- 
diff --git a/media-libs/flac/files/flac-1.2.1-ogg-m4.patch b/media-libs/flac/files/flac-1.2.1-ogg-m4.patch
deleted file mode 100644
index ed551d5f80f4..000000000000
--- a/media-libs/flac/files/flac-1.2.1-ogg-m4.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -urNp flac-1.2.1-old/m4/ogg.m4 flac-1.2.1/m4/ogg.m4
---- flac-1.2.1-old/m4/ogg.m4	2011-03-28 09:54:44.355000011 +0530
-+++ flac-1.2.1/m4/ogg.m4	2011-03-28 09:54:55.721000010 +0530
-@@ -9,23 +9,29 @@ AC_DEFUN([XIPH_PATH_OGG],
- [dnl 
- dnl Get the cflags and libraries
- dnl
--AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
--AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
--AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
--AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
-+AC_ARG_WITH(ogg,AC_HELP_STRING([--with-ogg=PFX],[Prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
-+AC_ARG_WITH(ogg-libraries,AC_HELP_STRING([--with-ogg-libraries=DIR],[Directory where libogg library is installed (optional)]), ogg_libraries="$withval", ogg_libraries="")
-+AC_ARG_WITH(ogg-includes,AC_HELP_STRING([--with-ogg-includes=DIR],[Directory where libogg header files are installed (optional)]), ogg_includes="$withval", ogg_includes="")
-+AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile and run a test Ogg program]),, enable_oggtest=yes)
- 
-   if test "x$ogg_libraries" != "x" ; then
-     OGG_LIBS="-L$ogg_libraries"
-+  elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
-+    OGG_LIBS=""
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_LIBS="-L$ogg_prefix/lib"
-   elif test "x$prefix" != "xNONE" ; then
-     OGG_LIBS="-L$prefix/lib"
-   fi
- 
--  OGG_LIBS="$OGG_LIBS -logg"
-+  if test "x$ogg_prefix" != "xno" ; then
-+    OGG_LIBS="$OGG_LIBS -logg"
-+  fi
- 
-   if test "x$ogg_includes" != "x" ; then
-     OGG_CFLAGS="-I$ogg_includes"
-+  elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
-+    OGG_CFLAGS=""
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_CFLAGS="-I$ogg_prefix/include"
-   elif test "x$prefix" != "xNONE"; then
-@@ -33,7 +39,12 @@ AC_ARG_ENABLE(oggtest, [  --disable-oggt
-   fi
- 
-   AC_MSG_CHECKING(for Ogg)
--  no_ogg=""
-+  if test "x$ogg_prefix" = "xno" ; then
-+    no_ogg="disabled"
-+    enable_oggtest="no"
-+  else
-+    no_ogg=""
-+  fi
- 
- 
-   if test "x$enable_oggtest" = "xyes" ; then
-@@ -62,9 +73,12 @@ int main ()
-        LIBS="$ac_save_LIBS"
-   fi
- 
--  if test "x$no_ogg" = "x" ; then
-+  if test "x$no_ogg" = "xdisabled" ; then
-+     AC_MSG_RESULT(no)
-+     ifelse([$2], , :, [$2])
-+  elif test "x$no_ogg" = "x" ; then
-      AC_MSG_RESULT(yes)
--     ifelse([$1], , :, [$1])     
-+     ifelse([$1], , :, [$1])
-   else
-      AC_MSG_RESULT(no)
-      if test -f conf.oggtest ; then
diff --git a/media-libs/flac/files/flac-1.3.0-metaflac_strcat.patch b/media-libs/flac/files/flac-1.3.0-metaflac_strcat.patch
deleted file mode 100644
index 848130173cb6..000000000000
--- a/media-libs/flac/files/flac-1.3.0-metaflac_strcat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From upstream:
-
-http://git.xiph.org/?p=flac.git;a=commit;h=606fdfcaece19d3e05434bde57c289102a369069
-
---- src/metaflac/utils.c
-+++ src/metaflac/utils.c
-@@ -75,7 +75,7 @@ void local_strcat(char **dest, const char *source)
- 	*dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
- 	if(0 == *dest)
- 		die("out of memory growing string");
--	safe_strncpy((*dest)+ndest, source, ndest + nsource + 1);
-+	safe_strncpy((*dest)+ndest, source, nsource + 1);
- }
- 
- static inline int local_isprint(int c)
diff --git a/media-libs/flac/flac-1.2.1-r3.ebuild b/media-libs/flac/flac-1.2.1-r3.ebuild
deleted file mode 100644
index e11570169e70..000000000000
--- a/media-libs/flac/flac-1.2.1-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r3.ebuild,v 1.14 2013/12/02 23:31:57 radhermit Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="free lossless audio encoder and decoder"
-HOMEPAGE="http://flac.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-embedded-m4.tar.bz2"
-
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="3dnow altivec +cxx debug ogg sse static-libs"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.1.3 )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	!elibc_uclibc? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-asm.patch \
-		"${FILESDIR}"/${P}-dontbuild-tests.patch \
-		"${FILESDIR}"/${P}-dontbuild-examples.patch \
-		"${FILESDIR}"/${P}-gcc-4.3-includes.patch
-
-	cp "${WORKDIR}"/*.m4 m4 || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
-		$(use_enable debug) \
-		$(use_enable sse) \
-		$(use_enable 3dnow) \
-		$(use_enable altivec) \
-		--disable-doxygen-docs \
-		--disable-xmms-plugin \
-		$(use_enable cxx cpplibs) \
-		$(use_enable ogg) \
-		--disable-examples
-}
-
-src_test() {
-	if [ $UID != 0 ]; then
-		emake -j1 check || die
-	else
-		ewarn "Tests will fail if ran as root, skipping."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	rm -rf "${D}"/usr/share/doc/${P}
-	dodoc AUTHORS README
-	dohtml -r doc/html/*
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-libs/flac/flac-1.2.1-r4.ebuild b/media-libs/flac/flac-1.2.1-r4.ebuild
deleted file mode 100644
index 20d23945387d..000000000000
--- a/media-libs/flac/flac-1.2.1-r4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r4.ebuild,v 1.14 2014/03/19 13:46:49 ago Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="free lossless audio encoder and decoder"
-HOMEPAGE="http://flac.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-embedded-m4.tar.bz2"
-
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="3dnow altivec +cxx debug ogg sse static-libs"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.1.3 )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	!elibc_uclibc? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-asm.patch \
-		"${FILESDIR}"/${P}-dontbuild-tests.patch \
-		"${FILESDIR}"/${P}-dontbuild-examples.patch \
-		"${FILESDIR}"/${P}-gcc-4.3-includes.patch \
-		"${FILESDIR}"/${P}-ogg-m4.patch
-
-	cp "${WORKDIR}"/*.m4 m4 || die
-
-	# bug 466990
-	sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.in || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
-		$(use_enable debug) \
-		$(use_enable sse) \
-		$(use_enable 3dnow) \
-		$(use_enable altivec) \
-		--disable-doxygen-docs \
-		--disable-xmms-plugin \
-		$(use_enable cxx cpplibs) \
-		$(use_enable ogg) \
-		--disable-examples
-}
-
-src_test() {
-	if [ $UID != 0 ]; then
-		emake -j1 check || die
-	else
-		ewarn "Tests will fail if ran as root, skipping."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	rm -rf "${D}"/usr/share/doc/${P}
-	dodoc AUTHORS README
-	dohtml -r doc/html/*
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-libs/flac/flac-1.2.1-r5.ebuild b/media-libs/flac/flac-1.2.1-r5.ebuild
deleted file mode 100644
index 6110a1819cee..000000000000
--- a/media-libs/flac/flac-1.2.1-r5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r5.ebuild,v 1.6 2014/06/18 19:27:19 mgorny Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
-
-DESCRIPTION="free lossless audio encoder and decoder"
-HOMEPAGE="http://flac.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-embedded-m4.tar.bz2"
-
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="3dnow altivec +cxx debug ogg sse static-libs"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	abi_x86_32? ( dev-lang/nasm )
-	!elibc_uclibc? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-asneeded.patch
-		"${FILESDIR}"/${P}-cflags.patch
-		"${FILESDIR}"/${P}-asm.patch
-		"${FILESDIR}"/${P}-dontbuild-tests.patch
-		"${FILESDIR}"/${P}-dontbuild-examples.patch
-		"${FILESDIR}"/${P}-gcc-4.3-includes.patch
-		"${FILESDIR}"/${P}-ogg-m4.patch
-	)
-
-	cp "${WORKDIR}"/*.m4 m4 || die
-
-	# bug 466990
-	sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.in || die
-
-	# fix html install with out-of-source build
-	sed -i -e 's:cd api:cd $(srcdir)/api:' doc/html/Makefile.am || die
-
-	AT_M4DIR="m4" \
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable sse)
-		$(use_enable 3dnow)
-		$(use_enable altivec)
-		--disable-doxygen-docs
-		--disable-xmms-plugin
-		$(use_enable cxx cpplibs)
-		$(use_enable ogg)
-		--disable-examples
-	)
-	autotools-multilib_src_configure
-}
-
-src_test() {
-	if [[ ${UID} != 0 ]]; then
-		autotools-multilib_src_test -j1
-	else
-		ewarn "Tests will fail if ran as root, skipping."
-	fi
-}
-
-src_install() {
-	autotools-multilib_src_install \
-		docdir=/usr/share/doc/${PF}/html
-}
diff --git a/media-libs/flac/flac-1.3.0-r1.ebuild b/media-libs/flac/flac-1.3.0-r1.ebuild
deleted file mode 100644
index 7222ac3dea47..000000000000
--- a/media-libs/flac/flac-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.0-r1.ebuild,v 1.1 2014/09/27 22:16:21 ssuominen Exp $
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-inherit autotools-multilib
-
-DESCRIPTION="free lossless audio encoder and decoder"
-HOMEPAGE="http://flac.sourceforge.net"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
-
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="3dnow altivec +cxx debug ogg sse static-libs"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	abi_x86_32? ( dev-lang/nasm )
-	!elibc_uclibc? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-asneeded.patch
-		"${FILESDIR}"/${P}-dontbuild-tests.patch
-		"${FILESDIR}"/${P}-dontbuild-examples.patch
-		"${FILESDIR}"/${P}-metaflac_strcat.patch
-	)
-
-	AT_M4DIR="m4" autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable sse)
-		$(use_enable 3dnow)
-		$(use_enable altivec)
-		--disable-doxygen-docs
-		--disable-xmms-plugin
-		$(use_enable cxx cpplibs)
-		$(use_enable ogg)
-		--disable-examples
-	)
-	autotools-multilib_src_configure
-}
-
-src_test() {
-	if [[ ${UID} != 0 ]]; then
-		autotools-multilib_src_test -j1
-	else
-		ewarn "Tests will fail if ran as root, skipping."
-	fi
-}
-
-src_install() {
-	autotools-multilib_src_install \
-		docdir=/usr/share/doc/${PF}/html
-}
diff --git a/media-libs/flac/flac-1.3.0.ebuild b/media-libs/flac/flac-1.3.0.ebuild
deleted file mode 100644
index 1cebe2ca88ab..000000000000
--- a/media-libs/flac/flac-1.3.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.0.ebuild,v 1.13 2014/06/18 19:27:19 mgorny Exp $
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-inherit autotools-multilib
-
-DESCRIPTION="free lossless audio encoder and decoder"
-HOMEPAGE="http://flac.sourceforge.net"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
-
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="3dnow altivec +cxx debug ogg sse static-libs"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	abi_x86_32? ( dev-lang/nasm )
-	!elibc_uclibc? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-asneeded.patch
-		"${FILESDIR}"/${P}-dontbuild-tests.patch
-		"${FILESDIR}"/${P}-dontbuild-examples.patch
-	)
-
-	AT_M4DIR="m4" autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable sse)
-		$(use_enable 3dnow)
-		$(use_enable altivec)
-		--disable-doxygen-docs
-		--disable-xmms-plugin
-		$(use_enable cxx cpplibs)
-		$(use_enable ogg)
-		--disable-examples
-	)
-	autotools-multilib_src_configure
-}
-
-src_test() {
-	if [[ ${UID} != 0 ]]; then
-		autotools-multilib_src_test -j1
-	else
-		ewarn "Tests will fail if ran as root, skipping."
-	fi
-}
-
-src_install() {
-	autotools-multilib_src_install \
-		docdir=/usr/share/doc/${PF}/html
-}