USE="static-libs" and remove unnecessary libtool archive. Missing dev-lang/perl DEPEND for pod2html.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

3 files changed, 36 insertions, 28 deletions

diff --git a/app-crypt/mhash/ChangeLog b/app-crypt/mhash/ChangeLog
index 5d3f5ad67308..e24ed7372536 100644
--- a/app-crypt/mhash/ChangeLog
+++ b/app-crypt/mhash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/mhash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/ChangeLog,v 1.57 2011/02/06 05:28:23 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/ChangeLog,v 1.58 2011/07/29 06:23:45 ssuominen Exp $
+
+  29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> mhash-0.9.9.9.ebuild:
+  USE="static-libs" and remove unnecessary libtool archive. Missing
+  dev-lang/perl DEPEND for pod2html.
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> mhash-0.9.9.ebuild:
   Drop to ~mips
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index 817e08bb0d5b..bfb23c237cfb 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mhash-0.9.9-autotools-namespace-stomping.patch 3087 RMD160 1dc4a66354c00a1ad1c044abde20068a3be18653 SHA1 f5d97658847c84763ccf1571ff98db80025e34e1 SHA256 42dba3baa4c1fe43104b026c3ad4903e6ba2ee043268336a3e84a7b66cb8fa0e
 AUX mhash-0.9.9-fix-mem-leak.patch 1016 RMD160 f4158a4a13eb1a68a5f88f92e1dff25fde573344 SHA1 37be6b1514744672c1e7207d81f51c05f3b275ea SHA256 87cd9ce4cda5f1fd18f629595f8d468b3600586207bf2b4c37c7091382cfb3c0
 AUX mhash-0.9.9-fix-snefru-segfault.patch 1005 RMD160 6f69ac227b8aa1100a91aa12cfd2b119c15708a5 SHA1 07d76a6b4c7916e004568881248d60e7e92ecaca SHA256 f35b6aed2c48fcf7cc43c40475786d0d583b0fd38cf3fa470f6c7d139d51864f
@@ -6,7 +9,14 @@ AUX mhash-0.9.9-mutils-align.patch 2650 RMD160 fe4e9b8ec059e543c5bd2441d80a55eb5
 DIST mhash-0.9.9.9.tar.gz 931437 RMD160 846f3875bd5aba100ae64bbb6c658338ba1cdb79 SHA1 c898de5ea60d9e0873a1b73caa031bb1b5797c03 SHA256 3dcad09a63b6f1f634e64168dd398e9feb9925560f9b671ce52283a79604d13e
 DIST mhash-0.9.9.tar.gz 919622 RMD160 8bca6a7bbfafb4098a829b60f7027c2de0fa0e10 SHA1 81fddd3b127232b3b3db8aea5b9154d64517c161 SHA256 a61d4f30f3377afd41e316e53f1d6a9a829f34d20add0e4bb29752cb01435c77
 EBUILD mhash-0.9.9-r1.ebuild 1096 RMD160 6054ce091f43cb37a8004fe473e93cfc1806bb08 SHA1 ebcf5e0cc0995ff4e52611ae5b369c5b898152b2 SHA256 e24a50fafda9cc138d3013954e1349c2910375750a5cb5796b6c51149f12005e
-EBUILD mhash-0.9.9.9.ebuild 1444 RMD160 bd867a6fc32a5a8d008ddc1f274886b613bbf652 SHA1 922be51148ea77e21931442ab848a554fcaff3c4 SHA256 bdc73a2bba2864fd2eccdebe504cfda8950063fe9981457ad66b2ab096fe4c48
+EBUILD mhash-0.9.9.9.ebuild 1231 RMD160 b4b45222e9e74eb1841e0ce28405c027b6453f3b SHA1 4d44b2e921628c65a292ac63d171c3a559ced921 SHA256 1ae04569e800e886f1f8717fd221320a78d79f07cec28c614b1b6d18694aea47
 EBUILD mhash-0.9.9.ebuild 958 RMD160 e0a681eae99e37aa4bf5f9ff8d5f6ca33cf27e71 SHA1 db1f439695e9235b98445d8419491947d8177403 SHA256 7cc23a8e01ab1f2f5e7132c73843942f7720b2a103fbc4807ab2e1bf0db5814e
-MISC ChangeLog 7247 RMD160 bf23f99aaeb698ab7578af4a2624b0d950a19fea SHA1 656a7bd474575599d9422fa022b8334734cb8896 SHA256 054066204178473fdff530c714ff9ab2b957f738d90ee0bf4ed734bb89227726
+MISC ChangeLog 7434 RMD160 a848226215efd6062ce36e10cc4e47d8c3bb84c5 SHA1 8c78a34bf8a2d06e0d022cd1ec7fe668a6a13efc SHA256 6d70d998c948f8f19a396e53733fef23d2806df308a353845b547c100a8bafc6
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4yUXQACgkQXkR9YqOcLPGqRwD+MXlKwju67mAVlEVTLko+stll
+aoom38NYOLLGmSv3CxoBAI6r3re6d2KUMymukMmfo8KYONcLu2r4kgtTR3lfpzk4
+=ZLwt
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/mhash/mhash-0.9.9.9.ebuild b/app-crypt/mhash/mhash-0.9.9.9.ebuild
index 2aea6095b18f..f453c2196cf8 100644
--- a/app-crypt/mhash/mhash-0.9.9.9.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.9.ebuild,v 1.2 2010/04/01 08:42:53 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/mhash-0.9.9.9.ebuild,v 1.3 2011/07/29 06:23:45 ssuominen Exp $
 
+EAPI=4
 inherit eutils
 
 DESCRIPTION="library providing a uniform interface to a large number of hash algorithms"
@@ -11,37 +12,30 @@ 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 ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
+IUSE="static-libs"
 
-DEPEND=""
 RDEPEND=""
+DEPEND="dev-lang/perl" # pod2html
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix for issues in bug #181563
-	#epatch "${FILESDIR}/${PN}-0.9.9-mutils-align.patch"
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.9-fix-{mem-leak,snefru-segfault,whirlpool-segfault}.patch \
+		"${FILESDIR}"/${PN}-0.9.9-autotools-namespace-stomping.patch
+}
 
-	epatch "${FILESDIR}"/${PN}-0.9.9-fix-mem-leak.patch
-	epatch "${FILESDIR}"/${PN}-0.9.9-fix-snefru-segfault.patch
-	epatch "${FILESDIR}"/${PN}-0.9.9-fix-whirlpool-segfault.patch
-	epatch "${FILESDIR}"/${PN}-0.9.9-autotools-namespace-stomping.patch
+src_configure() {
+	econf $(use_enable static-libs static)
 }
 
 src_compile() {
-	econf \
-		--enable-static \
-		--enable-shared || die
-	emake || die "make failure"
-	cd doc && emake mhash.html || die "failed to build html"
+	default
+	emake -C doc mhash.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/skid* doc/*.c
-	dohtml doc/mhash.html || die "dohtml failed"
+	emake DESTDIR="${D}" install
+	use static-libs || rm -f "${ED}"usr/lib*/libmhash.la
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO \
+		doc/{example.c,skid2-authentication}
+	dohtml doc/mhash.html
 }