apply fix from Martin von Gagern #142264 / #142852

(Portage version: 2.1.1_pre4)
 (Signed Manifest commit)

2 files changed, 11 insertions, 48 deletions

diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 2600814700fb..787c85b4e1e6 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -33,10 +33,6 @@ AUX elfutils-0.120-mkinstalldirs.patch 752 RMD160 523cceb5a3d394ebba88cb5bdb6e0b
 MD5 2661049bdc5eb0263a4cc835ed505cd9 files/elfutils-0.120-mkinstalldirs.patch 752
 RMD160 523cceb5a3d394ebba88cb5bdb6e0b41daf9e6da files/elfutils-0.120-mkinstalldirs.patch 752
 SHA256 73cd540e3a473b145d0efa227d8744fcef531834f2b730dd1cfc191b86872ffb files/elfutils-0.120-mkinstalldirs.patch 752
-AUX elfutils-0.122-aux-config-dir.patch 1070 RMD160 b4e378e912bc9ab04938133d467b0899b9a13df7 SHA1 89ef05f9a21e5192f1ff37da4435a782fec9c0c3 SHA256 dea547cf5c2d3d6da10b2a68c9fa4e8bb5e3f1a1112a946b1e796c25790447d9
-MD5 84d5c25eb87df611293730d816b5e882 files/elfutils-0.122-aux-config-dir.patch 1070
-RMD160 b4e378e912bc9ab04938133d467b0899b9a13df7 files/elfutils-0.122-aux-config-dir.patch 1070
-SHA256 dea547cf5c2d3d6da10b2a68c9fa4e8bb5e3f1a1112a946b1e796c25790447d9 files/elfutils-0.122-aux-config-dir.patch 1070
 DIST elfutils-0.108-robustify3.patch.bz2 10811 RMD160 31660eba01bf6469db01bb704ca7e90b56e69286 SHA1 b9110fc90a47a65150c63d661aeeebe3e581ffd6 SHA256 acdd745bbc82937b5252775b9ae951fa3fc8e98f1d8b5524ddbf30f5bd16ebee
 DIST elfutils-0.108.robustify.patch.bz2 5637 RMD160 f5f24712649b2d85e695e24ca38d7871745be6c8 SHA256 7ca7ffcb5368bfa03dc3da2a70153d9a13c6b6cc675bcd05edd589d13f94a84c
 DIST elfutils-0.108.tar.gz 938036 RMD160 ac7a1314fd9d18413670ce46d0558e8399d1b32e SHA1 6d161774605083759e8764a649e685d41e2b2b7c SHA256 794070c8108a2d8b7c6890ba42edb37510cc845bf601517cf4a0ea5443dfde29
@@ -62,14 +58,14 @@ EBUILD elfutils-0.120.ebuild 1767 RMD160 77414fb3f597a4848c72a1bea7d72dbe9e7f215
 MD5 ca0cef81ab839443d9849bc167b75b89 elfutils-0.120.ebuild 1767
 RMD160 77414fb3f597a4848c72a1bea7d72dbe9e7f2155 elfutils-0.120.ebuild 1767
 SHA256 e8fee4eb361337c948ee079681837fccf761a8884196df85201149a50ed89960 elfutils-0.120.ebuild 1767
-EBUILD elfutils-0.122.ebuild 1874 RMD160 e3e35af475106bd58306154f2be88677c61b54a6 SHA1 ec0dc5c472e7401713ced474ec521f98ecc64485 SHA256 8f73e73b7de2da6acd3e528fe0ac04310587411bcf960addf83aac5cdcdc5d00
-MD5 3bccc2e4b2f5eb6411c5e7ae68033796 elfutils-0.122.ebuild 1874
-RMD160 e3e35af475106bd58306154f2be88677c61b54a6 elfutils-0.122.ebuild 1874
-SHA256 8f73e73b7de2da6acd3e528fe0ac04310587411bcf960addf83aac5cdcdc5d00 elfutils-0.122.ebuild 1874
-MISC ChangeLog 11246 RMD160 eea66d79a01c912e603108f55adcd60fec399b2f SHA1 ef4be9c840d3f2270b8d645f25b57847911d0e07 SHA256 6fe3a2ecffa400b323f480a1ba961f9d12126f2adadecee6eaa16b28fb859682
-MD5 8e9d55b433191adf191dfbf6b9a6f0a2 ChangeLog 11246
-RMD160 eea66d79a01c912e603108f55adcd60fec399b2f ChangeLog 11246
-SHA256 6fe3a2ecffa400b323f480a1ba961f9d12126f2adadecee6eaa16b28fb859682 ChangeLog 11246
+EBUILD elfutils-0.122.ebuild 1820 RMD160 62b2e017e4ea2289648001bbb9897458a93d107c SHA1 933d8b47401a99b36d30c9285b547e9a538c7c12 SHA256 22d4969cfb1e7c08049e9d2608cff641428474f717d2fa4c69050fd6ae3acde1
+MD5 ec83197a8806d4195d431b72bfbf7a0b elfutils-0.122.ebuild 1820
+RMD160 62b2e017e4ea2289648001bbb9897458a93d107c elfutils-0.122.ebuild 1820
+SHA256 22d4969cfb1e7c08049e9d2608cff641428474f717d2fa4c69050fd6ae3acde1 elfutils-0.122.ebuild 1820
+MISC ChangeLog 11084 RMD160 30aede9e89012fdb9a9b2fa929812c77b452bbbb SHA1 66a84e066d33863ed7d763f3e51d79cd19550f9c SHA256 a0c2a556ea4c9c0f6fb6f4f16db7b9a4d0123dd8cf010180401c68681bd841e9
+MD5 d5de248d476243dbeb15a3a1cbb00cff ChangeLog 11084
+RMD160 30aede9e89012fdb9a9b2fa929812c77b452bbbb ChangeLog 11084
+SHA256 a0c2a556ea4c9c0f6fb6f4f16db7b9a4d0123dd8cf010180401c68681bd841e9 ChangeLog 11084
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -92,7 +88,7 @@ SHA256 1373a75ec1e6a60794319a8143d0aabf8ec013149311b5665bd5bc024e4c3a4c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE02kBamhnQswr0vIRAtcvAKCxQJGYb352guMD5edtlI1wrvERdwCfYvJI
-aku+i6MK9E7CsqHqjjItERs=
-=5W+w
+iD8DBQFE1QlWamhnQswr0vIRAl1bAKCCaYESpvbsqDUE82teoaEMBKq+ywCgriPJ
+BeEy5NtIQgh7zDF/5nAmW9c=
+=NhI+
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/elfutils/files/elfutils-0.122-aux-config-dir.patch b/dev-libs/elfutils/files/elfutils-0.122-aux-config-dir.patch
deleted file mode 100644
index 9632674a21ca..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.122-aux-config-dir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -19,7 +19,7 @@
- AC_INIT([Red Hat elfutils],[0.122],[http://bugzilla.redhat.com/bugzilla/],
- 	[elfutils])
- 
--AC_CONFIG_AUX_DIR([config])
-+AC_CONFIG_AUX_DIR([$PWD/config])
- AC_CONFIG_FILES([config/Makefile])
- 
- AC_COPYRIGHT([Copyright (C) 1996-2003, 2004, 2005, 2006 Red Hat, Inc.])
---- libelf-po/Makefile.in.in
-+++ libelf-po/Makefile.in.in
-@@ -28,7 +28,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
---- po/Makefile.in.in
-+++ po/Makefile.in.in
-@@ -28,7 +28,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@