dev-lang/dmd: Version bump; kept 2 older versions in case of regressions; URL changes (homepage and download)

5 files changed, 73 insertions, 119 deletions

diff --git a/dev-lang/dmd/ChangeLog b/dev-lang/dmd/ChangeLog
index 7c868fa7a..30db7cdaa 100644
--- a/dev-lang/dmd/ChangeLog
+++ b/dev-lang/dmd/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*dmd-2.060 (02 Aug 2012)
+
+  02 Aug 2012; Marco Leise (mleise) <marco.leise@gmx.de> -dmd-2.057.ebuild,
+  -files/dmd-2.057-makefile.patch, +dmd-2.060.ebuild,
+  +files/dmd-2.060-makefile.patch:
+  Version bump; kept 2 older versions in case of regressions; URL changes
+  (homepage and download)
+
 *dmd-2.059 (21 Apr 2012)
 
   21 Apr 2012; Marco Leise (mleise) <marco.leise@gmx.de> -dmd-2.056.ebuild,
diff --git a/dev-lang/dmd/Manifest b/dev-lang/dmd/Manifest
index baf9b1e59..a5f9e3ec5 100644
--- a/dev-lang/dmd/Manifest
+++ b/dev-lang/dmd/Manifest
@@ -4,19 +4,19 @@ AUX 2.059-issue-7922.patch 6229 RMD160 47670e99574de492486f076d5a12fd8edfd522fd
 AUX 2.059-outOfMemoryError-undeprecation.patch 553 RMD160 0d2a2a59f226879c20f319fc72c0b5fb6e996c5f SHA1 3c0dccfd8ab31625b832a03623b7b773acdb3a58 SHA256 6b36b490cce2a9bc72a28adaf85887f30cb26999189e1c84e32d68820e72713a
 AUX 2.059-std-path-sep-deprecation.patch 1378 RMD160 2f7f0f0be413bf03fb8c14c0124834f901d4ef61 SHA1 144cc4673796ce5115703f75a2c8031b14148ace SHA256 b196c8a274bb5bd9268311fa6bdd14ecf3c42cd711ef12f016d3addff4ab980b
 AUX dmd-1.066-makefile.patch 16530 RMD160 b7196c46933dc0493a69340743fa74cbe48da20b SHA1 65960f6613393f35366da80767f39625eda246eb SHA256 df0c6db1578747b9cc5bbc9ccb14ab53599d7e2456d68f60d40ee98daa61dbb6
-AUX dmd-2.057-makefile.patch 2727 RMD160 64d9ea8c7172e6297d4f76bf92a9b274b922882f SHA1 4cee7d9ae5a582b6af4e76a23feec47404447ee0 SHA256 54d25d5715457b90908f6d9642cd10c23f56fa9a9f1db7874b08a69a209d7a5a
 AUX dmd-2.058-makefile.patch 1843 RMD160 72eb04777293a0d77911add9cbdc72421ccbeb21 SHA1 bd406d37c2e788fc862aaa28daf211e70b304bc2 SHA256 e8cb107bd1943950f077c696275e01920b1f0351ebcf1734f7dc862eb3392a9c
 AUX dmd-2.059-makefile.patch 1843 RMD160 72eb04777293a0d77911add9cbdc72421ccbeb21 SHA1 bd406d37c2e788fc862aaa28daf211e70b304bc2 SHA256 e8cb107bd1943950f077c696275e01920b1f0351ebcf1734f7dc862eb3392a9c
+AUX dmd-2.060-makefile.patch 782 RMD160 df51a9d9c994a6c638d9bb82893c2066bd0c4c3b SHA1 daef9dd488b45fc0d3d47b4abd51cb91d1628d47 SHA256 973b43d90be6d801254c7c07fb1cf57f790214d2bfab37e159e0026d21d0ff4e
 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
 DIST dmd.1.066.zip 8958349 RMD160 c65c32750b1bce9192d955f392de70ddf9667023 SHA1 9197d0a4ffda2021e860396e9a1c7f9225b678d8 SHA256 26c421fdeaa3f81397cb9be858b8829eb01ebe11d6874c133b2ba2de249775fb
