Add patch to use stdlib.h instead of malloc.h, add ~x86-macos keyword. Bug 331973 by Mark Kowarsky.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 57 insertions, 3 deletions

diff --git a/app-crypt/mcrypt/ChangeLog b/app-crypt/mcrypt/ChangeLog
index 561564c28390..3c21532edbdd 100644
--- a/app-crypt/mcrypt/ChangeLog
+++ b/app-crypt/mcrypt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/mcrypt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/ChangeLog,v 1.27 2009/05/18 18:25:01 arfrever Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/ChangeLog,v 1.28 2010/08/10 17:58:46 darkside Exp $
+
+*mcrypt-2.6.8-r1 (10 Aug 2010)
+
+  10 Aug 2010; Jeremy Olexa <darkside@gentoo.org> +mcrypt-2.6.8-r1.ebuild,
+  +files/mcrypt-2.6.8-stdlib.h.patch:
+  Add patch to use stdlib.h instead of malloc.h, add ~x86-macos keyword. Bug
+  331973 by Mark Kowarsky.
 
 *mcrypt-2.6.8 (18 May 2009)
 
diff --git a/app-crypt/mcrypt/Manifest b/app-crypt/mcrypt/Manifest
index b0ab57479adf..35540fba9304 100644
--- a/app-crypt/mcrypt/Manifest
+++ b/app-crypt/mcrypt/Manifest
@@ -1,7 +1,9 @@
 AUX mcrypt-2.6.7-qa.patch 736 RMD160 de0f4b32c3041fcbce0c30bbb70a6b2b928ba3ee SHA1 121fe762d6d43f3847c9a8f65ec6d7d7cc38c36e SHA256 8cf4a65124e6354797e7c37f54a182758d3b24f1789c04948ab71dde6309c643
+AUX mcrypt-2.6.8-stdlib.h.patch 278 RMD160 8109aaddadf5dc86bd08e86d0e4c6d49cb5308a0 SHA1 99910ae2483cc69ed65056009a48927493ee1c48 SHA256 6eaa02ee63c8bf9fc4d5e9307896ed829ce23c01a34de2b2293fc36b1f6ddf26
 DIST mcrypt-2.6.7.tar.gz 512525 RMD160 f8f3ab4575c2e8812d4bfc9c809625f38ba96b50 SHA1 7ee1c07efef2a4489b9777ae4aede94dedececd2 SHA256 9f6955aa3a77b870e22868585288038fc97db4bc9fcdf5100a489db305331786
 DIST mcrypt-2.6.8.tar.gz 471915 RMD160 5115c679ee5d34b9fb9e976c12240c48370df514 SHA1 8ae0e866714fbbb96a0a6fa9f099089dc93f1d86 SHA256 5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098
 EBUILD mcrypt-2.6.7.ebuild 794 RMD160 7ceec0df37e9680a3f4ffa8d9d95700dcdd26abe SHA1 7d813381375b7e83f8a8e4ece74c7507c8f12002 SHA256 29fdd31a244cb59ca969358446999906b4a84fade831a98ddc045b3f5b5f693f
+EBUILD mcrypt-2.6.8-r1.ebuild 826 RMD160 b7b87772d74b0fc35695e34dd6037c3c4d80b021 SHA1 c4a4cf330dea631e270947551335302b7368ef3c SHA256 62c314b0c41afd1cbbfb9f4b1b387b2f0bbb7b79bfd184a79aba2090d8f7c294
 EBUILD mcrypt-2.6.8.ebuild 770 RMD160 f163529b530be131cb782a584df63960f0f5196a SHA1 a00a42d29fa3685012fba0d088cf599aac0086fd SHA256 9bf0146ac3c758a09c87e2758615cae871c83c11bdebca25dd1d0b6ef29fcf9a
-MISC ChangeLog 3128 RMD160 543336867203d0f735f02e0cb17a3c84102da53a SHA1 efe915c106d3e5b11840b33c32201ae02b972de4 SHA256 06a3da338ffa9b1baa62ea874b93386b0c22af2b037048134f0961f0bcdb3efd
+MISC ChangeLog 3378 RMD160 41e6e411dc98f63320b244606adfabbcec0f2a9f SHA1 0df4f0e292f93a15716caf77e3d8ba7693c929b5 SHA256 bde631f6641b753150675b490613b02be038a6b7ea5fb68fc74ecdb21ead3ea1
 MISC metadata.xml 278 RMD160 a7f296a5304f80db941e44613607bcc3b6c8fc0a SHA1 e92b5ba90ebad3046c7459e88a5be4a5c8563c2d SHA256 cdf12b5eab3aa2d9fc1e9fc4bb81ad42131e7d5e25483b7672a03fc3e486cda6
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
new file mode 100644
index 000000000000..39e6ab8bec85
--- /dev/null
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
@@ -0,0 +1,11 @@
+--- ../mcrypt-2.6.8_old/src/rfc2440.c	2008-11-17 06:50:01.000000000 +1100
++++ src/rfc2440.c	2010-08-10 13:48:28.000000000 +1000
+@@ -23,7 +23,7 @@
+ #include <zlib.h>
+ #endif
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ #include "xmalloc.h"
+ #include "keys.h"
diff --git a/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild b/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild
new file mode 100644
index 000000000000..ef861e7a0cd8
--- /dev/null
+++ b/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild,v 1.1 2010/08/10 17:58:46 darkside Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="replacement of the old unix crypt(1)"
+HOMEPAGE="http://mcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-macos"
+IUSE="nls"
+
+DEPEND=">=dev-libs/libmcrypt-2.5.8
+	>=app-crypt/mhash-0.9.9"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.6.7-qa.patch"
+	epatch "${FILESDIR}/${P}-stdlib.h.patch"
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README THANKS TODO
+}