Drop nested funcs patch since it doesn't fix all the uses.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 21 insertions, 57 deletions

diff --git a/dev-libs/elfutils/ChangeLog b/dev-libs/elfutils/ChangeLog
index 48ba4c33ba64..03562617d404 100644
--- a/dev-libs/elfutils/ChangeLog
+++ b/dev-libs/elfutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/elfutils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.170 2013/10/13 19:57:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.171 2013/12/23 10:09:20 vapier Exp $
+
+  23 Dec 2013; Mike Frysinger <vapier@gentoo.org>
+  -files/elfutils-0.156-nested-funcs.patch, elfutils-0.156.ebuild:
+  Drop nested funcs patch since it doesn't fix all the uses.
 
   13 Oct 2013; Michał Górny <mgorny@gentoo.org> elfutils-0.155-r1.ebuild,
   elfutils-0.156.ebuild:
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index ec2abbc491c7..230a11ccb3fc 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -5,7 +5,6 @@ AUX elfutils-0.118-PaX-support.patch 954 SHA256 e769e1168dc645ce99655f984f5c19a5
 AUX elfutils-0.143-configure.patch 772 SHA256 af91d9c73612d82b3b47099c0dd8e5cfaac1aa6538185e2760ba5ab933ef9091 SHA512 988d9a85339848150023df4193c6fa45a9dc2e3609b16b575ef7e25c4b0eff8b7e1bd188ebc4a5c0ae9b1aeeb16a99ddf1441f53d4a5ec0c88041fee65491c01 WHIRLPOOL 98b0576f049706b6c21765dfe26985bc88f97b5f39ad2ab950944382c06650b25e2ebad47c155924c664c9b56ac822339c0056e3bb0e8156f4f9963946bbadd3
 AUX elfutils-0.148-bashifications.patch 760 SHA256 e741d81d4136a1f9a720fcbb67ffbb389cf00f98e344a5102b6c89e77b150c18 SHA512 778899e982021266db3d109ca8eb9c6144e13d98d017fd4d43fbbcc118b2aaebb827dceafc5dc196b437509bbbc4a95d4b152fa493f3a94c2daaa9da2dc91f74 WHIRLPOOL 1f78c567d5460097d8ed0f5756208bb0ef74c41e8a41db16c85fa28d9bc858a71c4ccd5d2978c596d0b12ae57c9a094e8f9062f7b580db93772e38b92c5707ba
 AUX elfutils-0.150-bashifications.patch 763 SHA256 8a7f67e8adeb3ae1aeeb0b3302ed1cda10f852d3f6702d21dfb011761a2b7576 SHA512 d111c043a47f9c6bbb9e51393ad496be79618c6fda50da7870bec6998a295835e68dc0b3dc38bc2a7bbe98b2f894fc4f3c46985a4faf3bc76d92d3b5dbd845b6 WHIRLPOOL 60fbabd765c6c93c64ae81413173347d611c8f34adb38d4fb274f9f830cfedaa5e70a0009be826f4f3ee06dd5196aa480b0c7b38d3a35541037a50d3ee730d1d
