gentoo resync : 28.04.2021

10 files changed, 52 insertions, 54 deletions

diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index b4d01513a0f2..770fb5d64c44 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -1,11 +1,11 @@
-AUX mhash-0.9.9-autotools-namespace-stomping.patch 3087 BLAKE2B fc603a771f074f35ea6a95f5c8bbf8964c9310cee1c04a77189b3416414ccb0b6924988602bdfd3bbaefeca16a93d289a8379325c8288cabc70acabf05f79f88 SHA512 f32bcbf244aa38755b99c0bb1b328974a9dc6b927bf56073061821827f7b2017c98eb042d11f52d0befb654c58db6540fe1bec0ce7d5f980bfd26914ac49b596
-AUX mhash-0.9.9-fix-mem-leak.patch 1016 BLAKE2B 33037f2d2ed56b22b70ff9f6fd97d885476afa3a7c140533fab983c7bcbf11b9b34e78437685ac9d4bf0fe5d0872053543f266634417bc4f098b388316a1097a SHA512 2255a24f1053ef657750196fbf3e07cb68fc630db5d07356e048a4470a99b2eeeb932a7ecc344211b08bb705a176083f7f36bf0cf245ae684d8cc76b37dcbac0
-AUX mhash-0.9.9-fix-snefru-segfault.patch 1005 BLAKE2B f505dc18602d20772fdc8ea3756a2650848adb53c469da94ad5d373ae2de629dd133591f0771dd14b86b4f02e87937e3097a3afbe7f0c2d1ce9533e85ebeab19 SHA512 20f23f4d3ba20b61942e09915fa3e355f679f3e9747fec888d1c576c0e7144611b432cf005184938b86d080d8e626bc31af6ea2877762ec3e3205563b5cbfb09
-AUX mhash-0.9.9-fix-whirlpool-segfault.patch 1011 BLAKE2B c7c7a846fb50df6b1bfc6df33466dd3ba5468d5e833580542de4b30a1cc682805485a64f68d5c5dd42f1b133c88c64322f63294805cae910e31ec57cb0d63244 SHA512 4132174e3b1bf08a296fb36a1bc516eedc79d59c5bd5f17e32ddcf70ad243e24bc733fecafe9bbc3a776c573022496ab2593a0201d3576ebf94402588a4f4889
-AUX mhash-0.9.9.9-align.patch 3037 BLAKE2B d93a4bc58de7df96ed07fdefa066d368e342fff186c3282e25c4c2bd359187fe76aceb3e68e9748768c5cf594a25fb091870532ddae4eb3f9b6eb54ec3f7f73b SHA512 ce52d1caf3f9dc5bcc388aefacebb93fd422f905ab82f4d7aa6b66ac4ecfcbd32d576778cf3c0ad34f48461a016a08f2cc9ea7063fcb1f29b5188dea04f1ae03
-AUX mhash-0.9.9.9-alignment.patch 579 BLAKE2B 2865e4d035a145f84de68730fb86929e333c4b64ace3b4f7f220e4035423c8873b6ea66ade3d8ddd68fa49540ff02c53a262fb87c401fdecfba3921df25958ac SHA512 6272d5e346067861235b8c5cbb5f4ec1bbb1cd80910ea913860e09ed34661df02ed3d4ed9fa55e870d7e22827fad84cc56bb701195908acca435643018fe81d3
-AUX mhash-0.9.9.9-force64bit-tiger.patch 537 BLAKE2B b37015b12eb213cd91207163b6eb922e3c9956081505066a01ac64a3cceb8d5eaf802a125168f2f6c5d7c3d2a0e18cb6913a33a66d66edfe1e1336edf3bca173 SHA512 7ca2118569ad28107672f081fa4d06758bc78da48612ba31d6655e91ebf4928055b1643a012d60538b915b05d906adf23a8aeb3d7b9f5d8c12eaf1058b9f5454
-AUX mhash-0.9.9.9-remove_premature_free.patch 464 BLAKE2B 89569b1addc287dc6ccce15142ca2d7f228b78ff0fa3412482dbe1aa98e3dd20c1e6e360934018cdf605330b9c0480989bf898ff110d9a9236fbe3ae63e4e226 SHA512 f8f9814c39890f14e760c6600998b628db27ca52efd864be123b646425be1edd106179840d8720c36948cfe509d2b320fd98c2aee0b3fcc7ae1fac8ccdba792e
+AUX mhash-0.9.9-autotools-namespace-stomping.patch 2530 BLAKE2B 5eae2bcfb980d14b8182009e94411af4a3790c0157e3af3770b6de7a675cde0c54567a8181adafd75a948d97f9684db4f76afd5106bb91fe704245a718ced740 SHA512 43fa6e3fae374fa2787955b7989165108b86f3afd5410690ae2ade5d2c8f94c7920af5402aed1f374eae6bf5a5a1d934cf73bb53cf66f7fb124f52587781b8f7
+AUX mhash-0.9.9-fix-mem-leak.patch 920 BLAKE2B e88f6950966da40e4684727c1dbe3b27d85e5ac2e616d3aa2e6bf399e1525294da02b901990882d75d1de10f6b7d257b33512726a7f2165bda8bfd1f135f763f SHA512 e067306126eca1d5a12b5d535a9b5a4082e6998f3d8a2e8f5cbfc5c3948aedb32fb2991fe0875e8c7aa5c2f712f3e7bd22ac2067e4a538f8c920060ec69a7ea7
+AUX mhash-0.9.9-fix-snefru-segfault.patch 909 BLAKE2B 826eda1f578613cad4805ac62004ec5082fff135abe0f24e1293aefdf403a720ccc37f174415fd2327908445e3b34f45ce3fdbe8bd34cd0c4f6d1d36e4ed28d8 SHA512 7ee48a476411a0af3b8def4ec363d099f0cfeb601616954cec35dbd87e320ab9c0e159cc98355d2e6b2fd497629ab741ba5a14c14b4f383b2574a94d56c2e9f7
+AUX mhash-0.9.9-fix-whirlpool-segfault.patch 915 BLAKE2B 6ba9474d77a237df205943d38f54a23b53896f5ea29411fceb829696decaf61cdcc3d8f743c607be5be01d8a26593491521afaa0d0e2da3bb09ddeeb6599b863 SHA512 df5751e1e332d22f55327dc41505a2d98006e7c7248685a7de5beadbee555b03c578d4842f621766ead04919f1527bc56c75e9014ef27788e0c676d1700b8909
+AUX mhash-0.9.9.9-align.patch 2870 BLAKE2B ebb476db00de0ea7a816b0748c17be261a3a30decb4c9647acbf4cc223fea5c7adf1460742de9861d052a264498cd2680dd306f4ba0e1f64f14bafe39856954a SHA512 95f29f71da608943bdb0f3510fb9ceb7ab78221a446449024abb0dda95ac9f6629696f8f6ebfe076b235cb9f2d52571ae2e64beefbf4d196fcd94b6ced07d416
+AUX mhash-0.9.9.9-alignment.patch 412 BLAKE2B a08862c748f2b8591696481984e6cbcc3f3c310ba1cf0dda4a0e91571803b9a8be0567691f946300a61521c2b4a5236b303f929089a844283300d292f04fcea9 SHA512 4d42a8ca8e2ce21fe92ce2f85936e431e277e9e7b5430d9d2a254fe9bacd4ae95139f60b0a5af4a4d962965ca550e74fc45a4d357d3867f54bc523f9f74f9b1f
+AUX mhash-0.9.9.9-force64bit-tiger.patch 372 BLAKE2B cdce999eba8fea0ebb47b29297b71d014377db53c1cdf88c15f2075e6279e8e42031f94ce9f1987ed5c6b8cf4067f485b5ea298145961f06e4cb09ef8ec9a961 SHA512 cf31ca18afce576dcaa5b7a2a20567dc73ef750a193dfa35265508974bc17c54e967a02fb575047edcc190178a7533971d7f4980cd605714e9c0cefb4aa33186
+AUX mhash-0.9.9.9-remove_premature_free.patch 285 BLAKE2B 7245b1241bbb0001ac588554a3069b6665eeb424c2420dbb6948c68278036e0dec7c16f6a0bec059b54cadd617362e8086b918673d3063aa42598fba952aab26 SHA512 66dcdbfcbd298cde83ab026ff075a09b91662a17f48f9e6c41284513e7ccb398d34f3bef3b72c684a52b9bab43f0fe3d6a751403dc412e66814e5d6ae3160b31
 DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
