remove old

Package-Manager: portage-2.2.0_alpha181/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

5 files changed, 9 insertions, 579 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index c2e93a5a35f3..6cc2455bb8f6 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xvid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.135 2013/06/19 15:51:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.136 2013/06/19 15:55:14 aballier Exp $
+
+  19 Jun 2013; Alexis Ballier <aballier@gentoo.org> -xvid-1.2.2-r2.ebuild,
+  -xvid-1.3.1.ebuild, -files/xvid-1.2.2-noexecstack.patch:
+  remove old
 
 *xvid-1.3.2-r1 (19 Jun 2013)
 
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index d0f6b8d32b91..d8529ac9e33c 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,20 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xvid-1.2.2-noexecstack.patch 17680 SHA256 ef35cff8d86cee714f887746995c664b307ae35dd77472b9007987562dc7e8d3 SHA512 91e0fd9e9135894a9c692817fd9c62a872de9ae8572b996eb36b04d0abca046a4c9b0de7fb6d16b8b4ba74da7b0c1e2b56b379fb4c941e946f1ab80807511cbd WHIRLPOOL 2957c0e489797d5d06e138ad3c6ab64f3b89eca5fd8bac11919f6125aa5fa4eef7111b104448efc9720ac36ffb05df3bdc17653f5bf32768485f035510bb808d
-DIST xvidcore-1.2.2.tar.bz2 643344 SHA256 e42a602de489438b96f7f4742b68e9bed7efa7aee3570379bb2582b4290b6d11 SHA512 34e68f24c0f579daf7ed5b7d352ac515cb7b329467b4763fa4ccbe689f2defe97fd2f14e5e08d01e67438a12a53b94a8cd66040d380c36321a9874a88c09fc8f WHIRLPOOL d87db115a4bf0cbdbcbc9cc19f4a24abca3cdbb8c74614413941a39bc12c754472640ec05b8ea1fa09852d057b18a340873faeb5fd29a6428a9b1ac5e5eb316e
-DIST xvidcore-1.3.1.tar.bz2 710007 SHA256 c51ae8449b04fd8c8d5e15546d5e7c022d72014df7849be2598b9dfa1c003d64 SHA512 85ecb22b52515023d192555da94c9c95f01fccf6898582b4036b601e39c8644d272d296265ded69b4051e7d5b5b176227c2ba0b15cef2ba9bc48471a076b3553 WHIRLPOOL b0cc4e958427ebd7452c569c548a5ead2c9367aaa58e12e512f90d623f7ff5083bd11c0341eafefc5bfa939f01f59267b8dfa3edeba801c5819744c46fc3cf8a
 DIST xvidcore-1.3.2.tar.bz2 697038 SHA256 d6c11334e1e771f9e4722eff454762325fd0989f6a4217abca296d6770160bf4 SHA512 0b7725314abc1dbe1f0ba4700393c391b8f98589300051ad7ebc5bdef7e87b20f19dcc88c37afbc1dfa117b6c8c1d5051b8f8d263c419e6965c5bc5f0201dc97 WHIRLPOOL c9e3f1a99544fe5b2394afc9adee3764565572b7b7fb46e2c92500d13851a8225b3e8b8e0db280a37aba72ff978e11a8c9f80d3a65b27f682087b1308f506dfa
