dev-lang/dmd: cleaned up patch file

svn path=/sunrise/; revision=12758

3 files changed, 18 insertions, 14 deletions

diff --git a/dev-lang/dmd/ChangeLog b/dev-lang/dmd/ChangeLog
index 72967bed6..e5680765f 100644
--- a/dev-lang/dmd/ChangeLog
+++ b/dev-lang/dmd/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Feb 2012; Marco Leise (mleise) <marco.leise@gmx.de>
+  files/dmd-2.058-makefile.patch:
+  cleaned up patch file
+
 *dmd-2.058 (16 Feb 2012)
 
   16 Feb 2012; Marco Leise (mleise) <marco.leise@gmx.de> -dmd-2.055-r1.ebuild,
diff --git a/dev-lang/dmd/Manifest b/dev-lang/dmd/Manifest
index 4cfaab89d..fdb31e871 100644
--- a/dev-lang/dmd/Manifest
+++ b/dev-lang/dmd/Manifest
@@ -1,7 +1,7 @@
 AUX dmd-1.066-makefile.patch 16530 RMD160 b7196c46933dc0493a69340743fa74cbe48da20b SHA1 65960f6613393f35366da80767f39625eda246eb SHA256 df0c6db1578747b9cc5bbc9ccb14ab53599d7e2456d68f60d40ee98daa61dbb6
 AUX dmd-2.056-makefile.patch 2707 RMD160 68b07ed19b1e191c7820b7ef85cc4c4eff2c3f64 SHA1 11607841bd7caebc277e8bb4ce2a08e345ae7157 SHA256 532631f7f295dc722783f7d48208bd37981e81f18163a086ae78a5760970b477
 AUX dmd-2.057-makefile.patch 2727 RMD160 64d9ea8c7172e6297d4f76bf92a9b274b922882f SHA1 4cee7d9ae5a582b6af4e76a23feec47404447ee0 SHA256 54d25d5715457b90908f6d9642cd10c23f56fa9a9f1db7874b08a69a209d7a5a
-AUX dmd-2.058-makefile.patch 2081 RMD160 e2951100f37f18d701e9d2e5991c2659a7a89b3b SHA1 2a7439aa75388ca536a171d3668651d7c648d14c SHA256 930e7ccf958cfa2192939fdb476d42f1f44d3df7417730dd98382b88d4a18c17
+AUX dmd-2.058-makefile.patch 1843 RMD160 72eb04777293a0d77911add9cbdc72421ccbeb21 SHA1 bd406d37c2e788fc862aaa28daf211e70b304bc2 SHA256 e8cb107bd1943950f077c696275e01920b1f0351ebcf1734f7dc862eb3392a9c
 AUX dmd.bashcomp 4486 RMD160 9d68ac6e7df0d6698decbcdf49b6b1625aa05546 SHA1 06fc9eb9e9a9070e5e0a13c046abfc5648319b34 SHA256 b679b0c676035eda48948eeb6c2a8184c6effdc97d8c98d1ca4b071f345e4ac6
 AUX slot-compat.patch 376 RMD160 f8a2770f6994ebf056e40bbb6ecc6fd3cbec798e SHA1 6e25821964199378f568c601bbdf18c2ad1d7d00 SHA256 d9f1f19b158c3cc52e133751e834460b12a0fa003192d50ba40421bf9ff56763
 AUX stackelf.patch 3527 RMD160 efa17b66952649e0fa64bb7fe73f58f7c01c6d4d SHA1 e723fefaaaa35122cc45b3882cea17b499fc9926 SHA256 56835f1bb5b5f33edbb2bdf650bdb9e459f3670db205b2aeb0a367a868517a96
@@ -13,6 +13,6 @@ EBUILD dmd-1.066.ebuild 2252 RMD160 70fe6d6bfb5ccba7018a0665364e58f5f5fa0296 SHA
 EBUILD dmd-2.056.ebuild 3963 RMD160 f857cc63b917b154510687edb33fa8d9d6dcaa3e SHA1 fbcb3f0fc0e2bc907e059e9b884d88e77ce797be SHA256 61d094d8fdce5606d471321f50ac1879066485f597bd5ab5227e8b0ca10fe0a4
 EBUILD dmd-2.057.ebuild 3963 RMD160 f857cc63b917b154510687edb33fa8d9d6dcaa3e SHA1 fbcb3f0fc0e2bc907e059e9b884d88e77ce797be SHA256 61d094d8fdce5606d471321f50ac1879066485f597bd5ab5227e8b0ca10fe0a4
 EBUILD dmd-2.058.ebuild 4367 RMD160 e2fe0e9bc1119ddc9c18b07a1d1f2098dfc47a3a SHA1 f31b57af2191ccdc7a31e200e7e17f3d5ec043e7 SHA256 779496298f67daf17f395efe8aff371bd44b445da9e99d04cd0018c3589311c6