-DIST dmd.2.057.zip 21798644 RMD160 e1d5e80c935123373a2fc037cc6118bc12e0503b SHA1 8b3124206669c7285b8081aa745187e27d3d01c7 SHA256 424878440f36a74a31486dd69ef154cc938307ae78b25b7fa4a9296c54436d1b
 DIST dmd.2.058.zip 26266462 RMD160 63a67a91ae887a5eadc683e9ed70cfb9121602d5 SHA1 a8324d2c5da0616f609bd7dd4f3457bdff405fd2 SHA256 3bbfebf8d1288f6a6f021814680e77f0287fff45436dfe8e86117371d5557fea
 DIST dmd.2.059.zip 26217241 RMD160 02cb8dda0e3d2346d8e8994888e1ec41e47f97a5 SHA1 a9ad1a435f2c8cff9673bbec6c306b12ed463349 SHA256 47c712f9c47e0ac156362dfbd5e90f6ed63eb6ffbd0cc96c7db3f9d48ccd9a50
+DIST dmd.2.060.zip 26819944 RMD160 4d30a6ffc8d8ecd51a108c4b6d8c23a1b845e744 SHA1 e39687e90a52b979d1cea64faf745b7825f01f94 SHA256 8da5b46e34e476c29155eff8507aa7a6a82545b1e236f27bad2b6613d2165498
 EBUILD dmd-1.066.ebuild 2252 RMD160 004b851bb80d68557b4e5930bfc0b06ca446b223 SHA1 ff0aaa4f0f518c779f8c0ce8665ad5851fc0eb71 SHA256 bc8776c7523f3b513b5879939d47261585b9af73271aa9fc3af1adeb8c5cd42f
-EBUILD dmd-2.057.ebuild 3963 RMD160 564a8f1d01728aa1323deb738762d34c436c3ed5 SHA1 ee188f106f569de0a4b05ae58d763f0657d14396 SHA256 9a39dc63bbfaab079acae1006d70d6bfc35f4a1ca4b13e07bdb430e290f7a9d8
 EBUILD dmd-2.058.ebuild 4367 RMD160 e2fe0e9bc1119ddc9c18b07a1d1f2098dfc47a3a SHA1 f31b57af2191ccdc7a31e200e7e17f3d5ec043e7 SHA256 779496298f67daf17f395efe8aff371bd44b445da9e99d04cd0018c3589311c6
 EBUILD dmd-2.059.ebuild 4626 RMD160 9c762e70a9911560cd763d69d920bd141b278e1f SHA1 b8df6eea5c092025417c4085845e220cd5319a2e SHA256 1229163a4e578785566412214396637a68b00bc42e44f5d92b59db39ec56b0c7
-MISC ChangeLog 2391 RMD160 c9305308c3dc8998dc078c693029e81f8ac43f64 SHA1 b9546ddf17efaed411d74c45452bfd202e996d34 SHA256 cd9e5a548375201f08a316b232e32f27afeb7ed7181ba635f8bb202834d4fb26
+EBUILD dmd-2.060.ebuild 4384 RMD160 9dba40887e6fe33abfd813496b1a7bbc087be40d SHA1 c51f01ab330584f17520eb260876e0d45d58b147 SHA256 30800bbd09d8307fd18fd3c360a4faa6549ddc2fdd8b0131b3f73b1d1d157672
+MISC ChangeLog 2683 RMD160 815d42f9661ca2ea2405d58262d4a1c39b41737d SHA1 0fe4b7d0b6b4a5cba5351e1a8d39c30a8a561709 SHA256 398fd4217fe66e81df7543d036f0da5f64199e793cb160d29f0834edf44bd2d9
 MISC metadata.xml 377 RMD160 5d6a0b9eb68275408943f0805dac078ecb41afee SHA1 3fa2a4ed5043b4a3c3ae317927b4598ba91e419c SHA256 5edc28143917c389d89a0af6623313c5f7ef81bf55dba92b39c611014fa6ed9e