-AUX elfutils-0.156-nested-funcs.patch 796 SHA256 2ca9a2ee8c55ca77dceb8db814c3337c418b8be42f2528deb2fce1f3e1f90db5 SHA512 c577b76f79543bf3a87cb4b2b7b9e5cabec566ed7452effb5b541251652a26b5eefe4a9887579dfd81f2f561d437608145427c0651f6e98cc7262e65a8d82487 WHIRLPOOL 495b729ccc90d5c67e0bcf63562424892c84eab63145e060aa5e0bbcafe2e56923a2f144198e6951163ea4a6d75af81d277a198f8b1f53e4bd8fed8986693efa
 DIST elfutils-0.146.tar.bz2 1791373 SHA256 dacd9419cc9ef36463f22cd7d7204ee7490904000045a8cdcbf3569907ecf2c8 SHA512 8c93d882b261502576051e3fc41f1469a7d2195813690792fdc104ce87dd39755f867802de0f1c2e224177a1a52671572178fcd4779287c0f5565b186fa598c5 WHIRLPOOL 5583c968dbe19e4efab6e870c8b3cf3576ae171ab241e52948a6cd850e12ba6c3b11560b931559e056fcac0217d6d62ebfcb56afadd19d916f7a2997116916be
 DIST elfutils-0.148.tar.bz2 1811640 SHA256 8aebfa4a745db21cf5429c9541fe482729b62efc7e53e9110151b4169fe887da SHA512 9282945c19a98e14dbfbd50f9fd35b3575d1361c64c865c7205a3207bd23d982ee8288b26de3d627430a7cd4b0594e67b4ce956ec482d91a4f4d03dcda01de14 WHIRLPOOL fe9ffdb4934c3d3d7bfad4df6813d913020a01c231ef788a5bfec4a45cdb89f5df1abc64a211383a3a3fee66f41efad03a7607d8892a02aba5c8bbba3bf767cc
 DIST elfutils-0.149.tar.bz2 1821994 SHA256 b81f73db935cdb5c0ddfdb4fd36aa0597b691b9204c62e5ee6bcb8c8ffabc808 SHA512 4ad5d9bc64575c7f7b397b129c197639c690957b0556cec628d97d9b12eb353a49fb27b6df3df23a4a90e7a783ab6457d44d0c27e5bb657ba87514b0600c4aeb WHIRLPOOL df5cb7e73a741177b18aca4c5573eae9b6f01cd17400f482c79b89868af4d76e8192d7a210fe17f4165d99387410dc5bca8faa06464a488934e2efa1534a8894
@@ -38,25 +37,23 @@ EBUILD elfutils-0.154-r1.ebuild 2314 SHA256 46f6caf85d4af2d0b29f0c547e71222ef2c5
 EBUILD elfutils-0.154.ebuild 2048 SHA256 fcaef5aa4144bb9fd6e3bec5a6222e714409a35cd9190660ddc2263eb4497a3b SHA512 f264d23923b3e63f2086ff896d6668ebe285743d929697886f2d513e57b14b8ecf4fd32c8a78f2dad1c755e986431d36af2ef063c2170af90515d93ab6118497 WHIRLPOOL d1ef17d685a4b88cb49d42b1905a2f56733b4102c0b2c23e605dd14bbfeb4507ad2fe8d3fbb52c7fd9df805e44e38d7c75b1cd0c5687d5803dca7a8b5de3bfb3
 EBUILD elfutils-0.155-r1.ebuild 2674 SHA256 a31a4a1aeb8e0eabd9b9e87a3732aa8adb74da6270697df4340a984978daa2fd SHA512 223597ad0b2ba31b7e1195f1c3a3cb7123484b4f04a7492d9bd80532081b07452b6a7649b9cce0452bbf7a2b9f144ff4dea3d98f8b568df31c5586b0be9ca3d9 WHIRLPOOL b965a0d642c0897fa2901dfb39c50b2fb1ea921e07c80b6eee2a4bc3c5aa75e605795c2f69ed4bdf7bf478fb9cd7665072588b32f489d089739e1ac6d4ce1772
 EBUILD elfutils-0.155.ebuild 2323 SHA256 d1fd26666413017d59433378579580b6fcc38bf822f90bb3abe068329a71f6d7 SHA512 067e247a694d3e4e2a6f4c851dd25855c795bb4b30e71d148fe418559855cc067ba9ee70d7b0fa29cefd12f1d4b321aa8ef364b325cf49de8a262a80dce6ea10 WHIRLPOOL a6b13255de58604d78c9298350a11c1ba34e9a3dad2d09e1eca6ab1c17141ea468fa1b06623b453c78f151a6b71b5eb8338f3684fd692d8219bab76be5d1fbf8