-MISC ChangeLog 1784 RMD160 91d61a7b8592d8638973893e3106807902d90e46 SHA1 038e6f4280a457564a4ef4a0eb70bcb9d5564f9b SHA256 4355e0490850afb8e0674059095b918529b29cc7840dbf1a8b768a71493d9132
+MISC ChangeLog 1900 RMD160 5f234abb4ea85092579fc8a4bd01f0b9867f94bc SHA1 bff13d8aa7ad1b1143ff0e950be285b867f4fad3 SHA256 fc356ae6897402e498f0ccbeb7deb7c67591c5fb42dd92128823e07417deabfe
 MISC Manifest.edited 3767 RMD160 131290aca493aa0b3afa8b84b702f9e437b0985a SHA1 4f9f909d3c2606e42f73090623fd04b93ceb2907 SHA256 a15e020f4751b64276ac98190e0ea1f9fa68355352ecd44a2ef9c995ca034521
 MISC metadata.xml 377 RMD160 5d6a0b9eb68275408943f0805dac078ecb41afee SHA1 3fa2a4ed5043b4a3c3ae317927b4598ba91e419c SHA256 5edc28143917c389d89a0af6623313c5f7ef81bf55dba92b39c611014fa6ed9e
diff --git a/dev-lang/dmd/files/dmd-2.058-makefile.patch b/dev-lang/dmd/files/dmd-2.058-makefile.patch
index 6a14b9bf8..0505f48eb 100644
--- a/dev-lang/dmd/files/dmd-2.058-makefile.patch
+++ b/dev-lang/dmd/files/dmd-2.058-makefile.patch
@@ -1,6 +1,9 @@
-diff -Nur src/dmd/posix.mak src.new/dmd/posix.mak
---- src/dmd/posix.mak	2012-02-14 22:49:44.000000000 +0100
-+++ src.new/dmd/posix.mak	2012-02-16 17:25:53.583285148 +0100
+The patches allow for MODEL, DMD (compiler for the library) and
+DDOC (documentation generator) to be overriden on the command line.
+The patch to gzio.c adds the missing errno.h include, to make the code portable:
+http://d.puremagic.com/issues/show_bug.cgi?id=5463
+--- dmd2/src/dmd/posix.mak
++++ dmd2/src/dmd/posix.mak
 @@ -29,7 +29,7 @@
  TK=tk
  ROOT=root
@@ -10,9 +13,8 @@ diff -Nur src/dmd/posix.mak src.new/dmd/posix.mak
  
  ifeq (OSX,$(TARGET))
      ## See: http://developer.apple.com/documentation/developertools/conceptual/cross_development/Using/chapter_3_section_2.html#//apple_ref/doc/uid/20002000-1114311-BABGCAAB
-diff -Nur src/druntime/posix.mak src.new/druntime/posix.mak
---- src/druntime/posix.mak	2012-02-07 22:44:58.000000000 +0100
-+++ src.new/druntime/posix.mak	2012-02-16 17:26:44.912643441 +0100
+--- dmd2/src/druntime/posix.mak
++++ dmd2/src/druntime/posix.mak
 @@ -20,12 +20,12 @@
      endif
  endif
@@ -28,9 +30,8 @@ diff -Nur src/druntime/posix.mak src.new/druntime/posix.mak
  
  DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport -property
  UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport -property
-diff -Nur src/phobos/etc/c/zlib/gzio.c src.new/phobos/etc/c/zlib/gzio.c
---- src/phobos/etc/c/zlib/gzio.c	2012-02-16 17:01:01.525938431 +0100
-+++ src.new/phobos/etc/c/zlib/gzio.c	2012-02-16 16:32:35.975260749 +0100
+--- dmd2/src/phobos/etc/c/zlib/gzio.c
++++ dmd2/src/phobos/etc/c/zlib/gzio.c
 @@ -8,6 +8,7 @@
  /* @(#) $Id$ */
  
@@ -39,9 +40,8 @@ diff -Nur src/phobos/etc/c/zlib/gzio.c src.new/phobos/etc/c/zlib/gzio.c
  
  #include "zutil.h"
  
-diff -Nur src/phobos/posix.mak src.new/phobos/posix.mak
---- src/phobos/posix.mak	2012-02-14 22:49:46.000000000 +0100
-+++ src.new/phobos/posix.mak	2012-02-16 17:30:58.843468871 +0100
+--- dmd2/src/phobos/posix.mak
++++ dmd2/src/phobos/posix.mak
 @@ -61,8 +61,6 @@
  
  # Variable defined in an OS-dependent manner (see below)