Add app-arch/unzip unzip dependency and fix quoting (bug #208861), define IUSE.

(Portage version: 2.2_rc19/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 26 insertions, 17 deletions

diff --git a/dev-lang/dmd-bin/ChangeLog b/dev-lang/dmd-bin/ChangeLog
index a5c479bd95ba..e24b65619e23 100644
--- a/dev-lang/dmd-bin/ChangeLog
+++ b/dev-lang/dmd-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/dmd-bin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/dmd-bin/ChangeLog,v 1.15 2008/03/22 17:51:23 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/dmd-bin/ChangeLog,v 1.16 2008/12/29 11:38:49 coldwind Exp $
+
+  29 Dec 2008; Santiago M. Mola <coldwind@gentoo.org> dmd-bin-1.016.ebuild,
+  dmd-bin-2.008-r1.ebuild:
+  Add app-arch/unzip unzip dependency and fix quoting (bug #208861), define
+  IUSE.
 
   22 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
   dmd-bin-2.008-r1.ebuild:
diff --git a/dev-lang/dmd-bin/dmd-bin-1.016.ebuild b/dev-lang/dmd-bin/dmd-bin-1.016.ebuild
index 20a598dfc6de..a0783d29d74f 100644
--- a/dev-lang/dmd-bin/dmd-bin-1.016.ebuild
+++ b/dev-lang/dmd-bin/dmd-bin-1.016.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/dmd-bin/dmd-bin-1.016.ebuild,v 1.3 2007/07/13 06:25:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/dmd-bin/dmd-bin-1.016.ebuild,v 1.4 2008/12/29 11:38:49 coldwind Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ DESCRIPTION="Digital Mars D Compiler"
 HOMEPAGE="http://www.digitalmars.com/d/"
 SRC_URI="http://ftp.digitalmars.com/${MY_P}.zip"
 
+IUSE=""
 LICENSE="DMD"
 RESTRICT="mirror strip"
 SLOT="0"
@@ -19,7 +20,8 @@ KEYWORDS="~x86"
 LOC="/opt/dmd"
 S="${WORKDIR}"
 
-DEPEND="sys-apps/findutils"
+DEPEND="sys-apps/findutils
+	app-arch/unzip"
 RDEPEND="amd64? ( app-emulation/emul-linux-x86-compat )
 	x86? ( sys-libs/libstdc++-v3 )"
 
@@ -27,17 +29,17 @@ src_unpack() {
 	unpack ${A}
 
 	# Remove unneccessary files
-	mv ${S}/dmd/lib/libphobos.a ${S}/dmd
-	rm -r ${S}/dmd/lib
-	mkdir ${S}/dmd/lib
-	mv ${S}/dmd/libphobos.a ${S}/dmd/lib
+	mv "${S}"/dmd/lib/libphobos.a "${S}"/dmd
+	rm -r "${S}"/dmd/lib
+	mkdir "${S}"/dmd/lib
+	mv "${S}"/dmd/libphobos.a "${S}"/dmd/lib
 
-	rm -r ${S}/dm
-	rm ${S}/dmd/bin/*.dll ${S}/dmd/bin/*.exe ${S}/dmd/bin/readme.txt
-	rm ${S}/dmd/bin/sc.ini ${S}/dmd/bin/windbg.hlp
+	rm -r "${S}"/dm
+	rm "${S}"/dmd/bin/*.dll "${S}"/dmd/bin/*.exe "${S}"/dmd/bin/readme.txt
+	rm "${S}"/dmd/bin/sc.ini "${S}"/dmd/bin/windbg.hlp
 
 	# Cleanup line endings
-	cd ${S}/dmd
+	cd "${S}"/dmd
 	edos2unix `find . -name '*.c' -type f`
 	edos2unix `find . -name '*.d' -type f`
 	edos2unix `find . -name '*.ddoc' -type f`
@@ -53,11 +55,11 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}/dmd/src/phobos
+	cd "${S}"/dmd/src/phobos
 	sed -i -e "s:DMD=.*:DMD=${S}/dmd/bin/dmd -I${S}/dmd/src/phobos -L${S}/dmd/lib/libphobos.a:" linux.mak internal/gc/linux.mak
 	edos2unix linux.mak internal/gc/linux.mak
 	make -f linux.mak
-	cp libphobos.a ${S}/dmd/lib
+	cp libphobos.a "${S}"/dmd/lib
 
 	# Clean up
 	make -f linux.mak clean
@@ -65,7 +67,7 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S}/dmd
+	cd "${S}"/dmd
 
 	# Broken dmd.conf
 	# http://d.puremagic.com/issues/show_bug.cgi?id=278
diff --git a/dev-lang/dmd-bin/dmd-bin-2.008-r1.ebuild b/dev-lang/dmd-bin/dmd-bin-2.008-r1.ebuild
index 2eba57b0bbf5..86aee0a2a5cc 100644
--- a/dev-lang/dmd-bin/dmd-bin-2.008-r1.ebuild
+++ b/dev-lang/dmd-bin/dmd-bin-2.008-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/dmd-bin/dmd-bin-2.008-r1.ebuild,v 1.2 2008/03/22 17:51:23 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/dmd-bin/dmd-bin-2.008-r1.ebuild,v 1.3 2008/12/29 11:38:49 coldwind Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ DESCRIPTION="Digital Mars D Compiler"
 HOMEPAGE="http://www.digitalmars.com/d/"
 SRC_URI="http://ftp.digitalmars.com/${MY_P}.zip"
 
+IUSE=""
 LICENSE="DMD"
 RESTRICT="mirror strip"
 SLOT="0"
@@ -19,7 +20,8 @@ KEYWORDS="~amd64 ~x86"
 LOC="/opt/dmd"
 S="${WORKDIR}"
 
-DEPEND="sys-apps/findutils"
+DEPEND="sys-apps/findutils
+	app-arch/unzip"
 RDEPEND="amd64? ( app-emulation/emul-linux-x86-compat )
 	x86? ( sys-libs/libstdc++-v3 )"