diff --git a/dev-lang/dmd/dmd-2.057.ebuild b/dev-lang/dmd/dmd-2.060.ebuild
index bb10e8353..8f92ebc6d 100644
--- a/dev-lang/dmd/dmd-2.057.ebuild
+++ b/dev-lang/dmd/dmd-2.060.ebuild
@@ -7,13 +7,13 @@ EAPI="4"
 inherit eutils multilib bash-completion-r1
 
 DESCRIPTION="Reference compiler for the D programming language"
-HOMEPAGE="http://www.digitalmars.com/d/"
-SRC_URI="http://ftp.digitalmars.com/${PN}.${PV}.zip"
+HOMEPAGE="http://dlang.org/"
+SRC_URI="https://github.com/downloads/D-Programming-Language/dmd/${PN}.${PV}.zip"
 
 # DMD supports amd64/x86 exclusively
 KEYWORDS="-* ~amd64 ~x86"
 SLOT="2"
-IUSE="multilib doc examples"
+IUSE="multilib doc examples tools"
 
 # License doesn't allow redistribution
 LICENSE="DMD"
@@ -32,7 +32,9 @@ rdos2unix() {
 src_prepare() {
 	cd .. || die
 
-	rm -r osx linux windows freebsd README.TXT || die "Failed to remove included binaries"
+	rm -r README.TXT windows freebsd osx linux/{lib32,lib64} \
+	linux/{bin32,bin64}/{README.TXT,dmd,dmd.conf} \
+	|| die "Failed to remove included binaries"
 
 	# convert line-endings of file-types that start as cr-lf and are
 	# patched or installed later on
@@ -90,7 +92,7 @@ src_install() {
 	cd "dmd" || die
 	cat > dmd.conf << EOF
 [Environment]
-DFLAGS=-I/usr/include/phobos2 -I/usr/include/druntime -L-L--no-warn-search-mismatch -L--export-dynamic -L-lrt
+DFLAGS=-I/usr/include/phobos2 -I/usr/include/druntime -L--no-warn-search-mismatch -L--export-dynamic -L-lrt
 EOF
 	insinto /etc
 	doins dmd.conf
@@ -106,6 +108,20 @@ EOF
 
 	use doc && dohtml -r ../html/*
 
+	if use tools; then
+		doman ../man/man1/dumpobj.1
+		doman ../man/man1/obj2asm.1
+		doman ../man/man1/rdmd.1
+
+		# Bundled pre-compiled tools
+		if use amd64; then
+			dobin ../linux/bin64/{dumpobj,obj2asm,rdmd}
+		fi
+		if use x86; then
+			dobin ../linux/bin32/{dumpobj,obj2asm,rdmd}
+		fi
+	fi
+
 	docompress -x /usr/share/doc/${PF}/samples/
 	insinto /usr/share/doc/${PF}/samples/
 	if use examples; then
@@ -114,18 +130,18 @@ EOF
 
 	# druntime & Phobos
 	if use amd64; then
-		dolib.a "druntime/lib64/libdruntime.a"
-		dolib.a "phobos/generated/linux/release64/libphobos2.a"
+		newlib.a "druntime/lib/libdruntime-linux64.a" "libdruntime.a"
+		dolib.a "phobos/generated/linux/release/64/libphobos2.a"
 	fi
 	if use x86 || (use amd64 && use multilib); then
 		use amd64 && multilib_toolchain_setup x86
-		dolib.a "druntime/lib32/libdruntime.a"
-		dolib.a "phobos/generated/linux/release32/libphobos2.a"
+		newlib.a "druntime/lib/libdruntime-linux32.a" "libdruntime.a"
+		dolib.a "phobos/generated/linux/release/32/libphobos2.a"
 		# TODO: restore target architecture
 	fi
 
 	# cleanup builds
-	rm -r "druntime/obj"* "druntime/lib"* || die
+	rm -r "druntime/obj" "druntime/lib" || die
 	rm -r "phobos/generated" || die
 
 	# remove files that are not required
diff --git a/dev-lang/dmd/files/dmd-2.057-makefile.patch b/dev-lang/dmd/files/dmd-2.057-makefile.patch
deleted file mode 100644
index 3715171c4..000000000
--- a/dev-lang/dmd/files/dmd-2.057-makefile.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- 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-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
- 
--DMD=dmd
-+DMD?=dmd
- 
- DOCDIR=doc
- IMPDIR=import
- 
--MODEL=32
-+MODEL?=32
- 
- 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
- 
--OBJDIR=obj
-+OBJDIR=obj$(MODEL)
- DRUNTIME_BASE=druntime
--DRUNTIME=lib/lib$(DRUNTIME_BASE).a
-+DRUNTIME=lib$(MODEL)/lib$(DRUNTIME_BASE).a
- 
- DOCFMT=
- 
---- 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$ */
- 
- #include <stdio.h>
-+#include <errno.h>
- 
- #include "zutil.h"
- 
---- 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
- ROOT_OF_THEM_ALL = generated
--ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)/$(MODEL)
-+ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)$(MODEL)
- # Documentation-related stuff
- 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
-+	DRUNTIME = $(DRUNTIME_PATH)/lib$(MODEL)/libdruntime.a
- else
- 	DRUNTIME = $(DRUNTIME_PATH)/lib/druntime.lib
- endif
-@@ -83,14 +81,14 @@ endif
- # Set CC and DMD
- ifeq ($(OS),win32wine)
- 	CC = wine dmc.exe
--	DMD = wine dmd.exe
-+	DMD ?= wine dmd.exe
- 	RUN = wine
- else
- 	ifeq ($(OS),win32remote)
--		DMD = ssh 206.125.170.138 "cd code/dmd/phobos && dmd"
-+		DMD ?= ssh 206.125.170.138 "cd code/dmd/phobos && dmd"
- 		CC = ssh 206.125.170.138 "cd code/dmd/phobos && dmc"
- 	else
--		DMD = dmd
-+		DMD ?= dmd
- 		ifeq ($(OS),win32)
- 			CC = dmc
- 		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-2.060-makefile.patch b/dev-lang/dmd/files/dmd-2.060-makefile.patch
new file mode 100644
index 000000000..45709333d
--- /dev/null
+++ b/dev-lang/dmd/files/dmd-2.060-makefile.patch
@@ -0,0 +1,35 @@
+The patches allow for MODEL, DMD (compiler for the library) and
+DDOC (documentation generator) to be overriden on the command line.
+--- dmd2/src/dmd/posix.mak
++++ dmd2/src/dmd/posix.mak
+@@ -29,7 +29,7 @@
+ TK=tk
+ ROOT=root
+ 
+-MODEL=32
++MODEL?=32
+ 
+ ifeq (OSX,$(TARGET))
+     SDKDIR=/Developer/SDKs
+--- dmd2/src/druntime/posix.mak
++++ dmd2/src/druntime/posix.mak
+@@ -25,7 +25,7 @@
+ DOCDIR=doc
+ IMPDIR=import
+ 
+-MODEL=32
++MODEL?=32
+ 
+ DFLAGS=-m$(MODEL) -O -release -inline -w -Isrc -Iimport -property
+ UDFLAGS=-m$(MODEL) -O -release -w -Isrc -Iimport -property
+--- dmd2/src/phobos/posix.mak
++++ dmd2/src/phobos/posix.mak
+@@ -138,7 +138,7 @@
+ endif
+ 
+ # Set DDOC, the documentation generator
+-DDOC=$(DMD)
++DDOC?=$(DMD)
+ 
+ # Set LIB, the ultimate target
+ ifeq (,$(findstring win,$(OS)))