dev-lang/dmd: Bump to 2.063.2. Keeping some older versions in case of regressions.

4 files changed, 17 insertions, 49 deletions

diff --git a/dev-lang/dmd/ChangeLog b/dev-lang/dmd/ChangeLog
index f71f0f4db..d2de61a24 100644
--- a/dev-lang/dmd/ChangeLog
+++ b/dev-lang/dmd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*dmd-2.063.2 (17 Jun 2013)
+
+  17 Jun 2013; Marco Leise (mleise) <marco.leise@gmx.de> -dmd-2.060.ebuild,
+  -files/dmd-2.060-makefile.patch, +dmd-2.063.2.ebuild:
+  Bump to 2.063.2. Keeping some older versions in case of regressions.
+
 *dmd-2.062 (22 Feb 2013)
 
   22 Feb 2013; Marco Leise (mleise) <marco.leise@gmx.de> -dmd-2.059.ebuild,
diff --git a/dev-lang/dmd/Manifest b/dev-lang/dmd/Manifest
index c4588e1ac..0c4ec7619 100644
--- a/dev-lang/dmd/Manifest
+++ b/dev-lang/dmd/Manifest
@@ -1,17 +1,16 @@
 AUX dmd-1.066-makefile.patch 16530 SHA256 df0c6db1578747b9cc5bbc9ccb14ab53599d7e2456d68f60d40ee98daa61dbb6 SHA512 4426b2acd6861418617d513d1809b6c79d2cba0c899b6bd5d233ea3a54894af8851fa06bb52607823ca4f7dcbb958e14057ff8e20d9eb686b99eff582e85fe63 WHIRLPOOL 29a6e32f13545e4aa6219462467327d980a63a0921288d4bdc45e3af7cd8c7875b10cc388a8f6dedb207fbd27ec3569bddc6402d4cf5acf3bd176021a670c732
-AUX dmd-2.060-makefile.patch 782 SHA256 973b43d90be6d801254c7c07fb1cf57f790214d2bfab37e159e0026d21d0ff4e SHA512 d91c3c6856cf59cf1e930d153ee91ff5c6c680497a04d1ef169ffb28137b58ef721aaed1f9913c0f455716797e4e93f17f7b8ac3fb69658f8e0b1026ccf539e2 WHIRLPOOL d05c628261d95f08ec36cffd0af82d00f8422f58eb7dc67a5e37402c7834daa40cda82d3376cc181480caf14f47bcee1dd840d082e6856c58b6879f7492d5422
 AUX dmd-2.061-makefile.patch 767 SHA256 2f6f2743dc3665e27d90b1f5c0f347fa55b8a4b7f9d6c17de701f48c549a4b62 SHA512 980b43e8ff60f8849a5aa0f0429331336820d6b45c5864ffd0f09db341c4016b984121e082d32c59a5979d36acaaf563bc4f763330a0335a8b3bd321a54b698f WHIRLPOOL 3e3ed997eabb89414b739f55f7b8b24aa6b89d3aa0fc7475d8490c10edbfc1a61f13a01d4a9269addc5b08fa1bba8589c02180f8c5c45c6ab3ddf937f7d5bc78
 AUX dmd-2.062-makefile.patch 767 SHA256 2f6f2743dc3665e27d90b1f5c0f347fa55b8a4b7f9d6c17de701f48c549a4b62 SHA512 980b43e8ff60f8849a5aa0f0429331336820d6b45c5864ffd0f09db341c4016b984121e082d32c59a5979d36acaaf563bc4f763330a0335a8b3bd321a54b698f WHIRLPOOL 3e3ed997eabb89414b739f55f7b8b24aa6b89d3aa0fc7475d8490c10edbfc1a61f13a01d4a9269addc5b08fa1bba8589c02180f8c5c45c6ab3ddf937f7d5bc78
 AUX dmd.bashcomp 4486 SHA256 b679b0c676035eda48948eeb6c2a8184c6effdc97d8c98d1ca4b071f345e4ac6 SHA512 b54fd8b457be79d923bd7eacd4c98a5e5840a11b71a562c426bf60814ae0438123693e3295e35c1dbf1585b2568125209368fd0bf590b19addd963c5fde25f22 WHIRLPOOL 1fc1e2776813156798c298c28a7d5c6c0d46dd39bdce0fce00573a8f42ff2d99b3eeaea0eff28f9dc3663c61d67fe6b43b5550021093afd8b7d49ffc705ac815
 AUX slot-compat.patch 376 SHA256 d9f1f19b158c3cc52e133751e834460b12a0fa003192d50ba40421bf9ff56763 SHA512 d49c8768fc9c5169086e495c7fc93678747059e84ec6a6d105b11426f1d3b05ce0bc9a372d41960dd878274ce2ebf22b6ba6066be276b98ed728b5e46b1ed099 WHIRLPOOL d431e306e66e53fdf089d933ed9d42337e12805927b6e56641037d29d5566f6ce15f6d8439edd76b43b4158974d8bd96f35cd5ad1a254b7ce8e87863ca52c208
 AUX stackelf.patch 3527 SHA256 56835f1bb5b5f33edbb2bdf650bdb9e459f3670db205b2aeb0a367a868517a96 SHA512 62de8d7427bd05b77eaea14769dfa94621365b3b62e8126341d50c7fef89fd7552946c0bfb4c9fcccdb26f66deb2787b68fe56849b0d694b45007a84bec84a76 WHIRLPOOL 40925f60883ad2f736b6398da6253cd674590c9ef3cd7bce2d510e8f3e795db48ffa64b5ef0fe85562716dd633136eab55ec59f3fdc2f2aad76c3f702a94c8f3
 DIST dmd.1.066.zip 8958349 SHA256 26c421fdeaa3f81397cb9be858b8829eb01ebe11d6874c133b2ba2de249775fb