-EBUILD xvid-1.2.2-r2.ebuild 1483 SHA256 c6ff1d32b53ce1c24b592829dc5037d3b1cc9e64b3ed550dcd85396a7ddaf0fd SHA512 2182a8c97d419285a52dc626c90f1384ade37459ba41ff2f4a1eceb947ddaab1167a0a89b48d92274cdc6dda76d0ec2182ef35432f7ec25d359d22df2400f08c WHIRLPOOL 6134b17950d34ca2f6f485ac70d892cc4d28d6770d736900bc42dfedc9ad5cffb87e2a15af6d76c513a5d444e68d0ec5805d19db808f414e948e316d4bd63664
-EBUILD xvid-1.3.1.ebuild 1330 SHA256 efbe0f233d0779b1bc99ca76a49f35331aa1c3d09f55134168add9b6573da21e SHA512 97db9a283ab6030be8421e15cca403dd5584a3a3c1ea6389d06b7689692ba9e60f80417d9b1e3b3b28cf7f37efe29f8f3ff2f1974ec6e4bf4a692410f0087c5f WHIRLPOOL 5a91328bf499be33914872a328476b73d102213535c001e4560d7563b7669ff6a00b8605b05c7e5edb940407d687ed92c40fe088c75853d3ae8dae524bb11e7f
 EBUILD xvid-1.3.2-r1.ebuild 1863 SHA256 d02f259bc261a9e4527bcd689cbe6e7413a441bf86da6ee1bc10b596ccd3ecc7 SHA512 47283e3e42823bddeefa091f6663d92253ab7823dac3ccd66ba81306a1fd73cf6f3b55a24dc10435873e67bcf6e9506df85e4dfc695d055ccefb1835d3ee5088 WHIRLPOOL 596f8a6168838751e8d1c58de4108574ff781017746417b04ce0723519c77c6417cf8e2570d2db17a95e73ed9b18c0f52ae847f24b1369a4a36a822535ba8c19
 EBUILD xvid-1.3.2.ebuild 1407 SHA256 94d8f7fe834e9c510a1d8caa5e7b906b459324f880e8ced4abf162a3fc9ec046 SHA512 701ceff32fa0a811fec700ff2034078d04e0fd5a55107e27759d64c3f506dc2a687d64e3ff2f1efd68934ca4c0486595dbd54b358b58b7e30e4a3c72cd2e0db9 WHIRLPOOL 7f2195e71311cfd61976589debd6e7efaa1e78baa2dbfc90f92c5f5244f14540585ee3ccad96dccde8f00981fd8a9b8ecf50ad3e9c75463a7301d6ba6a0e3221
-MISC ChangeLog 17355 SHA256 9536dcaf2dcd8823ccdb2095ad476371f948e498427c8d9cb33ff1a0e6f7ebcc SHA512 372921b76569d5212f8dbed1dbbb1ac06182ba3ff3504a85055a958c82c45c60151e75ebc491ac0d48ac0e87efe13db73cbbec7c2d4483736de7484a5be0225e WHIRLPOOL 54879c83c32c3f08db8878f77e039a41546e166556a4e2d823f880bb7aeabe8479a9fedd75444c77e32cafcaa71e63f0fb2e910161a8e4037ec8ef1b01f4a105
+MISC ChangeLog 17503 SHA256 5df614bdd480599cf446bbc9ae83507569a3281e0dc1a7a209dc4eaed715b32c SHA512 72a943bee495e595d64a48456c7d50f832c2ca7be648aa82936ee5a1c09eb0ea1d40ccd0b8ab856d491c0bf6926ac0948c0b81aa585dd64d4f6f9c4356594cf2 WHIRLPOOL d39309d6b8e76d8bbd10195844409165a0a6c3cd6a02ed65e5f01a811e1b3d69ef36717982fbd011792c86b5b839e004936e3d18aedece633f19a9d1a5a19d9f
 MISC metadata.xml 326 SHA256 44f920b8335d7708c3208af6281abb98d71274f3400ed3538ca469c3846705c9 SHA512 56eb9fa6a5cebf28725a3b0023545cc5c7d1967f63b94358d30f69e08c1837c9129e761108200579f209b9743695999b45ab9c0301e190eadd59bbb17346c42e WHIRLPOOL de611ff8bb19c90f6810575bc79b83cd0116ab70715e7445364236e6ad78f1665fd7a5e33b3a84500b9bd45f853f809dcc98586494f57d743f6bec559ed1ae70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHB048ACgkQvFcC4BYPU0r9cwCfcgv80dO+wxjNmH9fu5IeOs4g