-EBUILD mhash-0.9.9.9-r2.ebuild 1402 BLAKE2B 665c30a0c01fb73cb6dabca7c1356e063b7dd9410f9f8fcb82542aa4ced5d9c63d2a9551e730a75c41e27619de993e59e6d141212265f6c7ec5c955be870a145 SHA512 7d3c35c1bd18eaafdd33456048bc27bcc19034a583f5418ad6769b75a24de2dc61fe859c09106a06170ea531f21f9dd015e9e2692af6012bfa9ab5e413606b95
+EBUILD mhash-0.9.9.9-r2.ebuild 1526 BLAKE2B 4cddab684d661dcf9e91f5c91aa799db4e98ae73a4d0b642767eb39ff9c5e01bddaf2a2717a82ec7e029396a4ba154e319ea3d0a8d387458893415dfb2254df8 SHA512 22f11b8caa1ff40ee388089e76b735875aa930072217a2b5c60a6ff94133aee0e621bb82d7e9df8087a88fe72db8a4db2fb44acd9eb1ccb4433da22bd0dbf733
 MISC metadata.xml 240 BLAKE2B 930f7f4d63cd589f337e5fb82f0fd568e7b12917c1fbb663af43acb523311b683b7bd3e144af0673749143a5d7fa86f57e8bed96f87c32e054c28ae6bf8d768f SHA512 46b4040c549d189f732ec0752339b86521d8351f8d5529f272050722cb466e161772e5fd05db097e29a528786150aea5d78d80232d84cbf99521f4ff697d7a4a
