dev-lang/dmd: version bump to 2.057

svn path=/sunrise/; revision=12586

6 files changed, 46 insertions, 120 deletions

diff --git a/dev-lang/dmd/ChangeLog b/dev-lang/dmd/ChangeLog
index 23383976b..08df377d8 100644
--- a/dev-lang/dmd/ChangeLog
+++ b/dev-lang/dmd/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Dec 2011; Marco Leise <marco.leise@gmx.de> -dmd-2.054-r1.ebuild,
+  -files/dmd-2.054-makefile.patch, -files/dmd-2.054-no-execstack.patch,
+  +dmd-2.057.ebuild, +files/dmd-2.057-makefile.patch, files/dmd.bashcomp:
+  version bump to 2.057
+
   30 Oct 2011; Marco Leise <marco.leise@gmx.de> -dmd-2.054.ebuild,
   +dmd-2.054-r1.ebuild, -dmd-2.055.ebuild, +dmd-2.055-r1.ebuild,
   +dmd-2.056.ebuild, +files/dmd-2.056-makefile.patch, files/dmd.bashcomp:
diff --git a/dev-lang/dmd/Manifest b/dev-lang/dmd/Manifest
index 308b8661f..aaf18d9bc 100644
--- a/dev-lang/dmd/Manifest
+++ b/dev-lang/dmd/Manifest
@@ -1,13 +1,12 @@
-AUX dmd-2.054-makefile.patch 2701 RMD160 6fbb1e4fefe2bc0969778f1705a06c3ee339d66a SHA1 00ab197ac3013d1cac959ee3724149f5c9615501 SHA256 75b90307a570f8242aa36862192ad9b55aafb6ff2c4c14fb79e033b6bcb43c1b
-AUX dmd-2.054-no-execstack.patch 3962 RMD160 849f59f9921dea1b9a9b78d6d54fdeba9df29f38 SHA1 94268fb2653cc6813ffdff7406d394bafcd1bee3 SHA256 6603dfb05beff79039f0e63a409e8237c6a271ae73ce7ec752fef3c164073423
 AUX dmd-2.055-makefile.patch 2707 RMD160 68b07ed19b1e191c7820b7ef85cc4c4eff2c3f64 SHA1 11607841bd7caebc277e8bb4ce2a08e345ae7157 SHA256 532631f7f295dc722783f7d48208bd37981e81f18163a086ae78a5760970b477
 AUX dmd-2.056-makefile.patch 2707 RMD160 68b07ed19b1e191c7820b7ef85cc4c4eff2c3f64 SHA1 11607841bd7caebc277e8bb4ce2a08e345ae7157 SHA256 532631f7f295dc722783f7d48208bd37981e81f18163a086ae78a5760970b477
-AUX dmd.bashcomp 4479 RMD160 171ed85764f59e6d09aeba21606b12825a125c56 SHA1 556e042a127698286b4662aa7a6cbfe672ebc3b2 SHA256 725e72a4da53bb5bee065cd5bf7c6a8c2ccdfc39fa928349a11f9ad24288e6c6
-DIST dmd.2.054.zip 16114301 RMD160 1764ed7c64ee63857a30633c935eaceb99dc1dc5 SHA1 05dfd83c1083bb93ae43c10e3846ee7120b462fe SHA256 3347dee91d8884b2f105666f085ba0b2c27b989967cf0001b284f3da922ca0c2
+AUX dmd-2.057-makefile.patch 2727 RMD160 64d9ea8c7172e6297d4f76bf92a9b274b922882f SHA1 4cee7d9ae5a582b6af4e76a23feec47404447ee0 SHA256 54d25d5715457b90908f6d9642cd10c23f56fa9a9f1db7874b08a69a209d7a5a
+AUX dmd.bashcomp 4486 RMD160 9d68ac6e7df0d6698decbcdf49b6b1625aa05546 SHA1 06fc9eb9e9a9070e5e0a13c046abfc5648319b34 SHA256 b679b0c676035eda48948eeb6c2a8184c6effdc97d8c98d1ca4b071f345e4ac6
 DIST dmd.2.055.zip 17137571 RMD160 c418324817e7d44bc76468e6d5e79089c82ca367 SHA1 13fb220db783cb47ad4cf3614d389894e92745c6 SHA256 11901f541ab3cce2ea245c1f609f456996eab1922c976483750c90d99c49816b
 DIST dmd.2.056.zip 19678819 RMD160 d323972e326c113b8976a494d783389f8999c34a SHA1 1b0c80c1415b9fb22e992c6c8dcb5b40674cccfb SHA256 22aea9e97f271cf64fbcb71458fa3454b6eef4bb5a2ed7061f753a4e91c9f515
