New rev with alignment fixes and sparc stable wrt #181563

Package-Manager: portage-2.1.2.9

5 files changed, 187 insertions, 9 deletions

diff --git a/app-crypt/mhash/ChangeLog b/app-crypt/mhash/ChangeLog
index f187ea928d27..81856d0ecbcf 100644
--- a/app-crypt/mhash/ChangeLog
+++ b/app-crypt/mhash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/mhash
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/ChangeLog,v 1.46 2007/06/14 01:59:48 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/ChangeLog,v 1.47 2007/07/25 21:05:26 gustavoz Exp $
+
+*mhash-0.9.9-r1 (25 Jul 2007)
+
+  25 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  +files/mhash-0.9.9-mutils-align.patch, +mhash-0.9.9-r1.ebuild:
+  New rev with alignment fixes and sparc stable wrt #181563
 
   14 Jun 2007; Christoph Mende <angelos@gentoo.org> mhash-0.9.9.ebuild:
   Stable on amd64 wrt bug 181563
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index e7fe1599dd01..30f743339598 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -5,6 +5,10 @@ AUX mhash-0.9.3-mhash_free.patch 488 RMD160 85cf740248cdd2f106ade419c82d6f8d99bc
 MD5 d27bb1251e5f7314b085056b0c28a600 files/mhash-0.9.3-mhash_free.patch 488
 RMD160 85cf740248cdd2f106ade419c82d6f8d99bc88e3 files/mhash-0.9.3-mhash_free.patch 488
 SHA256 9f1e1458c74e33d33f3698c394fd3cb50e9a3ab8f9db1ca163985f80442f4314 files/mhash-0.9.3-mhash_free.patch 488
+AUX mhash-0.9.9-mutils-align.patch 2650 RMD160 fe4e9b8ec059e543c5bd2441d80a55eb528ef8a6 SHA1 4ef024457d8659b72a3a0cbed564bd3ec30437b8 SHA256 df3e872dd7cf42db77b9857619cd1c00710d1396c76c08b7e79ca7b53d54d123
+MD5 c53dede088c53055a33b7f289099d146 files/mhash-0.9.9-mutils-align.patch 2650
+RMD160 fe4e9b8ec059e543c5bd2441d80a55eb528ef8a6 files/mhash-0.9.9-mutils-align.patch 2650
+SHA256 df3e872dd7cf42db77b9857619cd1c00710d1396c76c08b7e79ca7b53d54d123 files/mhash-0.9.9-mutils-align.patch 2650
 DIST mhash-0.9.1.tar.gz 371330 RMD160 cc5cf781a629af053cb3b85500ba41c08bf14a91 SHA1 443f8d17a61d8abf4e16d0787045633eea147043 SHA256 d716c4ffd70e01392fbc5cace15dfdc1bb3287aee9020ac691587eb100cdb1c2
 DIST mhash-0.9.2.tar.gz 853662 RMD160 d42fe04a9c0f5c5a1e3a6fb15b89be043de678f8 SHA1 2b1b377264386a305cf896452aa2c5563d414098 SHA256 50a471c543407e44947ad74496ab78843d53db66ae06ec0f9f3cd393ca9f1917
 DIST mhash-0.9.3.tar.gz 1021016 RMD160 4c835544593352e17a17eb30c178e502e21b0674 SHA1 12881733726b0f6a6159def3e7b6aed9436b47ad SHA256 1e10d5a8136fec1859175c001e9c9355cf5507d9c0cd2bfe5e615311908a64b2
@@ -30,14 +34,18 @@ EBUILD mhash-0.9.8.1.ebuild 973 RMD160 c62465ddab2c0616d06a976d92807f8a292672a4
 MD5 b83fd415a50c28dd2849430a9d50e0f7 mhash-0.9.8.1.ebuild 973
 RMD160 c62465ddab2c0616d06a976d92807f8a292672a4 mhash-0.9.8.1.ebuild 973
 SHA256 8e1edb7046801b0172db1206b4177af627d98ef899cec795340acd9e471957ea mhash-0.9.8.1.ebuild 973
+EBUILD mhash-0.9.9-r1.ebuild 1097 RMD160 77a70c5a94c98db1c0528765b9dca391828ba879 SHA1 6baad52b63a08c372449073e687a289247d55c1e SHA256 5203d9648bb26a3876f72b7be1c5f23d208f893457dcde4ba5177f2c6b4b22fa
+MD5 17b6446a61fc266277e1467cad616572 mhash-0.9.9-r1.ebuild 1097
+RMD160 77a70c5a94c98db1c0528765b9dca391828ba879 mhash-0.9.9-r1.ebuild 1097
+SHA256 5203d9648bb26a3876f72b7be1c5f23d208f893457dcde4ba5177f2c6b4b22fa mhash-0.9.9-r1.ebuild 1097
 EBUILD mhash-0.9.9.ebuild 958 RMD160 20a96bfaf39f5184bf4605bbca645d64a7fbf5df SHA1 3c72997df5417590a774b2c5448eb3e8e0bd2691 SHA256 a1a41a8f7e03e6559943a36227c931a329ef8ef4a8a03dccaab51710326a39c8
 MD5 73ba0faefe00838d26932026f0ecb1f4 mhash-0.9.9.ebuild 958
 RMD160 20a96bfaf39f5184bf4605bbca645d64a7fbf5df mhash-0.9.9.ebuild 958
 SHA256 a1a41a8f7e03e6559943a36227c931a329ef8ef4a8a03dccaab51710326a39c8 mhash-0.9.9.ebuild 958