diff --git a/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch b/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch
index 19981b6b9072..4bccf6765ae0 100644
--- a/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch
+++ b/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch
@@ -7,9 +7,8 @@ Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=221093
 Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=152625&action=view
 Signed-off-by: Peter Alfredson <loki_val@gentoo.org>
 
-diff -NrU5 mhash-0.9.9.orig/configure.in mhash-0.9.9/configure.in
---- mhash-0.9.9.orig/configure.in	2008-05-09 16:17:52.000000000 +0200
-+++ mhash-0.9.9/configure.in	2008-05-09 16:18:20.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -4,10 +4,11 @@
  AC_CANONICAL_TARGET
  AC_CONFIG_SRCDIR([lib/mhash.c])
@@ -22,9 +21,8 @@ diff -NrU5 mhash-0.9.9.orig/configure.in mhash-0.9.9/configure.in
  
  dnl Check system.
  
-diff -NrU5 mhash-0.9.9.orig/include/mutils/config.h.in mhash-0.9.9/include/mutils/config.h.in
---- mhash-0.9.9.orig/include/mutils/config.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ mhash-0.9.9/include/mutils/config.h.in	2008-05-09 16:18:20.000000000 +0200
+--- a/include/mutils/config.h.in
++++ b/include/mutils/config.h.in
 @@ -0,0 +1,22 @@
 +/* Name of package */
 +#undef PACKAGE
@@ -48,9 +46,8 @@ diff -NrU5 mhash-0.9.9.orig/include/mutils/config.h.in mhash-0.9.9/include/mutil
 +#undef VERSION
 +
 +
-diff -NrU5 mhash-0.9.9.orig/include/mutils/mhash_config.h.in mhash-0.9.9/include/mutils/mhash_config.h.in
---- mhash-0.9.9.orig/include/mutils/mhash_config.h.in	2008-05-09 16:17:52.000000000 +0200
-+++ mhash-0.9.9/include/mutils/mhash_config.h.in	2008-05-09 16:19:17.000000000 +0200
+--- a/include/mutils/mhash_config.h.in
++++ b/include/mutils/mhash_config.h.in
 @@ -179,28 +179,10 @@
  #undef MHASH_VERSION
  