-EBUILD dmd-2.054-r1.ebuild 4127 RMD160 c54ee1292875bfb39f458a42bf06ca87d97d8cba SHA1 eab6cffb411302d10bbadb5adf3214f3ba03dc70 SHA256 f2b8ec75b66c291541fbed886f96c1064180e5ffbb6869408ce7454488f730f3
+DIST dmd.2.057.zip 21798644 RMD160 e1d5e80c935123373a2fc037cc6118bc12e0503b SHA1 8b3124206669c7285b8081aa745187e27d3d01c7 SHA256 424878440f36a74a31486dd69ef154cc938307ae78b25b7fa4a9296c54436d1b
 EBUILD dmd-2.055-r1.ebuild 3963 RMD160 f857cc63b917b154510687edb33fa8d9d6dcaa3e SHA1 fbcb3f0fc0e2bc907e059e9b884d88e77ce797be SHA256 61d094d8fdce5606d471321f50ac1879066485f597bd5ab5227e8b0ca10fe0a4
 EBUILD dmd-2.056.ebuild 3963 RMD160 f857cc63b917b154510687edb33fa8d9d6dcaa3e SHA1 fbcb3f0fc0e2bc907e059e9b884d88e77ce797be SHA256 61d094d8fdce5606d471321f50ac1879066485f597bd5ab5227e8b0ca10fe0a4
-MISC ChangeLog 942 RMD160 c31fd22c821a7ae5146d1054f67279ce98f2ce77 SHA1 1f656ae0095d328e302d42f687a50ed0e24c0abe SHA256 2bf839a91a7630cb8a12cc81dec8f7bc333a5c59a87166f266de32da479d2674
+EBUILD dmd-2.057.ebuild 3963 RMD160 f857cc63b917b154510687edb33fa8d9d6dcaa3e SHA1 fbcb3f0fc0e2bc907e059e9b884d88e77ce797be SHA256 61d094d8fdce5606d471321f50ac1879066485f597bd5ab5227e8b0ca10fe0a4
+MISC ChangeLog 1183 RMD160 3317063ceb19733b159f509ae46bce8aadb5067e SHA1 968a42c484024b25b2c0c1a96bcb783800f52820 SHA256 d14824205a47ca78ede4c06f4e57cdbac42f3af89ca3ca877399a84616f093be
 MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
diff --git a/dev-lang/dmd/dmd-2.054-r1.ebuild b/dev-lang/dmd/dmd-2.057.ebuild
index 7f5ffbaaf..b09ba4ff6 100644
--- a/dev-lang/dmd/dmd-2.054-r1.ebuild
+++ b/dev-lang/dmd/dmd-2.057.ebuild
@@ -10,11 +10,13 @@ DESCRIPTION="Reference compiler for the D programming language"
 HOMEPAGE="http://www.digitalmars.com/d/"
 SRC_URI="http://ftp.digitalmars.com/${PN}.${PV}.zip"
 
-LICENSE="DMD"
-SLOT="2"
+# DMD supports amd64/x86 exclusively
 KEYWORDS="-* ~amd64 ~x86"
+SLOT="2"
 IUSE="multilib doc examples"
 
+# License doesn't allow redistribution
+LICENSE="DMD"
 RESTRICT="mirror"
 
 DEPEND="sys-apps/findutils
