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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 54 insertions, 2 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/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
+}