-DIST dmd.2.060.zip 26819944 SHA256 8da5b46e34e476c29155eff8507aa7a6a82545b1e236f27bad2b6613d2165498 SHA512 fa92ca034d37f753c8cf9ffe281108bbd5df0a4385a2d2bf1a7f191d7fc2ca4de442d6d71f760fcbc949510dc6b82b198c4516db10315ad62ffe22056f8a4af2 WHIRLPOOL af485b084b32806ddf7528dc6e74dbd211bca78f05d91c548fe912fdf6be11467c49b5b21304438d12636ef2502d9d7db7d0733d60c13a3dd748a6ac569cfbd2
 DIST dmd.2.061.zip 31601020 SHA256 13b546b69d628280f245ab19bf4ed27ab66a0085afdaf950e075e68acc7f4c93 SHA512 e1b68c1c73158a0ff792624f5e1dbb7e40c70a149071a5649965125239ab12b3da8a90cf3ccd618a8ef5554a9bbeb1a848246004e1f17cf7f81fd229f44b190b WHIRLPOOL b9a663501176de646414df443e173404d40de2c75080e57ea1b0fb224cc8b14673dd91f11e4046867b309070d169eed9a7002ec55265e10fb5487fd4f72a098a
 DIST dmd.2.062.zip 31993170 SHA256 cd2e1f719713ad3c24637b253b39ebf7baa28eb24d991c7e0fb2de21da41c18a SHA512 9278278777a87aafee5d0aaf41420280cd37d359770e5768d90929a27f7f77d3e83182128fef756b2ddc9bd5e006a28cb9a208b371db3bdbdc0629682514a41c WHIRLPOOL 73b1ddff3308f27c95aa5d3ee399461d51c568491fd8a5bd825e1df345e4c919e42614ca4cd3233b0c960229646c8769bd06e653b1390c80c464d9ddfc682045