diff --git a/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch b/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch
index 74552499501f..f6083eb180f5 100644
--- a/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch
+++ b/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch
@@ -14,8 +14,8 @@ Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255006
 Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178560
 Signed-off-by: Thomas Harning <harningt@gmail.com>
 
---- mhash-0.9.9/lib/mhash.c	2007-02-21 01:18:46.000000000 -0500
-+++ mhash-0.9.9-new/lib/mhash.c	2009-01-15 01:57:53.000000000 -0500
+--- a/lib/mhash.c
++++ b/lib/mhash.c
 @@ -719,6 +719,8 @@
  	mutils_memcpy( &ret->state_size, &mem[pos], sizeof(ret->state_size));
  	pos += sizeof( ret->state_size);
diff --git a/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch b/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch
index c308269c1b24..6e9e0275b025 100644
--- a/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch
+++ b/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch
@@ -14,8 +14,8 @@ Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255131
 Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178666&action=view
 Signed-off-by: Thomas Harning <harningt@gmail.com>
 
---- mhash-0.9.9/lib/snefru.c	2009-01-16 00:16:04.000000000 -0500
-+++ mhash-0.9.9-new/lib/snefru.c	2009-01-16 00:16:21.000000000 -0500
+--- a/lib/snefru.c
++++ b/lib/snefru.c
 @@ -859,6 +859,8 @@
  {
  	mutils_word32 i;
diff --git a/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch b/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch
index 6c79139d5793..8437e624b2ee 100644
--- a/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch
+++ b/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch
@@ -14,8 +14,8 @@ Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255131
 Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178667&action=view
 Signed-off-by: Thomas Harning <harningt@gmail.com>
 
---- mhash-0.9.9/lib/whirlpool.c	2006-01-08 03:14:47.000000000 -0500
-+++ mhash-0.9.9-new/lib/whirlpool.c	2009-01-16 00:17:34.000000000 -0500
+--- a/lib/whirlpool.c
++++ b/lib/whirlpool.c
 @@ -970,6 +970,8 @@
                      mutils_word8 * digest)
  {
diff --git a/app-crypt/mhash/files/mhash-0.9.9.9-align.patch b/app-crypt/mhash/files/mhash-0.9.9.9-align.patch
index 04bb310aa772..81486034cb6a 100644
--- a/app-crypt/mhash/files/mhash-0.9.9.9-align.patch
+++ b/app-crypt/mhash/files/mhash-0.9.9.9-align.patch
@@ -1,6 +1,5 @@
-diff -up mhash-0.9.9.9/lib/stdfns.c.BAD mhash-0.9.9.9/lib/stdfns.c
---- mhash-0.9.9.9/lib/stdfns.c.BAD	2009-07-02 16:38:43.217029623 -0400
-+++ mhash-0.9.9.9/lib/stdfns.c	2009-07-02 16:41:58.647120391 -0400
+--- a/lib/stdfns.c
++++ b/lib/stdfns.c
 @@ -152,6 +152,18 @@ mutils_bzero(void *s, __const mutils_wor
  	}
  }
