Make malloc.h -> stdlib.h patch unconditional

Package-Manager: portage-2.1.3.16

5 files changed, 31 insertions, 30 deletions

diff --git a/media-libs/libprojectm/ChangeLog b/media-libs/libprojectm/ChangeLog
index aa1fa1cf20e0..2eb2156f610b 100644
--- a/media-libs/libprojectm/ChangeLog
+++ b/media-libs/libprojectm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libprojectm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.16 2007/10/24 00:43:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.17 2007/10/24 15:38:28 lavajoe Exp $
+
+  24 Oct 2007; Joe Peterson <lavajoe@gentoo.org>
+  -files/libprojectm-1.01-freebsd.patch,
+  +files/libprojectm-1.01-malloc.patch, libprojectm-1.01.ebuild:
+  Make malloc.h -> stdlib.h patch unconditional
 
   24 Oct 2007; Jeroen Roovers <jer@gentoo.org> libprojectm-1.01.ebuild:
   Marked ~hppa (bug #196836).
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 1b8506818c42..c82b7bcd5655 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,7 +1,7 @@
-AUX libprojectm-1.01-freebsd.patch 368 RMD160 da8821a0468e66ee8254185e945b49d0f5fab9a9 SHA1 088a3cac0b31b35d4198e15fe66cafddbdc0c053 SHA256 c21e20434941b5b63763efa460cb44b12f1e00d39add537f5337e7e8c7754d4f
-MD5 4c4bb1da2a470a565e3cdd8e4705001a files/libprojectm-1.01-freebsd.patch 368
-RMD160 da8821a0468e66ee8254185e945b49d0f5fab9a9 files/libprojectm-1.01-freebsd.patch 368
-SHA256 c21e20434941b5b63763efa460cb44b12f1e00d39add537f5337e7e8c7754d4f files/libprojectm-1.01-freebsd.patch 368
+AUX libprojectm-1.01-malloc.patch 260 RMD160 07538e9d9ffa853f7632ff8c08e21288d77229c1 SHA1 f0bdad329e79314393412c50ae4994cb79a14810 SHA256 bf5c494b440e0743ff4bb440c14c7c999228a1b3f26ecd05ac6bfd7846bb05fc
+MD5 e028b637afa98bd6a57fac5c354b3daf files/libprojectm-1.01-malloc.patch 260
+RMD160 07538e9d9ffa853f7632ff8c08e21288d77229c1 files/libprojectm-1.01-malloc.patch 260
+SHA256 bf5c494b440e0743ff4bb440c14c7c999228a1b3f26ecd05ac6bfd7846bb05fc files/libprojectm-1.01-malloc.patch 260
 AUX libprojectm-fbsd.patch 3693 RMD160 13ea332af3d210dc58d816e17fde51063cab70f5 SHA1 2b51513be1e0926d614f9ab4a72aac75ce9b5109 SHA256 861d40f21295a9de8431fcb09bb2fa9aa4b3f928f4fd4ae2a98263978b6b6577
 MD5 af4ae374a2463f5c5e5380271efa0fa0 files/libprojectm-fbsd.patch 3693
 RMD160 13ea332af3d210dc58d816e17fde51063cab70f5 files/libprojectm-fbsd.patch 3693
@@ -16,14 +16,14 @@ EBUILD libprojectm-0.99.ebuild 755 RMD160 713a86d4a673f45ccab86b7b7516decea30215
 MD5 8bec6a0f69abd645c83f8fc2be1074a3 libprojectm-0.99.ebuild 755
 RMD160 713a86d4a673f45ccab86b7b7516decea3021536 libprojectm-0.99.ebuild 755
 SHA256 f88c0206110a254ecd88dcc126f5c54949b887099219e15220553bd817bbd88f libprojectm-0.99.ebuild 755
-EBUILD libprojectm-1.01.ebuild 1257 RMD160 01a536900143fb385c23cb32caaf94c7d772416d SHA1 933283980d75c7594dcad76bcfe9abf5360866ed SHA256 242b8fcadfac6e16016ad32dcfa8a5fef5afb8039f136abf52d774dd470a182f
-MD5 ac5614a06baeaf07258b008edc94e442 libprojectm-1.01.ebuild 1257
-RMD160 01a536900143fb385c23cb32caaf94c7d772416d libprojectm-1.01.ebuild 1257
-SHA256 242b8fcadfac6e16016ad32dcfa8a5fef5afb8039f136abf52d774dd470a182f libprojectm-1.01.ebuild 1257
-MISC ChangeLog 2214 RMD160 775c49d3e8da6c2ad5a4c6fc03aebe8273e631af SHA1 41d30909be4623267e7c654c95753eb2b73d5c64 SHA256 9edbaf1f6623fa43bd2b865d6349b48fe8fdaf7bcab9709d758734c40599d058
-MD5 e80b8fdf2a368748b8a0c11907d853fb ChangeLog 2214
-RMD160 775c49d3e8da6c2ad5a4c6fc03aebe8273e631af ChangeLog 2214
-SHA256 9edbaf1f6623fa43bd2b865d6349b48fe8fdaf7bcab9709d758734c40599d058 ChangeLog 2214
+EBUILD libprojectm-1.01.ebuild 1260 RMD160 461b635c5fb8cbb7c1f5ad0240e9c18d679c3ba8 SHA1 ba30414db915e55f33be999113718b58c8222c54 SHA256 7d15c92a5b0a5c0ec888ab201f8c752f9ed5087522522657f7bf1d5f8c80d77d
+MD5 cfa4c062d5d26f2168465513c69d5473 libprojectm-1.01.ebuild 1260
+RMD160 461b635c5fb8cbb7c1f5ad0240e9c18d679c3ba8 libprojectm-1.01.ebuild 1260
+SHA256 7d15c92a5b0a5c0ec888ab201f8c752f9ed5087522522657f7bf1d5f8c80d77d libprojectm-1.01.ebuild 1260
+MISC ChangeLog 2422 RMD160 dcd99768dbda0157723e851479733a4d1a188148 SHA1 ff96e1791b2fd842f458d2ff62936c3c9f89df9c SHA256 3f24df64f778c9b96097033600f0508bc564bfbc80d053bba1cd35c7ee0fdd73
+MD5 75ab70d9751ceb7dcc313f9a2978eb95 ChangeLog 2422
+RMD160 dcd99768dbda0157723e851479733a4d1a188148 ChangeLog 2422
+SHA256 3f24df64f778c9b96097033600f0508bc564bfbc80d053bba1cd35c7ee0fdd73 ChangeLog 2422
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
diff --git a/media-libs/libprojectm/files/libprojectm-1.01-freebsd.patch b/media-libs/libprojectm/files/libprojectm-1.01-freebsd.patch
deleted file mode 100644
index f98176c64ec2..000000000000
--- a/media-libs/libprojectm/files/libprojectm-1.01-freebsd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur libprojectM-1.01.old/MoodBar.cpp libprojectM-1.01/MoodBar.cpp
---- libprojectM-1.01.old/MoodBar.cpp	2007-10-10 08:47:14 -0600
-+++ libprojectM-1.01/MoodBar.cpp	2007-10-23 14:42:32 -0600
-@@ -19,7 +19,11 @@
- 
- #include <cmath>
- extern "C" {
-+#ifdef __FreeBSD__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- }
- #include <iostream>
- #include <cassert>
diff --git a/media-libs/libprojectm/files/libprojectm-1.01-malloc.patch b/media-libs/libprojectm/files/libprojectm-1.01-malloc.patch
new file mode 100644
index 000000000000..f847d19a939a
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-1.01-malloc.patch
@@ -0,0 +1,11 @@
+--- libprojectM-1.01/MoodBar.cpp.old	2007-10-10 08:47:14 -0600
++++ libprojectM-1.01/MoodBar.cpp	2007-10-24 09:01:46 -0600
+@@ -19,7 +19,7 @@
+ 
+ #include <cmath>
+ extern "C" {
+-#include <malloc.h>
++#include <stdlib.h>
+ }
+ #include <iostream>
+ #include <cassert>
diff --git a/media-libs/libprojectm/libprojectm-1.01.ebuild b/media-libs/libprojectm/libprojectm-1.01.ebuild
index c0e92d2d4b3b..6779cf131988 100644
--- a/media-libs/libprojectm/libprojectm-1.01.ebuild
+++ b/media-libs/libprojectm/libprojectm-1.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-1.01.ebuild,v 1.4 2007/10/24 00:43:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-1.01.ebuild,v 1.5 2007/10/24 15:38:28 lavajoe Exp $
 
 inherit toolchain-funcs eutils
 
@@ -31,7 +31,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-freebsd.patch"
+	epatch "${FILESDIR}/${P}-malloc.patch"
 }
 
 src_compile() {