+DIST dmd.2.063.2.zip 33144090 SHA256 ddb8fc86377fbfc15509801664ecbbc66fd6386ff5c0f415c2b9993add1bea75 SHA512 8b7a0b308a92e7adbccb05a7e2ec87e287f66ba42e9f856e19aae78127b13c50bad5cb56dd79f49d3237248fd3fe0f430bdef012dda1f38ab875a664c43308ae WHIRLPOOL 1a4b649628a6d627e8ae84bf1acbc3151635ffcf3d0a6552b30f620abb20504d425f0eda9f27126e4488cc0627278a7f86adbffef1af2e452d73d2456eb0efcb
 EBUILD dmd-1.066.ebuild 2252 SHA256 bc8776c7523f3b513b5879939d47261585b9af73271aa9fc3af1adeb8c5cd42f SHA512 a8c494be8f03828e6894fbd1bb6c34b5e9943e0ec7d818de9a1dd3a68e28d911296a4877d2801bed3d688f5275e7c4d6f1be8f3dc9c12dd1a1b5cc20197468de WHIRLPOOL c5fcaa96b2355884d39285524ecf6820ff44c114f66c38b1e2533ce7762653eda72400056bced547c3f8f1ca08e471d8cda1138f1623c2a44eb634266be3a65c
-EBUILD dmd-2.060.ebuild 4371 SHA256 573d7a07e233f1085c0967077cf4e674cff9c87fc3049111aae9723b1b73e5ce SHA512 9a7b743d5ca7e3d9ac2986b69f7ab80baee9a3b761bbd9e60566a63d189a6330eafd9eadfe6b15305bb13137ce5d4748d43ab53346400dcb02ecf7e8e09b4282 WHIRLPOOL 5d3899ac8cedd78eed124b9e39b8d6454465c1674dcde3626e17e4d6ed75cc9734ec1da122685bf4081eae7a91298aef53b01ab53c3852765c3f3956e3c4a7f4
 EBUILD dmd-2.061.ebuild 4409 SHA256 990e51c0d857dac36118012730ca4b7b0af214656c090002f73fea06434a8c6c SHA512 89e47ae30477d3ae386ccb7baf3610f375dbe653782d20de264da53bd28441c5f42f6d939d616eb1631ec28b506f4da7088d44040012d697f61c56c9172621cf WHIRLPOOL 71513c3966ce9885e6ddec0179790f79120916e5ffd8b27b7533f657ec20cf9cb04980407b063f35daa4000d0143e7785fd2a9747176c8572eb3b2d957cf7dee
 EBUILD dmd-2.062.ebuild 4483 SHA256 73ed974b03fb6d6176b352fabaf69b55085ad0e8f57ecba5302ac9226f212eb2 SHA512 d552491b299e90fe5b3aaf5bc158597f8ae37c60205c4c867d2113141ee0448e56542a323d680c5e22da09564a87bda1598887da04c31ddae33ec0429ac02e01 WHIRLPOOL df22c9fa4adbe39683a50d981f942d7172453e521c0373c7ee6c0e0c105611f9ef621d562c430765bf8bd9dab85f18ac6b484b17f082e0f036081b724832639d
-MISC ChangeLog 3552 SHA256 f6d4380d31764b4170f7097c84b0aa633d0c2874fc41b1d21b83852f99223325 SHA512 8e5a37c31ecb1e35f64976398aab810930713d0c8bb84b35b389f2164793e808b7e390369dd3b8dbfb03ad11405c44e645c19f2d5e77449808f2c3f92548d6fb WHIRLPOOL c8fbfb078219addef7b45698ed59582fa19a66048a2d9506cdbc4d65414879cfd38514c37e51669f2e4102c6636c0bfdc70bddd0f776f6fffb8ce1c0c655ec66
+EBUILD dmd-2.063.2.ebuild 4445 SHA256 0c94c60bb6191b8b46e395f2d37101630e3418744a8cc54503a43dd5151ac698 SHA512 4239a926ad031490dc80c755598eff46420d84b91fe47cbf4b2a625658d64798a773ce99750e28588d39e87b67fe2d374f78e758878c9d4f6099a49138c2eb32 WHIRLPOOL 83e11d5af1c745ebc6b4c2d3973001a38065a6b5a3d9bdf21da714e38b1a9ba63195acbb5d0e40aad2ef9ac91c11a8b4e801993e18d0e1a9871c31780940ea83
+MISC ChangeLog 3784 SHA256 000a02a35dee5d8210cdf55d61d35e25d74370ec0256653b7b0e51747870bf14 SHA512 707ce5cb52abae47c41c0bfbf17a89b590eb21d3fd9f3ed322a53370af5967e4c9c0681d463ee47101ffbb69540c92dd9cb5f53b2017cb8962e43f71223ee929 WHIRLPOOL 51328dc787e02743e0971f610f05d729be2b00de4dbcf4f34c6ab8f16c8ea49d2e4694ac8bf4676d018a5ad87323d98166c035af16e418c62dce55d198ed405c
 MISC metadata.xml 377 SHA256 5edc28143917c389d89a0af6623313c5f7ef81bf55dba92b39c611014fa6ed9e SHA512 c859bd7805b4a42bfbc5418e151638b63fe08e74e76722f2f95f20702549ded7b06058ce893ae22bd490d8c591e0c41e5dea3c24f46cb3f85463bb75096accba WHIRLPOOL 39e25417c4b28c27d16380faf4ac1d037e3576e6966715ef0dbc3737bc8a7f4c84c1234544fcab3e325766475df63594c7d09c10ec351e47c7559bee85aaa4be
