summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-10-07 19:20:27 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-10-07 19:20:27 +0000
commit7ff98aeae2fbd0ab955d18d2b18c8b99b0d9f19b (patch)
tree6d92cd9bc63afb73ce1c81b85d813fa1f5341e94
parentStable on ppc64; bug #148500 (diff)
downloadgentoo-2-7ff98aeae2fbd0ab955d18d2b18c8b99b0d9f19b.tar.gz
gentoo-2-7ff98aeae2fbd0ab955d18d2b18c8b99b0d9f19b.tar.bz2
gentoo-2-7ff98aeae2fbd0ab955d18d2b18c8b99b0d9f19b.zip
malloc.h should not be included, stdlib.h instead should.
(Portage version: 2.1.2_pre2-r5)
-rw-r--r--app-arch/lha/ChangeLog8
-rw-r--r--app-arch/lha/files/lha-114i-malloc.patch6
-rw-r--r--app-arch/lha/lha-114i-r5.ebuild4
3 files changed, 10 insertions, 8 deletions
diff --git a/app-arch/lha/ChangeLog b/app-arch/lha/ChangeLog
index 02f1fdcd3ad8..a3cca32e0de1 100644
--- a/app-arch/lha/ChangeLog
+++ b/app-arch/lha/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/lha
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/ChangeLog,v 1.25 2005/10/30 20:14:52 grobian Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/ChangeLog,v 1.26 2006/10/07 19:20:27 flameeyes Exp $
+
+ 07 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+ files/lha-114i-malloc.patch, lha-114i-r5.ebuild:
+ malloc.h should not be included, stdlib.h instead should.
30 Oct 2005; Fabian Groffen <grobian@gentoo.org>
files/lha-114i-build.patch, files/lha-114i-malloc.patch:
diff --git a/app-arch/lha/files/lha-114i-malloc.patch b/app-arch/lha/files/lha-114i-malloc.patch
index 8c9d968a9d58..2a2a0daf045c 100644
--- a/app-arch/lha/files/lha-114i-malloc.patch
+++ b/app-arch/lha/files/lha-114i-malloc.patch
@@ -1,12 +1,10 @@
--- lha-114i/src/lha.h
+++ lha-114i/src/lha.h
-@@ -16,6 +16,9 @@
+@@ -16,6 +16,7 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
-+#ifndef __APPLE__
-+#include <malloc.h>
-+#endif
++#include <stdlib.h>
#include <signal.h>
diff --git a/app-arch/lha/lha-114i-r5.ebuild b/app-arch/lha/lha-114i-r5.ebuild
index f4ece19666bc..29f38f781d9d 100644
--- a/app-arch/lha/lha-114i-r5.ebuild
+++ b/app-arch/lha/lha-114i-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/lha-114i-r5.ebuild,v 1.2 2006/09/03 06:09:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/lha-114i-r5.ebuild,v 1.3 2006/10/07 19:20:27 flameeyes Exp $
inherit eutils flag-o-matic
@@ -10,7 +10,7 @@ SRC_URI="http://www2m.biglobe.ne.jp/~dolphin/lha/prog/${P}.tar.gz"
LICENSE="lha"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc-macos ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE=""
DEPEND=""