-MISC ChangeLog 5603 RMD160 43329fed8c00dde89179d2a87d68959bd8106bb7 SHA1 fceb54fd3bcb7eddc461542761da2998ecaf10ca SHA256 47d2f96db678439f183120149ed9e7a4750e8115b0725ea2622adbc2b26280e6
-MD5 b7476c90c2f8af56071b067105e33c66 ChangeLog 5603
-RMD160 43329fed8c00dde89179d2a87d68959bd8106bb7 ChangeLog 5603
-SHA256 47d2f96db678439f183120149ed9e7a4750e8115b0725ea2622adbc2b26280e6 ChangeLog 5603
+MISC ChangeLog 5815 RMD160 6a13a57746c746fb38313e96eede574bf2a81b5e SHA1 46081cac15c3a4b41f5a5c71e273c4ce9ae44c31 SHA256 649673a8a7425da9826e1e5e36fa234f147086feaae33b3777f0e8b6e1522bc1
+MD5 b9003e0af7997fc03ec18cce79336fff ChangeLog 5815
+RMD160 6a13a57746c746fb38313e96eede574bf2a81b5e ChangeLog 5815
+SHA256 649673a8a7425da9826e1e5e36fa234f147086feaae33b3777f0e8b6e1522bc1 ChangeLog 5815
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
 MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f metadata.xml 279
@@ -60,10 +68,13 @@ SHA256 aeaff7b8aa448308f5322f5b052b8e5926ff2d302c4c21c33af8d0c209c10725 files/di
 MD5 338305b04f8b624e449bf44ab5b5a3f4 files/digest-mhash-0.9.9 235
 RMD160 a73b36161a0024e1006aefcf5d7e0de93f7c4888 files/digest-mhash-0.9.9 235
 SHA256 88833660a01c056262d96859d300a4e5330ad685070572ba3562e12fcdd7dc98 files/digest-mhash-0.9.9 235
+MD5 338305b04f8b624e449bf44ab5b5a3f4 files/digest-mhash-0.9.9-r1 235
+RMD160 a73b36161a0024e1006aefcf5d7e0de93f7c4888 files/digest-mhash-0.9.9-r1 235
+SHA256 88833660a01c056262d96859d300a4e5330ad685070572ba3562e12fcdd7dc98 files/digest-mhash-0.9.9-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFGft4ap/wUKkr7RBoRAsCdAKC7wtSC+LmiHnB2x26/nNOvbwkBCgCfdlbg
-96f6Hj0/0qWRO2tFx5O6Oz4=
-=/WhE
+iD8DBQFGp7sZKRy60XGEcJIRAvEJAJ9O15rqxGlB0PheLuAsAuEKsW0vogCgiv1+
+98ws4NMJqkVUjP78oySxzXs=
+=uX6H
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/mhash/files/digest-mhash-0.9.9-r1 b/app-crypt/mhash/files/digest-mhash-0.9.9-r1
new file mode 100644
index 000000000000..4a1e2860d87c
--- /dev/null
+++ b/app-crypt/mhash/files/digest-mhash-0.9.9-r1
@@ -0,0 +1,3 @@
+MD5 955667f04d89ad28ea0b5eecb9ce0b1e mhash-0.9.9.tar.gz 919622
+RMD160 8bca6a7bbfafb4098a829b60f7027c2de0fa0e10 mhash-0.9.9.tar.gz 919622
+SHA256 a61d4f30f3377afd41e316e53f1d6a9a829f34d20add0e4bb29752cb01435c77 mhash-0.9.9.tar.gz 919622
diff --git a/app-crypt/mhash/files/mhash-0.9.9-mutils-align.patch b/app-crypt/mhash/files/mhash-0.9.9-mutils-align.patch
new file mode 100644
index 000000000000..32d80805f5f7
--- /dev/null
+++ b/app-crypt/mhash/files/mhash-0.9.9-mutils-align.patch
@@ -0,0 +1,118 @@
+diff -ur mhash-0.9.9.orig/lib/stdfns.c mhash-0.9.9/lib/stdfns.c
+--- mhash-0.9.9.orig/lib/stdfns.c	Wed Apr  4 21:18:42 2007
++++ mhash-0.9.9/lib/stdfns.c	Mon May 28 16:08:38 2007
+@@ -152,12 +152,23 @@
+ 	}

+ }

+ 

++static void