@@ -24,7 +26,7 @@ RDEPEND="!dev-lang/dmd-bin"
 S="${WORKDIR}/${PN}2/src"
 
 rdos2unix() {
-	edos2unix `find . -name '*'.$1 -type f` || die "Failed to convert line-endings of all .$1 files"
+	edos2unix $(find . -name '*'.$1 -type f) || die "Failed to convert line-endings of all .$1 files"
 }
 
 src_prepare() {
@@ -41,10 +43,6 @@ src_prepare() {
 
 	# misc patches for the build process
 	epatch "${FILESDIR}/${P}-makefile.patch"
-
-	# fix the compile of an assembly file in druntime and the output of 
-	# DMD to produce binaries with no executable stack
-	epatch "${FILESDIR}/${P}-no-execstack.patch"
 }
 
 src_compile() {
@@ -74,8 +72,8 @@ src_compile() {
 }
 
 src_test() {
-	DFLAGS="-Iphobos -Idruntime/import -L-lrt"
-	DMD="dmd/dmd"
+	local DFLAGS="-Iphobos -Idruntime/import -L-lrt"
+	local DMD="dmd/dmd"
 	if use x86 || (use amd64 && use multilib); then
 		${DMD} -m32 ${DFLAGS} -Lphobos/generated/linux/release32/libphobos2.a ../samples/d/hello.d || die "Failed to build hello.d (32bit)"
 		./hello 32bit || die "Failed to run test sample (32bit)"
@@ -108,9 +106,10 @@ EOF
 
 	use doc && dohtml -r ../html/*
 
+	docompress -x /usr/share/doc/${PF}/samples/
+	insinto /usr/share/doc/${PF}/samples/
 	if use examples; then
-		dodir /usr/share/doc/${PF}/samples
-		cp -R ../samples/d/* "${D}"/usr/share/doc/${PF}/samples/ || die
+		doins -r ../samples/d/*
 	fi
 
 	# druntime & Phobos
@@ -136,18 +135,17 @@ EOF
 	rm "phobos/index.d" || die
 	rm -r "phobos/etc/c/zlib" || die
 
-	# includes
-	dodir /usr/include/druntime
-	mv "druntime/import"/* "${D}/usr/include/druntime/" || die
-
-	dodir /usr/include/phobos2
-	mv "phobos"/* "${D}/usr/include/phobos2/" || die
+	# imports
+	insinto /usr/include/druntime/
+	doins -r druntime/import/*
 
+	insinto /usr/include/phobos2
+	doins -r phobos/*
 }
 
 pkg_postinst() {
 	if use doc || use examples; then
-		elog "The bundled docs and/or samples may be found in  "
-		elog "/usr/share/doc/${PF}                             "
+		elog "The bundled docs and/or samples may be found in"
+		elog "/usr/share/doc/${PF}"
 	fi
 }
diff --git a/dev-lang/dmd/files/dmd-2.054-no-execstack.patch b/dev-lang/dmd/files/dmd-2.054-no-execstack.patch
deleted file mode 100644
index 5f25a4e8b..000000000
--- a/dev-lang/dmd/files/dmd-2.054-no-execstack.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- dmd2/src/druntime/posix.mak.orig	2011-06-25 02:39:28.000000000 +0200
-+++ dmd2/src/druntime/posix.mak	2011-07-22 17:42:40.570533111 +0200
-@@ -518,7 +518,7 @@ $(OBJDIR)/errno_c.o : src/core/stdc/errn
- 
- $(OBJDIR)/threadasm.o : src/core/threadasm.S
- 	@mkdir -p $(OBJDIR)
--	$(CC) -c $(CFLAGS) $< -o$@
-+	$(CC) -Wa,-noexecstack -c $(CFLAGS) $< -o$@
- 
- ################### Library generation #########################
- 
---- dmd2/src/dmd/backend/elfobj.c.orig	2011-07-27 02:34:47.270542457 +0200
-+++ dmd2/src/dmd/backend/elfobj.c	2011-07-27 02:37:47.290542532 +0200
-@@ -652,7 +652,7 @@
-     if (I64)
-     {
-         static char section_names_init64[] =
--          "\0.symtab\0.strtab\0.shstrtab\0.text\0.data\0.bss\0.note\0.comment\0.rodata\0.rela.text\0.rela.data";
-+          "\0.symtab\0.strtab\0.shstrtab\0.text\0.data\0.bss\0.note\0.comment\0.rodata\0.note.GNU-stack\0.rela.text\0.rela.data";
-         #define NAMIDX_NONE      0
-         #define NAMIDX_SYMTAB    1       // .symtab
-         #define NAMIDX_STRTAB    9       // .strtab
-@@ -663,9 +663,10 @@
-         #define NAMIDX_NOTE     44      // .note
-         #define NAMIDX_COMMENT  50      // .comment
-         #define NAMIDX_RODATA   59      // .rodata
--        #define NAMIDX_RELTEXT  67      // .rel.text and .rela.text
--        #define NAMIDX_RELDATA  77      // .rel.data
--        #define NAMIDX_RELDATA64 78      // .rela.data
-+        #define NAMIDX_GNUSTACK 67      // .note.GNU-stack
-+        #define NAMIDX_RELTEXT  83      // .rel.text and .rela.text
-+        #define NAMIDX_RELDATA  93      // .rel.data
-+        #define NAMIDX_RELDATA64 94      // .rela.data
- 
-         if (section_names)
-             section_names->setsize(sizeof(section_names_init64));
-@@ -692,6 +693,7 @@
-         elf_newsection2(NAMIDX_SHSTRTAB,SHT_STRTAB, 0,                  0,0,0,0,0, 1,0);
-         elf_newsection2(NAMIDX_COMMENT, SHT_PROGDEF,0,                  0,0,0,0,0, 1,0);
-         elf_newsection2(NAMIDX_NOTE,SHT_NOTE,   0,                      0,0,0,0,0, 1,0);
-+        elf_newsection2(NAMIDX_GNUSTACK,SHT_PROGDEF,0,                  0,0,0,0,0, 1,0);
- 
-         IDXSTR namidx;
-         namidx = NAMIDX_TEXT;      *(IDXSTR *)section_names_hashtable->get(&namidx) = namidx;
-@@ -705,11 +707,12 @@
-         namidx = NAMIDX_SHSTRTAB;  *(IDXSTR *)section_names_hashtable->get(&namidx) = namidx;
-         namidx = NAMIDX_COMMENT;   *(IDXSTR *)section_names_hashtable->get(&namidx) = namidx;
-         namidx = NAMIDX_NOTE;      *(IDXSTR *)section_names_hashtable->get(&namidx) = namidx;
-+        namidx = NAMIDX_GNUSTACK;  *(IDXSTR *)section_names_hashtable->get(&namidx) = namidx;
-     }
-     else
-     {
-         static char section_names_init[] =
--          "\0.symtab\0.strtab\0.shstrtab\0.text\0.data\0.bss\0.note\0.comment\0.rodata\0.rel.text\0.rel.data";
-+          "\0.symtab\0.strtab\0.shstrtab\0.text\0.data\0.bss\0.note\0.comment\0.rodata\0.note.GNU-stack\0.rel.text\0.rel.data";
- 
-         if (section_names)
-             section_names->setsize(sizeof(section_names_init));
-@@ -736,6 +739,7 @@
-         elf_newsection2(NAMIDX_SHSTRTAB,SHT_STRTAB, 0,                  0,0,0,0,0, 1,0);
-         elf_newsection2(NAMIDX_COMMENT, SHT_PROGDEF,0,                  0,0,0,0,0, 1,0);
-         elf_newsection2(NAMIDX_NOTE,SHT_NOTE,   0,                      0,0,0,0,0, 1,0);
-+        elf_newsection2(NAMIDX_GNUSTACK,SHT_PROGDEF,0,                  0,0,0,0,0, 1,0);
- 
-         IDXSTR namidx;
-         namidx = NAMIDX_TEXT;      *(IDXSTR *)section_names_hashtable->get(&namidx) = namidx;
-@@ -749,6 +753,7 @@
-         namidx = NAMIDX_SHSTRTAB;  *(IDXSTR *)section_names_hashtable->get(&namidx) = namidx;
-         namidx = NAMIDX_COMMENT;   *(IDXSTR *)section_names_hashtable->get(&namidx) = namidx;
-         namidx = NAMIDX_NOTE;      *(IDXSTR *)section_names_hashtable->get(&namidx) = namidx;
-+        namidx = NAMIDX_GNUSTACK;  *(IDXSTR *)section_names_hashtable->get(&namidx) = namidx;
-     }
- 
-     if (SYMbuf)
-
diff --git a/dev-lang/dmd/files/dmd-2.054-makefile.patch b/dev-lang/dmd/files/dmd-2.057-makefile.patch
index 5426195a7..3715171c4 100644
--- a/dev-lang/dmd/files/dmd-2.054-makefile.patch
+++ b/dev-lang/dmd/files/dmd-2.057-makefile.patch
@@ -1,16 +1,16 @@
---- dmd2/src/dmd/posix.mak.orig	2011-07-10 22:19:30.000000000 +0200
-+++ dmd2/src/dmd/posix.mak	2011-07-22 19:39:07.797180890 +0200
-@@ -28,7 +28,7 @@ C=backend
+--- dmd2/src/dmd/posix.mak.orig	2011-09-08 05:10:14.000000000 +0200
++++ dmd2/src/dmd/posix.mak	2011-09-14 15:29:04.635180684 +0200
+@@ -29,7 +29,7 @@ C=backend
  TK=tk
  ROOT=root
-
+ 
 -MODEL=32
 +MODEL?=32
-
+ 
  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
---- dmd2/src/druntime/posix.mak.orig	2011-06-25 02:39:28.000000000 +0200
-+++ dmd2/src/druntime/posix.mak	2011-07-22 17:42:40.570533111 +0200
+--- dmd2/src/druntime/posix.mak.orig	2011-09-01 21:22:06.000000000 +0200
++++ dmd2/src/druntime/posix.mak	2011-09-14 15:29:04.636180672 +0200
 @@ -20,21 +20,21 @@ ifeq (,$(OS))
      endif
  endif
@@ -24,8 +24,8 @@
 -MODEL=32
 +MODEL?=32
  
- DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport
- UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport
+ DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport -property
+ UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport -property
  
  CFLAGS=-m$(MODEL) -O
  
@@ -37,8 +37,8 @@
  
  DOCFMT=
  
---- dmd2/src/phobos/etc/c/zlib/gzio.c.orig	2011-07-26 23:58:57.240222466 +0200
-+++ dmd2/src/phobos/etc/c/zlib/gzio.c	2011-07-26 23:59:20.136336207 +0200
+--- dmd2/src/phobos/etc/c/zlib/gzio.c.orig	2010-09-16 22:27:48.000000000 +0200
++++ dmd2/src/phobos/etc/c/zlib/gzio.c	2011-09-14 15:29:29.412870920 +0200
 @@ -8,6 +8,7 @@
  /* @(#) $Id$ */
  
@@ -47,8 +47,8 @@
  
  #include "zutil.h"
  
---- dmd2/src/phobos/posix.mak.orig	2011-07-10 22:19:30.000000000 +0200
-+++ dmd2/src/phobos/posix.mak	2011-07-22 17:51:00.901014107 +0200
+--- dmd2/src/phobos/posix.mak.orig	2011-09-08 05:10:16.000000000 +0200
++++ dmd2/src/phobos/posix.mak	2011-09-14 15:29:04.638180648 +0200
 @@ -48,7 +48,7 @@ endif
  DRUNTIME_PATH = ../druntime
  ZIPFILE = phobos.zip
@@ -59,16 +59,16 @@
  DOCSRC = ../d-programming-language.org
  WEBSITE_DIR = ../web
 @@ -61,8 +61,6 @@ DDOCFLAGS=-m$(MODEL) -d -c -o- -version=
-
+ 
  # Variable defined in an OS-dependent manner (see below)
  CC =
 -DMD =
 -DDOC =
  CFLAGS =
  DFLAGS =
-
+ 
 @@ -75,7 +73,7 @@ MAKEFILE:=$(lastword $(MAKEFILE_LIST))
-
+ 
  # Set DRUNTIME name and full path
  ifeq (,$(findstring win,$(OS)))
 -	DRUNTIME = $(DRUNTIME_PATH)/lib/libdruntime.a
@@ -96,11 +96,10 @@
  		else
 @@ -141,7 +139,7 @@ else
  endif
-
+ 
  # Set DDOC, the documentation generator
 -DDOC=dmd
 +DDOC?=$(DMD)
-
+ 
  # Set LIB, the ultimate target
  ifeq (,$(findstring win,$(OS)))
-
diff --git a/dev-lang/dmd/files/dmd.bashcomp b/dev-lang/dmd/files/dmd.bashcomp
index fc6df0594..6d3a2dcb0 100644
--- a/dev-lang/dmd/files/dmd.bashcomp
+++ b/dev-lang/dmd/files/dmd.bashcomp
@@ -96,7 +96,7 @@ _dmd()
             else
                 COMPREPLY=( $(compgen -W "${_dmd_opts}" -- ${cur}) )
                 C='\n'
-                L=$(echo -e "-cov${C}-fPIC${C}-gc${C}--help${C}-ignore\
+                L=$(echo -e "-cov${C}-fPIC${C}-gc${C}-gs${C}--help${C}-ignore\
                     ${C}-inline${C}-lib${C}-m32${C}-m64${C}-man${C}-map\
                     ${C}-noboundscheck${C}-nofloat${C}-O${C}-o-${C}-op\
                     ${C}-profile${C}-quiet${C}-release${C}-run${C}-unittest\