-EBUILD elfutils-0.156.ebuild 2725 SHA256 b4d94719c161cab76088b43c6c23dca92a64f1bfe5624e2849ea4ce65c967ddb SHA512 5b83a7234e913972afa17dc3250eb1615fa1e677680b1a077b89c9e139c711f9322ff910451aa24c3c8f69e82f4bef18c69c96ff395278363db8d1943e7c587f WHIRLPOOL d2b2c5e06f074d7bbae8d7af117cbc1af6ad743ad16b5c60c8a4659514e08173d9fab2258d24f7754a2f9c1c50cdff03e7fec707028d46b264cf05b9b80b1432
-MISC ChangeLog 23224 SHA256 7507bbf1ad5b70ba1305f04f63f6666e97995e4535554c1e2c8e51793655512c SHA512 713f39ea2aeba08d8f66fde56ec003d673ea465a944f69f53ea4a77f672edab819d93f4f704f4fa52df77de9cd2cccf2794615eac3d4b8c0ee16033230f5adbc WHIRLPOOL 34cbadbf8e0614d0ec6c31caa282d859b91c3deba1adc90c10436e652692eac7279ce609687d27b48ea0c77230b5cbe7e888f8f9ca2337ebe30b1a75e972ada4
+EBUILD elfutils-0.156.ebuild 2671 SHA256 2f60dfdcf3c98094f9314094e85a13c11a7f1246c1ef64a71387d16fb5b05a85 SHA512 d66e3cc5ab94dee235f0439a0f88a97cfb83549e65f5349f84c7c86a52618e216694b1ddeb6f80be439386fe20fb3537e75fc0282a4d37c23b561fda25380d3c WHIRLPOOL ccbb717330ae12793cdc2e45846db82c9be8985dc2d71a083072d5d9c5151ce24181337b0f53d9837ec49971385c2ef211c59356a9f2da5b88f80c8199ee4090
+MISC ChangeLog 23403 SHA256 f503d8bf991beeccfe834153f46754a775e3396b069d74294c7100626e783f5c SHA512 8701f4955be434f025db3505e05ba10cdc37e08ffd37a1c030adeedf18fc75320b3737e729e994515e81e6726fc2ce7e9e6ff933e691bc35968230a95c6d9164 WHIRLPOOL 9252211ac168f7ee6d9d40937f8cf9012382a34ed3e249c3ba421886c02bbda16b244bf774266283a027e3b6b86b6058c879a1200a77fc9ccf15a237fe8ce0bf
 MISC metadata.xml 438 SHA256 33cbcbd727257fa6d03488d531c099d33f4c3e4db3cf3739d11d8d4cd8266b37 SHA512 e013123116aa3a3f00fa77cc3e9d18a5c1f481dd304ee6af6e77e3e5e44fb9e3f94ac542fc10fb0c59dea6699c15cce11b1513c061494919f1e821120fb162d9 WHIRLPOOL f07f16d5235c538cef44daca3210ad7374af35705b6562b9bb17b2a5532ba0ed6ea32d1d7f23e93c899e8868503f7a9f8994d2454ca144c45ae7e9317fb0cabd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSWvseXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOPkUQALLeFBVwyKhGCt5MLDIiIcr6
