Revert "dev-lang/dmd: Added net-misc/curl dependency for dmd-2.064."

This reverts commit 8a56808c84d3e1c4be88536d75f2f19834376a88.

4 files changed, 12 insertions, 33 deletions

diff --git a/dev-lang/dmd/ChangeLog b/dev-lang/dmd/ChangeLog
index 78737e0e6..05ed4e4d3 100644
--- a/dev-lang/dmd/ChangeLog
+++ b/dev-lang/dmd/ChangeLog
@@ -2,10 +2,6 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  30 Dec 2013; Marco Leise <marco.leise@gmx.de> dmd-2.063.2.ebuild,
-  dmd-2.064.2.ebuild:
-  Added net-misc/curl dependency for dmd-2.064.
-
   09 Nov 2013; Marco Leise (mleise) <marco.leise@gmx.de> dmd-2.064.2.ebuild:
   Quick fix to set the executable name back to dmd from dmd2.
 
diff --git a/dev-lang/dmd/Manifest b/dev-lang/dmd/Manifest
index 549727d8f..7f320734c 100644
--- a/dev-lang/dmd/Manifest
+++ b/dev-lang/dmd/Manifest
@@ -9,7 +9,7 @@ DIST dmd.2.063.2.zip 33144090 SHA256 ddb8fc86377fbfc15509801664ecbbc66fd6386ff5c
 DIST dmd.2.064.2.zip 33349115 SHA256 f51a10a137e0be6fb8ef32e3ff475aa377af1461400ec2cef2dcb917976f12c4 SHA512 4ec199c86c717273cf7c3c256ce56bc7144a453d3030a62de2c7e435e52ee5d2414c7bd9bb7c643b4734897e9621a31dff7b7fe3742f5b5785cb1e5eafb1bede WHIRLPOOL 688d98990b6558b3f1bdb0644ccf391d4a08526767427e7d99683473409a2821f2e5a04859b2b10767d4c7b9156a28ffc89a89348ba71b32420925a0e6c4e765
 EBUILD dmd-1.066.ebuild 2252 SHA256 bc8776c7523f3b513b5879939d47261585b9af73271aa9fc3af1adeb8c5cd42f SHA512 a8c494be8f03828e6894fbd1bb6c34b5e9943e0ec7d818de9a1dd3a68e28d911296a4877d2801bed3d688f5275e7c4d6f1be8f3dc9c12dd1a1b5cc20197468de WHIRLPOOL c5fcaa96b2355884d39285524ecf6820ff44c114f66c38b1e2533ce7762653eda72400056bced547c3f8f1ca08e471d8cda1138f1623c2a44eb634266be3a65c
 EBUILD dmd-2.062.ebuild 4483 SHA256 73ed974b03fb6d6176b352fabaf69b55085ad0e8f57ecba5302ac9226f212eb2 SHA512 d552491b299e90fe5b3aaf5bc158597f8ae37c60205c4c867d2113141ee0448e56542a323d680c5e22da09564a87bda1598887da04c31ddae33ec0429ac02e01 WHIRLPOOL df22c9fa4adbe39683a50d981f942d7172453e521c0373c7ee6c0e0c105611f9ef621d562c430765bf8bd9dab85f18ac6b484b17f082e0f036081b724832639d