-F3UAn2utKdSdNMJ8qJm96zuM7bhGSr64
-=MUTY
+iEYEAREIAAYFAlHB1GMACgkQvFcC4BYPU0r+ogCePT9iGApCKwIPjuJmUenbAWl6
+lEEAnRofMf0d8JF7Y5ZaHg8kyBsd9a0l
+=X1E4
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xvid/files/xvid-1.2.2-noexecstack.patch b/media-libs/xvid/files/xvid-1.2.2-noexecstack.patch
deleted file mode 100644
index aef52f33814e..000000000000
--- a/media-libs/xvid/files/xvid-1.2.2-noexecstack.patch
+++ /dev/null
@@ -1,457 +0,0 @@
-diff -up xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_mmx.asm
---- xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -126,8 +126,4 @@ calc_cbp_mmx:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_sse2.asm
---- xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/bitstream/x86_asm/cbp_sse2.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -116,8 +116,4 @@ calc_cbp_sse2:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm
---- xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -401,7 +401,4 @@ MAKE_FDCT_FUNC fdct_mmx_ffmpeg, FDCT_ROW
- 
- MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm
---- xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -500,7 +500,4 @@ MAKE_FDCT_FUNC fdct_mmx_skal, fMTX_MULT_
- 
- MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm
---- xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -605,7 +605,4 @@ fdct_sse2_skal:
- ENDFUNC
- 
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_3dne.asm
---- xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/dct/x86_asm/idct_3dne.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -698,8 +698,4 @@ idct_3dne:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_mmx.asm
---- xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/dct/x86_asm/idct_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -608,8 +608,4 @@ idct_xmm:
-     ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm
---- xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -325,8 +325,4 @@ idct_sse2_dmitry:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm
---- xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -514,8 +514,4 @@ MAKE_COLORSPACE  rgba_to_yv12_mmx,0,   4
- MAKE_COLORSPACE  yv12_to_bgr_mmx,48,   3,8,2,  YV12_TO_BGR,  3, -1
- MAKE_COLORSPACE  yv12_to_bgra_mmx,48,  4,8,2,  YV12_TO_BGR,  4, -1
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm
---- xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -474,7 +474,4 @@ MAKE_YV12_TO_YV12	yv12_to_yv12_mmx, 0
- 
- MAKE_YV12_TO_YV12	yv12_to_yv12_xmm, 1
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm
---- xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -341,7 +341,4 @@ MAKE_COLORSPACE  yv12_to_uyvy_mmx,0,    
- MAKE_COLORSPACE  yv12_to_yuyvi_mmx,0,   2,8,4,  YV12_TO_YUYVI, 0, -1
- MAKE_COLORSPACE  yv12_to_uyvyi_mmx,0,   2,8,4,  YV12_TO_YUYVI, 1, -1
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack xvidcore/src/image/x86_asm/deintl_sse.asm
---- xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/deintl_sse.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -131,7 +131,4 @@ xvid_deinterlace_sse:
- ENDFUNC
- 
- ;//////////////////////////////////////////////////////////////////////
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/gmc_mmx.asm
---- xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/gmc_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -220,7 +220,4 @@ xvid_GMC_Core_Lin_8_sse41:
- ENDFUNC
- 
- ;//////////////////////////////////////////////////////////////////////
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm
---- xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -463,8 +463,4 @@ interpolate8x4_halfpel_hv_3dn:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm
---- xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -563,8 +563,4 @@ ALIGN SECTION_ALIGN
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm
---- xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -1328,8 +1328,4 @@ interpolate8x8_halfpel_hv_add_mmx:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm
---- xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -819,8 +819,4 @@ interpolate8x8_halfpel_hv_add_xmm:
-   EPILOG
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_mmx.asm
---- xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/postprocessing_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -114,7 +114,4 @@ image_brightness_mmx:
- ENDFUNC
- ;//////////////////////////////////////////////////////////////////////
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_sse2.asm
---- xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/postprocessing_sse2.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -130,7 +130,4 @@ image_brightness_sse2:
- ENDFUNC
- ;//////////////////////////////////////////////////////////////////////
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/qpel_mmx.asm
---- xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/qpel_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -1149,7 +1149,4 @@ ENDFUNC
- %undef SRC_PTR
- %undef DST_PTR
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/reduced_mmx.asm
---- xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/image/x86_asm/reduced_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -985,8 +985,4 @@ ENDFUNC
- 
-   ; pfeewwww... Never Do That On Stage Again. :)
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dn.asm
---- xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/motion/x86_asm/sad_3dn.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -216,8 +216,4 @@ sad8bi_3dn:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dne.asm
---- xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/motion/x86_asm/sad_3dne.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -490,8 +490,4 @@ ALIGN SECTION_ALIGN
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_mmx.asm
---- xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/motion/x86_asm/sad_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -731,8 +731,4 @@ sse8_8bit_mmx:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_sse2.asm
---- xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/motion/x86_asm/sad_sse2.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -176,8 +176,4 @@ dev16_sse3:
-   MEAN16_SSE2_SSE3 lddqu
- ENDFUNC
- 
-- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_xmm.asm
---- xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/motion/x86_asm/sad_xmm.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -436,8 +436,4 @@ sad16v_xmm:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/nasm.inc.noexec-stack xvidcore/src/nasm.inc
---- xvidcore/src/nasm.inc.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/nasm.inc	2009-09-21 10:39:24.000000000 +0200
-@@ -189,3 +189,12 @@ BITS 32
- 		%endif
- 	%endif
- %endmacro
-+
-+%macro NON_EXEC_STACK 0
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
-+%ifidn __OUTPUT_FORMAT__,elf64
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
-+%endmacro
-diff -up xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm
---- xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -273,6 +273,4 @@ consim_mmx:
- 	ret
- ENDFUNC
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
-+NON_EXEC_STACK
-diff -up xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm
---- xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -931,7 +931,4 @@ ALIGN SECTION_ALIGN
-   ret
- ENDFUNC
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm
---- xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -1070,8 +1070,4 @@ dequant_h263_inter_sse2:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm
---- xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -657,8 +657,4 @@ ALIGN SECTION_ALIGN
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm
---- xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -618,8 +618,4 @@ ALIGN SECTION_ALIGN
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack xvidcore/src/utils/x86_asm/cpuid.asm
---- xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/utils/x86_asm/cpuid.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -240,7 +240,4 @@ ENDFUNC
- %endif
- 
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/interlacing_mmx.asm
---- xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/utils/x86_asm/interlacing_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -198,8 +198,4 @@ MBFieldTest_mmx:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm
---- xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -465,8 +465,4 @@ transfer8x4_copy_3dne:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
-diff -up xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm
---- xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack	2009-09-21 10:39:07.000000000 +0200
-+++ xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm	2009-09-21 10:39:24.000000000 +0200
-@@ -588,8 +588,4 @@ transfer8x4_copy_mmx:
-   ret
- ENDFUNC
- 
--
--%ifidn __OUTPUT_FORMAT__,elf
--section ".note.GNU-stack" noalloc noexec nowrite progbits
--%endif
--
-+NON_EXEC_STACK
diff --git a/media-libs/xvid/xvid-1.2.2-r2.ebuild b/media-libs/xvid/xvid-1.2.2-r2.ebuild
deleted file mode 100644
index 006a631ff840..000000000000
--- a/media-libs/xvid/xvid-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild,v 1.9 2010/10/30 15:48:30 ssuominen Exp $
-
-EAPI=2
-inherit eutils multilib
-
-MY_PN=${PN}core
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="http://www.xvid.org"
-SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="examples pic"
-
-NASM=">=dev-lang/nasm-2.05.01"
-YASM=">=dev-lang/yasm-0.8.0"
-
-DEPEND="amd64? ( || ( ${YASM} ${NASM} ) )
-	x86? ( || ( ${YASM} ${NASM} ) )
-	x86-fbsd? ( || ( ${YASM} ${NASM} ) )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_PN}/build/generic
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${P}-noexecstack.patch
-
-	sed -i \
-		-e '/^minimum_yasm_minor_version/s:=.*:=0:' \
-		"${S}"/configure || die
-}
-
-src_configure() {
-	local myconf
-
-	if use pic; then
-		myconf="--disable-assembly"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
-
-	local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*))
-	dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
-	dosym ${mylib} /usr/$(get_libdir)/${mylib%.?}
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/../../examples
-	fi
-}
diff --git a/media-libs/xvid/xvid-1.3.1.ebuild b/media-libs/xvid/xvid-1.3.1.ebuild
deleted file mode 100644
index 953a67697ee9..000000000000
--- a/media-libs/xvid/xvid-1.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.3.1.ebuild,v 1.2 2011/04/25 14:20:04 ssuominen Exp $
-
-EAPI=2
-inherit flag-o-matic multilib
-
-MY_PN=${PN}core
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="http://www.xvid.org/"
-SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="examples pic"
-
-NASM=">=dev-lang/nasm-2"
-YASM=">=dev-lang/yasm-1"
-
-DEPEND="amd64? ( || ( ${YASM} ${NASM} ) )
-	x86? ( || ( ${YASM} ${NASM} ) )
-	x86-fbsd? ( || ( ${YASM} ${NASM} ) )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_PN}/build/generic
-
-src_configure() {
-	use sparc && append-cflags -mno-vis #357149
-
-	local myconf
-	use pic && myconf="--disable-assembly"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
-
-	local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*))
-	dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
-	dosym ${mylib} /usr/$(get_libdir)/${mylib%.?}
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/../../examples
-	fi
-}