++mutils_memset8(void *s, __const mutils_word8 c, __const mutils_word32 n)

++{

++	mutils_word8 *stmp = s;

++	mutils_word32 i;

++

++	for (i = 0; i < n; i++, stmp++)

++	{

++		*stmp = c;

++	}

++}

++

+ WIN32DLL_DEFINE

+ void

+ mutils_memset(void *s, __const mutils_word8 c, __const mutils_word32 n)

+ {

+-	mutils_word8 *stmp;

+-	mutils_word32 *ltmp = (mutils_word32 *) s;

++	mutils_word32 *ltmp;

+ 	mutils_word32 lump;

+ 	mutils_word32 i;

+ 	mutils_word32 words;

+@@ -168,10 +179,22 @@
+ 		return;

+ 	}

+ 

++	if (n < 16)

++	{

++		return mutils_memset8(s, c, n);

++	}

++

++	/* unaligned portion at beginning */

++	remainder = (-(mutils_word32)s) & 0x3;

++	mutils_memset8(s, c, remainder);

++

++	/* aligned words in the middle */

++	ltmp = (mutils_word32 *) (s + remainder);

++

+ 	lump = (c << 24) + (c << 16) + (c << 8) + c;

+ 

+-	words = n >> 2;

+-	remainder = n - (words << 2);

++	words = (n - remainder) >> 2;

++	remainder = n - remainder - (words << 2);

+ 

+ 	for (i = 0; i < words; i++, ltmp++)

+ 	{

+@@ -178,12 +201,8 @@
+ 		*ltmp = lump;

+ 	}

+ 

+-	stmp = (mutils_word8 *) ltmp;

+-

+-	for (i = 0; i < remainder; i++, stmp++)

+-	{

+-		*stmp = c;

+-	}

++	/* unaligned portion at end */

++	return mutils_memset8(ltmp, c, remainder);

+ }

+ 

+ static void

+@@ -275,6 +294,9 @@
+ 	mutils_word32 *buffer;

+ 	mutils_word32 *ptrIn;

+ 	mutils_word32 *ptrOut;

++	mutils_word8 *ptr8In;

++	mutils_word8 *ptr8Out;

++	mutils_word8 tmp8;

+ 	mutils_word32 count = n * 4;

+ 

+ 	if (destructive == MUTILS_FALSE)

+@@ -295,10 +317,36 @@
+  * data on a little-endian machine.

+  */

+ 

+-	for (loop = 0, ptrIn = x, ptrOut = buffer; loop < n; loop++, ptrOut++, ptrIn++)

++	if ((mutils_word32)x & 0x3)

+ 	{

+-		*ptrOut = mutils_lend32(*ptrIn);

++	  ptr8In = (mutils_word8 *) x;

++	  ptr8Out = (mutils_word8 *) buffer;

++	  for (loop = 0; loop < n; loop++)

++	    {

++#ifdef WORDS_BIGENDIAN

++	      tmp8 = ptr8In[0];

++	      ptr8Out[0] = ptr8In[3];

++	      ptr8Out[3] = tmp8;

++	      tmp8 = ptr8In[1];

++	      ptr8Out[1] = ptr8In[2];

++	      ptr8Out[2] = tmp8;

++#else

++	      ptr8Out[0] = ptr8In[0];

++	      ptr8Out[1] = ptr8In[1];

++	      ptr8Out[2] = ptr8In[2];

++	      ptr8Out[3] = ptr8In[3];

++#endif

++	      ptr8Out += 4;

++	      ptr8In += 4;

++	    }

+ 	}

++	else

++	{

++		for (loop = 0, ptrIn = x, ptrOut = buffer; loop < n; loop++, ptrOut++, ptrIn++)

++		{

++			*ptrOut = mutils_lend32(*ptrIn);

++		}

++	}

+ 

+ 	return(buffer);

+ }

diff --git a/app-crypt/mhash/mhash-0.9.9-r1.ebuild b/app-crypt/mhash/mhash-0.9.9-r1.ebuild
new file mode 100644
index 000000000000..0c346b9cd3a5
--- /dev/null
+++ b/app-crypt/mhash/mhash-0.9.9-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/mhash-0.9.9-r1.ebuild,v 1.1 2007/07/25 21:05:26 gustavoz Exp $
+
+inherit eutils
+
+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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~sparc-fbsd ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	# Fix for issues in bug #181563
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/${P}-mutils-align.patch"
+}
+
+src_compile() {
+	econf \
+		--enable-static \
+		--enable-shared || die
+	emake || die "make failure"
+	cd doc && emake mhash.html || die "failed to build html"
+}
+
+src_install() {
+	dodir /usr/{bin,include,lib}
+	make install DESTDIR="${D}" || die "install failure"
+
+	dodoc AUTHORS INSTALL NEWS README TODO THANKS ChangeLog
+	dodoc doc/*.txt doc/skid* doc/*.c
+	dohtml doc/mhash.html || die "dohtml failed"
+}