-EBUILD dmd-2.063.2.ebuild 4425 SHA256 08fcc9fb9c0059429ac12b1b9f244a9cbe05ffd90ddd744f38cf81694e3951e9 SHA512 cb208fa926dc8299277d584c58844ea9c1632d9722cc31330074539b8ce6b3f0da4f95be9ec36e688e13eb3901617049bd9f9e09bee8b40e88bb6517926cb04c WHIRLPOOL 1165b95c2fce1bccc584112d65324f6534b4525da8db48ab8ad8cb6ec8a782d68405597b44e31f3647a04783923db7fdfaa5106a3adb490442d6622cef565ef5
-EBUILD dmd-2.064.2.ebuild 4082 SHA256 b7150070331cc9cdd5d10db1226bdc669157bb074879905c6bda931572ed039f SHA512 41acb01cff71ce7237eaa1eb05858422028e46a3245394592219f22aa2924c76ca2cdcfac101f452be983ad7d9e8618a66eb8bbaf7ea3bf9dd538cff09e8e0f3 WHIRLPOOL 1546a99e95973d19fd520f2ae1e1a7b9b2c3938d93a45a741deb87f73d4a3d65bcfc6f6283bcc0a59bdaca8e7f4ce62c9a94023063cbf57cff9df1e034f5049b
-MISC ChangeLog 4392 SHA256 b9a6946680404a8f40aaa5b3faf2c10cc4792a84f1989db838c1ca94c79b9555 SHA512 304ad10d6e1677a863dab1f70dac42bd36649ea4fdc8bb9674557549c5ffbfe5cb04931d7ab35e51210900cc94f1271cfa50e2a6e8a3aed56040347b766acd6e WHIRLPOOL 980e7ef589d7ea7382f43b808d8d312cba7c49e29207dd9fdced0b2231420137ebe1658eb6ccc94ea1627dee1895e08967dbd6b9ef2a5826725c77c598ee2aa6
+EBUILD dmd-2.063.2.ebuild 4445 SHA256 0c94c60bb6191b8b46e395f2d37101630e3418744a8cc54503a43dd5151ac698 SHA512 4239a926ad031490dc80c755598eff46420d84b91fe47cbf4b2a625658d64798a773ce99750e28588d39e87b67fe2d374f78e758878c9d4f6099a49138c2eb32 WHIRLPOOL 83e11d5af1c745ebc6b4c2d3973001a38065a6b5a3d9bdf21da714e38b1a9ba63195acbb5d0e40aad2ef9ac91c11a8b4e801993e18d0e1a9871c31780940ea83
+EBUILD dmd-2.064.2.ebuild 3918 SHA256 03215afa8b2386f1a9e51926dd8eb2466fe51356d9c7519268b5af0deb8a252a SHA512 46f4834b9f21be5461255296d5b22b08dd71fdee6c54993179082d157b8ea71eeb4221f0486265a40b08bba59aae40183ce8d55014c1228b9adc23a2f4874ee6 WHIRLPOOL 26df030d7d725f6cd986953665997efe4c6705f849dbafb950f29133f7853a24b5ed7554b8a86349ff92b8326f913099128ff24b5777f5bd18113e39eb7577d2
+MISC ChangeLog 4253 SHA256 7cd8e21af9ade37aa544b650b9d63676b4c3f81dbcf425c353d3dc60b9d470cf SHA512 64b5c0db34e612a9243a1261b2fc1fc0e079605a6de17ef4903d0155b47ac6300c90a919ec0cc828adbc8b18d7bb921a243be7681c60cd0f897b95385d548199 WHIRLPOOL 66f66d9f5afff45d551e07a798ac594c4b756ccdc6614dba2f59b46a54837dce5039c3c7e370d35e8ed101552cad3a8c11bb866e2adc69c75e4f6154ed5cf755
 MISC metadata.xml 377 SHA256 5edc28143917c389d89a0af6623313c5f7ef81bf55dba92b39c611014fa6ed9e SHA512 c859bd7805b4a42bfbc5418e151638b63fe08e74e76722f2f95f20702549ded7b06058ce893ae22bd490d8c591e0c41e5dea3c24f46cb3f85463bb75096accba WHIRLPOOL 39e25417c4b28c27d16380faf4ac1d037e3576e6966715ef0dbc3737bc8a7f4c84c1234544fcab3e325766475df63594c7d09c10ec351e47c7559bee85aaa4be
diff --git a/dev-lang/dmd/dmd-2.063.2.ebuild b/dev-lang/dmd/dmd-2.063.2.ebuild
index 3f04752fe..801ae6721 100644
--- a/dev-lang/dmd/dmd-2.063.2.ebuild
+++ b/dev-lang/dmd/dmd-2.063.2.ebuild
@@ -19,7 +19,8 @@ IUSE="multilib doc examples tools"
 LICENSE="DMD"
 RESTRICT="mirror"
 
-DEPEND="app-arch/unzip"
+DEPEND="sys-apps/findutils
+	app-arch/unzip"
 RDEPEND="!dev-lang/dmd-bin"
 
 S="${WORKDIR}/${PN}2/src"
diff --git a/dev-lang/dmd/dmd-2.064.2.ebuild b/dev-lang/dmd/dmd-2.064.2.ebuild
index 9341a6d55..7692d1f19 100644
--- a/dev-lang/dmd/dmd-2.064.2.ebuild
+++ b/dev-lang/dmd/dmd-2.064.2.ebuild
@@ -19,39 +19,21 @@ IUSE="multilib doc examples tools"
 LICENSE="DMD"
 RESTRICT="mirror"
 
-CURL_DEPEND="
-	!amd64? ( net-misc/curl )
-	amd64? (
-		abi_x86_64? ( net-misc/curl )
-		abi_x86_32? ( app-emulation/emul-linux-x86-baselibs )
-	)"
-
-DEPEND="
-	${CURL_DEPEND}
-	app-arch/unzip
-	"
-RDEPEND="
-	${CURL_DEPEND}
-	!dev-lang/dmd-bin
-	"
+DEPEND="app-arch/unzip
+	sys-apps/findutils
+	virtual/awk"
+RDEPEND="!dev-lang/dmd-bin"
 
 S="${WORKDIR}/dmd2"
 
-rdos2unix() {
-	edos2unix $(find . -name '*'.$1 -type f) || die "Failed to convert line-endings of all .$1 files"
-}
-
 src_prepare() {
 	# Remove precompiled binaries and non-essential files.
 	rm -r README.TXT windows osx linux/lib{32,64} linux/bin{32,64}/{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
-	rdos2unix txt
-	rdos2unix html
-	rdos2unix d
-	rdos2unix di
-	rdos2unix ddoc
+	find . -name "*.txt" -o -name "*.html" -o -name "*.d" -o -name "*.di" -o -name "*.ddoc" -type f -exec edos2unix {} \; \
+		|| die "Failed to convert DOS line-endings to Unix."
 
 	# patch: copy VERSION file into dmd directory
 	cp src/VERSION src/dmd/VERSION \
@@ -76,7 +58,7 @@ dmd_foreach_abi() {
 
 src_compile() {
 	# A native build of dmd is used to compile the runtimes for both x86 and amd64
-	# We cannot use multilib-minimal yet, as we have to be sure dmd for amd64
+	# We cannot use multilib-minimal yet, as we have to be sure dmd for amd64 
 	# always gets build first.
 	einfo 'Building dmd ...'
 	emake -C src/dmd -f posix.mak TARGET_CPU=X86 RELEASE=1