diff --git a/dev-lang/dmd/dmd-2.060.ebuild b/dev-lang/dmd/dmd-2.063.2.ebuild
index 65ba46180..801ae6721 100644
--- a/dev-lang/dmd/dmd-2.060.ebuild
+++ b/dev-lang/dmd/dmd-2.063.2.ebuild
@@ -8,7 +8,7 @@ inherit eutils multilib bash-completion-r1
 
 DESCRIPTION="Reference compiler for the D programming language"
 HOMEPAGE="http://dlang.org/"
-SRC_URI="mirror://github/D-Programming-Language/dmd/${PN}.${PV}.zip"
+SRC_URI="http://downloads.dlang.org.s3.amazonaws.com/releases/2013/${PN}.${PV}.zip"
 
 # DMD supports amd64/x86 exclusively
 KEYWORDS="-* ~amd64 ~x86"
@@ -42,20 +42,18 @@ src_prepare() {
 	rdos2unix d
 	rdos2unix txt
 	rdos2unix css
-
-	# misc patches for the build process
-	epatch "${FILESDIR}/${P}-makefile.patch"
+	# patch: copy VERSION file into dmd directory for 2.063.2 release
+	cp src/VERSION src/dmd/VERSION || die "Failed to copy VERSION into dmd directory"
 }
 
 src_compile() {
 	# DMD
-	ln -s . "dmd/mars" || die "Failed to add recursive symbolic link to DMD sources."
 	if use x86; then
 		einfo 'Building DMD for x86 ...'
-		emake -C dmd -f posix.mak MODEL=32
+		emake -C dmd -f posix.mak TARGET_CPU=X86 MODEL=32 RELEASE=1
 	elif use amd64; then
 		einfo 'Building DMD for amd64 ...'
-		emake -C dmd -f posix.mak MODEL=64
+		emake -C dmd -f posix.mak TARGET_CPU=X86 MODEL=64 RELEASE=1
 	fi
 
 	# druntime & Phobos
@@ -92,7 +90,7 @@ src_install() {
 	cd "dmd" || die
 	cat > dmd.conf << EOF
 [Environment]
-DFLAGS=-I/usr/include/phobos2 -I/usr/include/druntime -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
 EOF
 	insinto /etc
 	doins dmd.conf
@@ -115,10 +113,10 @@ EOF
 
 		# Bundled pre-compiled tools
 		if use amd64; then
-			dobin ../linux/bin64/{dumpobj,obj2asm,rdmd}
+			dobin ../linux/bin64/{ddemangle,dman,dumpobj,obj2asm,rdmd}
 		fi
 		if use x86; then
-			dobin ../linux/bin32/{dumpobj,obj2asm,rdmd}
+			dobin ../linux/bin32/{ddemangle,dman,dumpobj,obj2asm,rdmd}
 		fi
 	fi
 
diff --git a/dev-lang/dmd/files/dmd-2.060-makefile.patch b/dev-lang/dmd/files/dmd-2.060-makefile.patch
deleted file mode 100644
index 45709333d..000000000
--- a/dev-lang/dmd/files/dmd-2.060-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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)))