-d/g40ohkwTxBKi2sW5EOnAf3j2ajSCDTLjcUuDp4uUGNA2zT1Y0vH5yewI7vVnyh
-CrZG9oBwpzyO0lihB51Do9E+Yde0a6GdWcaZ5gGdA6zbEAyj2ynO0RtTolrG48Hv
-VWtDdRNx3VgyZNhZArDKRzfSxDKMPBj7+zhHuTN1woTynOJSyVdPR2eQ8uWmvdgl
-5tz7QuZECj6ct5krEIS4hWo8iw+FliHjRB8S4TuOQ8Y8nRHf3dopobx9wla0dwec
-7cjpk1tn9TOTNPLhBrKJwlxZF0mD3DxpzQ1EKmJdxr4a2hYcx+w0CKZVQdgTfR4i
-nisvMeaKGBXa8XGcPjeCcBXJLcNZfyphJRdNP4npD6s1oXG3Jy5J3779e8ZJfKJt
-XuPvC+bGrOco/vP7E4LHoZw2QPQBtnEIJfCEOmelH9MmsyzUvSboW3q1nbyDA7/6
-f4Z9A1bufbWfaPEb0w4xp1EcZ7zjMmbfSnDnCRoCFyOOMZByyMsnFmWwkLVBvTNj
-iY5Q05mpvSnGg1qk0QslnLFydkmxkaXWHB2/nKwv8zufAuvUmP88yZ2vzrOB9KJC
-i59bMJbfRgoLi829NAZbmJF4beUn6h4h7gg1iqiCrrt2Oyn3w+CvowgTnRMOxf/z
-RK1qSI848/nr7omuTC3j
-=m77H
+iQIcBAEBCAAGBQJSuAvSAAoJELEHsLL7fEFWVz4QAKBBnkrmk0U2o2voqR+OtLVb
+CTKC7gT/WAzugNrSqu4tgjP4hFvhCqubrj+47i2rH6A2GOGay3ORh5iNHvrxaLs1
+U8TK9r8e2pVptye2X7jyzyTq0bQB/UnIpv8C1aw3DNxb3Ugcwc4ytAFm8tdXoQgx
+9rl4EcR9xU5CVYPy6v48E9Ouw2HzrrAVZYkjXhnJtmkS36c6B+zsoZi3YDxee5WL
+nemHT2TxWhZuVjIiMlL2e3tRvtbyeA0jW61bvDrtLGCH2JAYVji96U1GNQzxeBM6
+LfFy/iki1at2zcjlEu6haT7Rg9il/FT9uZp7ZUf9AAmJTml6TNI6mh8TVb8T8ceP
+vsha6WZW4btVn7rIMUppmic5nd+9Qo9QTNeKeeQVu1yl8v9rWcs6MfIJGWTYG07A
+itMxuEnAuRXH2pwSCB+jfs58P5C3YzXHR289f6EhRME3SBTJX0VXcm67fkn0Pwhx
+7BgV9jwPKio4JSy6Ori9qj0yoawwx8OfbR3OZDSi4IznFhI51qz6gtBrXTHX9dDM
+VY09Q0dJJ3AqsMAOW0/yW/YC85o/0q2faNBFmGqL0qyPSBTaMp45c7SopsrCn7VG
+8ZqBMRLSQXNW5QO291luaQTtm2onBCK5bNh5PZJFnJRLI7PI6TJqus1BU/GGcBPB
+njsj+YifYpngQLDTPs2f
+=GCb+
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/elfutils/elfutils-0.156.ebuild b/dev-libs/elfutils/elfutils-0.156.ebuild
index 7c382fb6eec0..d0eefac0ec7d 100644
--- a/dev-libs/elfutils/elfutils-0.156.ebuild
+++ b/dev-libs/elfutils/elfutils-0.156.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.156.ebuild,v 1.3 2013/10/13 19:57:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.156.ebuild,v 1.4 2013/12/23 10:09:20 vapier Exp $
 
 EAPI="4"
 
@@ -36,7 +36,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch
 	epatch "${DISTDIR}"/${P}-{portability,robustify}.patch
-	epatch "${FILESDIR}"/${P}-nested-funcs.patch #451986
 	sed -i -e 's:-Werror::g' $(find -name Makefile.in) || die
 	use test || sed -i -e 's: tests::' Makefile.in #226349
 	use static-libs || sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in
diff --git a/dev-libs/elfutils/files/elfutils-0.156-nested-funcs.patch b/dev-libs/elfutils/files/elfutils-0.156-nested-funcs.patch
deleted file mode 100644
index f658a8f3e21e..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.156-nested-funcs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-clang does not like nested funcs.  use a define instead.
-
-https://bugs.gentoo.org/451986
-
---- a/libelf/elf_begin.c
-+++ b/libelf/elf_begin.c
-@@ -1011,18 +1011,17 @@ elf_begin (fildes, cmd, ref)
-       return NULL;
-     }
- 
--  Elf *lock_dup_elf ()
--  {
--    /* We need wrlock to dup an archive.  */
--    if (ref->kind == ELF_K_AR)
--      {
--	rwlock_unlock (ref->lock);
--	rwlock_wrlock (ref->lock);
--      }
--
--    /* Duplicate the descriptor.  */
--    return dup_elf (fildes, cmd, ref);
--  }
-+#define lock_dup_elf() \
-+  ({ \
-+    /* We need wrlock to dup an archive.  */ \
-+    if (ref->kind == ELF_K_AR) \
-+      { \
-+	rwlock_unlock (ref->lock); \
-+	rwlock_wrlock (ref->lock); \
-+      } \
-+    /* Duplicate the descriptor.  */ \
-+    dup_elf (fildes, cmd, ref); \
-+  })
- 
-   switch (cmd)
-     {