diff --git a/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch b/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch
index 04df22167a3f..0df89bc84865 100644
--- a/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch
+++ b/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch
@@ -1,6 +1,5 @@
-diff -up mhash-0.9.9.9/lib/stdfns.c.BAD mhash-0.9.9.9/lib/stdfns.c
---- mhash-0.9.9.9/lib/stdfns.c.BAD	2009-07-21 12:05:40.139461097 -0400
-+++ mhash-0.9.9.9/lib/stdfns.c	2009-07-21 12:06:52.151190927 -0400
+--- a/lib/stdfns.c
++++ b/lib/stdfns.c
 @@ -378,6 +378,12 @@ mutils_memmove(void *dest, __const void 
  	bigptr1 = (mutils_word32 *) dest;
  	bigptr2 = (mutils_word32 *) src;
diff --git a/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch b/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch
index 2248bcc6a308..08f18d458285 100644
--- a/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch
+++ b/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch
@@ -1,6 +1,5 @@
-diff -up mhash-0.9.9.9/lib/tiger.c.BAD mhash-0.9.9.9/lib/tiger.c
---- mhash-0.9.9.9/lib/tiger.c.BAD	2009-07-02 16:42:47.683029940 -0400
-+++ mhash-0.9.9.9/lib/tiger.c	2009-07-02 16:43:46.085049317 -0400
+--- a/lib/tiger.c
++++ b/lib/tiger.c
 @@ -252,7 +252,9 @@ void tiger_update(struct tiger_ctx *ctx,
  void tiger_final(struct tiger_ctx *ctx)
  {
diff --git a/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch b/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch
index 5ed4ecbe6292..f81ec66b6f9c 100644
--- a/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch
+++ b/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch
@@ -1,6 +1,5 @@
-diff -ru mhash-0.9.9.9.orig/src/keygen_test.c mhash-0.9.9.9/src/keygen_test.c
---- mhash-0.9.9.9.orig/src/keygen_test.c	2007-02-21 07:39:08.000000000 +0100
-+++ mhash-0.9.9.9/src/keygen_test.c	2009-12-04 01:29:16.000000000 +0100
+--- a/src/keygen_test.c
++++ b/src/keygen_test.c
 @@ -121,8 +121,6 @@
  	
  	mhash_keygen_ext(KEYGEN_S2K_SALTED, data, key, keysize, password, passlen);
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index 7e884b399b2c..55e78bbb25fe 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -3,41 +3,45 @@
 
 EAPI=7
 
-DESCRIPTION="library providing a uniform interface to a large number of hash algorithms"
+inherit autotools
+
+DESCRIPTION="Library providing a uniform interface to a large number of hash algorithms"
 HOMEPAGE="http://mhash.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl" # pod2html
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.9.9-fix-mem-leak.patch"
-	"${FILESDIR}/${PN}-0.9.9-fix-snefru-segfault.patch"
-	"${FILESDIR}/${PN}-0.9.9-fix-whirlpool-segfault.patch"
-	"${FILESDIR}/${PN}-0.9.9-autotools-namespace-stomping.patch"
-	"${FILESDIR}/${P}-remove_premature_free.patch"
-	"${FILESDIR}/${P}-force64bit-tiger.patch"
-	"${FILESDIR}/${P}-align.patch"
-	"${FILESDIR}/${P}-alignment.patch"
+	"${FILESDIR}"/${PN}-0.9.9-fix-mem-leak.patch
+	"${FILESDIR}"/${PN}-0.9.9-fix-snefru-segfault.patch
+	"${FILESDIR}"/${PN}-0.9.9-fix-whirlpool-segfault.patch
+	"${FILESDIR}"/${PN}-0.9.9-autotools-namespace-stomping.patch
+	"${FILESDIR}"/${P}-remove_premature_free.patch
+	"${FILESDIR}"/${P}-force64bit-tiger.patch
+	"${FILESDIR}"/${P}-align.patch
+	"${FILESDIR}"/${P}-alignment.patch
 )
 
-DOCS=(
-	doc/example.c
-	doc/skid2-authentication
-)
-HTML_DOCS=(
-	doc/mhash.html
-)
+DOCS=( doc/example.c doc/skid2-authentication )
+
+HTML_DOCS=( doc/mhash.html )
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e 's/--netscape//' \
 		"${S}"/doc/Makefile.in || die
+
+	# Refresh bundled libtool (ltmain.sh)
+	# (elibtoolize is not sufficient)
+	# bug #668666
+	eautoreconf
 }
 
 src_configure() {
@@ -49,10 +53,11 @@ src_configure() {
 
 src_compile() {
 	default
+
 	emake -C doc mhash.html
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }