Bump to version 2

Package-Manager: portage-2.1.4_rc9

7 files changed, 49 insertions, 168 deletions

diff --git a/dev-lang/dmd-bin/ChangeLog b/dev-lang/dmd-bin/ChangeLog
index fdc0f3f5c06e..47f9121e9da7 100644
--- a/dev-lang/dmd-bin/ChangeLog
+++ b/dev-lang/dmd-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/dmd-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/dmd-bin/ChangeLog,v 1.12 2007/11/03 21:48:10 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/dmd-bin/ChangeLog,v 1.13 2007/12/24 20:08:28 anant Exp $
+
+*dmd-bin-2.008 (24 Dec 2007)
+
+  24 Dec 2007; <anant@gentoo.org> -dmd-bin-1.022.ebuild,
+  -dmd-bin-1.023.ebuild, +dmd-bin-2.008.ebuild:
+  Bump to version 2, still keeping 1.016 from (yet to be stabled) 1.x series
 
 *dmd-bin-1.023 (03 Nov 2007)
 
diff --git a/dev-lang/dmd-bin/Manifest b/dev-lang/dmd-bin/Manifest
index 0fbbeca57b73..22501a0056fe 100644
--- a/dev-lang/dmd-bin/Manifest
+++ b/dev-lang/dmd-bin/Manifest
@@ -3,24 +3,19 @@ MD5 ce9610602af9ec245759402355292cc6 files/25dmd 40
 RMD160 cb1eb838eaf98d9898134384d3aefeec86bdd50a files/25dmd 40
 SHA256 40a0ac49424a2ce0a372c66fac3c77b6634138beaacffda0c167f3a81d4a286c files/25dmd 40
 DIST dmd.1.016.zip 4813864 RMD160 b0f3f6278114da3c3100a712ab71172b550a3c06 SHA1 663f5a409f9ff331ec220b4b82d554292ba8b970 SHA256 839c0d0288560989e16271e842c368347ff392c648b8fe5e4daa9853dfd6684d
-DIST dmd.1.022.zip 4839507 RMD160 7678a74b0f4485820f46c89cb4d231a2f40c81cb SHA1 8605904920aed9cfff85ac6e82489d5ba89c70f5 SHA256 711090403acaeaf96b392455808568db389c521431634cfc8ae53ae4fb31249e
-DIST dmd.1.023.zip 4845839 RMD160 8582088acee96596724b15a4427d452a4a49b7f1 SHA1 2cc3da16c4d96dd86d89636187a758196889c922 SHA256 b6cc3900a95febaf3a2326b16ae8684c03c03a898e1a1c07d8dc07319b3f69d9
+DIST dmd.2.008.zip 5325757 RMD160 13e6ba91db036210d02144d0fc37c6872b8aa98c SHA1 42502dd5252260dd9502138cc093fd0756339cc5 SHA256 8d8a0b4399ebf1ecc7e88ee68852db5e944ec7b88607d7c02a150bfcdfaf2b64
 EBUILD dmd-bin-1.016.ebuild 3086 RMD160 d32de000cb5b51c8a3a679926493041e8752fae6 SHA1 ec9a8850083ce17c22fb5814e0eda0d6e410ec8e SHA256 6daab78ce6f1dca517bf860f432a19bcb935562e3196fcb95562d7346decd98a
 MD5 d27c98cc815ff818bf5f8255507f9e2b dmd-bin-1.016.ebuild 3086
 RMD160 d32de000cb5b51c8a3a679926493041e8752fae6 dmd-bin-1.016.ebuild 3086
 SHA256 6daab78ce6f1dca517bf860f432a19bcb935562e3196fcb95562d7346decd98a dmd-bin-1.016.ebuild 3086
-EBUILD dmd-bin-1.022.ebuild 3160 RMD160 bdc164d3f8347baf0993d71df447cd4275923b7d SHA1 136a5edc89410f3c4975573bff202870ab5af0ac SHA256 dc98780a233c3379b20a39ddd24548926bc28e0bc27f5169adb92503b27a7ab6
-MD5 738973293acb2a5515dbc82b649b3755 dmd-bin-1.022.ebuild 3160
-RMD160 bdc164d3f8347baf0993d71df447cd4275923b7d dmd-bin-1.022.ebuild 3160
-SHA256 dc98780a233c3379b20a39ddd24548926bc28e0bc27f5169adb92503b27a7ab6 dmd-bin-1.022.ebuild 3160
-EBUILD dmd-bin-1.023.ebuild 3160 RMD160 1c549adc80df2860356f06baf712d819ef2a58c8 SHA1 ff855065e37d11642a2af1939ab9bf41fb693fa7 SHA256 bdc0b91b72cce7dcdf3da887e58ca2d747b4087adeff2dc81f35e894c987ac1d
-MD5 2ee36e82be97830045440553f3c0d63e dmd-bin-1.023.ebuild 3160
-RMD160 1c549adc80df2860356f06baf712d819ef2a58c8 dmd-bin-1.023.ebuild 3160
-SHA256 bdc0b91b72cce7dcdf3da887e58ca2d747b4087adeff2dc81f35e894c987ac1d dmd-bin-1.023.ebuild 3160
-MISC ChangeLog 2044 RMD160 a1d984e5e5d193aed676c99baa716b67e0ecdea5 SHA1 04d48eb2993ed5c02b5ef5b2e8325590e22681da SHA256 f4cef108a151f93f562317a471f7ce826f761f6266e1a5b877c0acc8f26c4a9e
-MD5 aa5559a32069455fbd1993fb9e6b6b69 ChangeLog 2044
-RMD160 a1d984e5e5d193aed676c99baa716b67e0ecdea5 ChangeLog 2044
-SHA256 f4cef108a151f93f562317a471f7ce826f761f6266e1a5b877c0acc8f26c4a9e ChangeLog 2044
+EBUILD dmd-bin-2.008.ebuild 2631 RMD160 6e510dbabca8279f118c314dd64f76e59afad3b4 SHA1 c8e52744e0a83ae9415928a3bb423eb037992d79 SHA256 bb5e07485fe09b0f1e5c48fa39baddff2ada9a4bf632ff596f8682afc816974d
+MD5 7f9b5cd2b9be8a062fa06e41522776a3 dmd-bin-2.008.ebuild 2631
+RMD160 6e510dbabca8279f118c314dd64f76e59afad3b4 dmd-bin-2.008.ebuild 2631
+SHA256 bb5e07485fe09b0f1e5c48fa39baddff2ada9a4bf632ff596f8682afc816974d dmd-bin-2.008.ebuild 2631
+MISC ChangeLog 2257 RMD160 4a888e851d1e9123a25df4690077095b80ad2ece SHA1 fe0dbd6519a767840c7f0fc5a77abc1630976342 SHA256 3bcde8bfffa0d901286ce1f585506b90b05ff9366648933f9382ac173b88c5ab
+MD5 df1b116da2454e2d322179895aa9380c ChangeLog 2257
+RMD160 4a888e851d1e9123a25df4690077095b80ad2ece ChangeLog 2257
+SHA256 3bcde8bfffa0d901286ce1f585506b90b05ff9366648933f9382ac173b88c5ab ChangeLog 2257
 MISC metadata.xml 377 RMD160 13a78c943806783fb1fee7aa1e85d172de4d7374 SHA1 bb8415f5926bf8ed23d01a2be2fd3fe41c51b3e1 SHA256 5d3fc7d4a252235ca9ede55a655d65b71d68e7edcacb2ef341589da7e07892e3
 MD5 4abe2134e6ee3e0730cfa6fd890c9f15 metadata.xml 377
 RMD160 13a78c943806783fb1fee7aa1e85d172de4d7374 metadata.xml 377
@@ -28,9 +23,6 @@ SHA256 5d3fc7d4a252235ca9ede55a655d65b71d68e7edcacb2ef341589da7e07892e3 metadata
 MD5 d964a3c18d06eb4f62fd97d437987951 files/digest-dmd-bin-1.016 223
 RMD160 22d7579263fefd84e6a91c6f119ebe8a751d85d8 files/digest-dmd-bin-1.016 223
 SHA256 54253f3aaff5596fd3faad43225328351d823680700cda8e18dd18286877bc6a files/digest-dmd-bin-1.016 223
-MD5 1055ab6d9a78c3266b7311adcd801d9b files/digest-dmd-bin-1.022 223
-RMD160 c96cfd0c790bc6a479c66bf30b24a6856a904340 files/digest-dmd-bin-1.022 223
-SHA256 62a170c044bc772b2b5c1ec5246c9fa314e381d8ec13ad3fcf866dfe600ba7db files/digest-dmd-bin-1.022 223
-MD5 170784b90829322cd6f4a161037bd4bc files/digest-dmd-bin-1.023 223
-RMD160 db9f4d62c8aa72b2e3bf622d22af32a5488003fd files/digest-dmd-bin-1.023 223
-SHA256 143975a30e150401caaa676f7ca1388410837651f4a413f5807479157cc240ca files/digest-dmd-bin-1.023 223
+MD5 759ade74095bdb2b255baecc8dca1b0f files/digest-dmd-bin-2.008 223
+RMD160 d996dddb8e0671ccaa5d79b24afca85e015707f4 files/digest-dmd-bin-2.008 223
+SHA256 2a12dc55c750f1411e652aeebb8fc69c0ba952b844b8e0c076f6f19cca9ef84c files/digest-dmd-bin-2.008 223
diff --git a/dev-lang/dmd-bin/dmd-bin-1.023.ebuild b/dev-lang/dmd-bin/dmd-bin-1.023.ebuild
deleted file mode 100644
index 45bd93c85651..000000000000
--- a/dev-lang/dmd-bin/dmd-bin-1.023.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2007 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.023.ebuild,v 1.1 2007/11/03 21:48:10 anant Exp $
-
-inherit eutils
-
-MY_P=${P/-bin/}
-MY_P=${MY_P/-/.}
-
-DESCRIPTION="Digital Mars D Compiler"
-HOMEPAGE="http://www.digitalmars.com/d/"
-SRC_URI="http://ftp.digitalmars.com/${MY_P}.zip"
-
-LICENSE="DMD"
-RESTRICT="mirror strip"
-SLOT="0"
-KEYWORDS="~x86"
-
-LOC="/opt/dmd"
-S="${WORKDIR}"
-
-DEPEND="sys-apps/findutils"
-RDEPEND="amd64? ( app-emulation/emul-linux-x86-compat )
-	x86? ( sys-libs/libstdc++-v3 )"
-
-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"
-
-	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"
-	edos2unix `find . -name '*.c' -type f`
-	edos2unix `find . -name '*.d' -type f`
-	edos2unix `find . -name '*.ddoc' -type f`
-	edos2unix `find . -name '*.h' -type f`
-	edos2unix `find . -name '*.mak' -type f`
-	edos2unix `find . -name '*.txt' -type f`
-	edos2unix `find samples -name '*.html' -type f`
-
-	# Fix permissions
-	fperms guo=r `find . -type f`
-	fperms guo=rx `find . -type d`
-	fperms guo=rx bin/dmd bin/dumpobj bin/obj2asm bin/rdmd
-}
-
-src_compile() {
-	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
-	# Can't use emake, customized build system
-	edos2unix linux.mak internal/gc/linux.mak
-	make -f linux.mak
-	cp libphobos.a "${S}/dmd/lib"
-
-	# Clean up
-	make -f linux.mak clean
-	rm internal/gc/*.o
-}
-
-src_install() {
-	cd "${S}/dmd"
-
-	# Broken dmd.conf
-	# http://d.puremagic.com/issues/show_bug.cgi?id=278
-	mv bin/dmd bin/dmd.bin
-	cat <<END > "bin/dmd"
-#!/bin/sh
-${LOC}/bin/dmd.bin -I${LOC}/src/phobos -L${LOC}/lib/libphobos.a \$*
-END
-	fperms guo=rx bin/dmd bin/dmd.bin
-
-	# Man pages
-	doman man/man1/dmd.1
-	doman man/man1/dumpobj.1
-	doman man/man1/obj2asm.1
-	rm -r man
-
-	# Install
-	mkdir "${D}/opt"
-	mv "${S}/dmd" "${D}/opt/dmd"
-
-	# Set PATH
-	doenvd "${FILESDIR}/25dmd"
-}
-
-pkg_postinst () {
-	ewarn "The DMD Configuration file has been disabled,    "
-	ewarn "and will be re-enabled when:                     "
-	ewarn "                                                 "
-	ewarn "http://d.puremagic.com/issues/show_bug.cgi?id=278"
-	ewarn "                                                 "
-	ewarn "has been fixed. Meanwhile, please supply all your"
-	ewarn "configuration options in the /opt/dmd/bin/dmd    "
-	ewarn "shell script.                                    "
-	ewarn "                                                 "
-	ewarn "You may need to run:                             "
-	ewarn "                                                 "
-	ewarn "env-update && source /etc/profile                "
-	ewarn "                                                 "
-	ewarn "to be able to use the compiler immediately.      "
-	ewarn "                                                 "
-}
diff --git a/dev-lang/dmd-bin/dmd-bin-1.022.ebuild b/dev-lang/dmd-bin/dmd-bin-2.008.ebuild
index 6bf74d34c410..7f7651c153e8 100644
--- a/dev-lang/dmd-bin/dmd-bin-1.022.ebuild
+++ b/dev-lang/dmd-bin/dmd-bin-2.008.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.022.ebuild,v 1.2 2007/10/08 06:01:46 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/dmd-bin/dmd-bin-2.008.ebuild,v 1.1 2007/12/24 20:08:28 anant Exp $
 
 inherit eutils
 
@@ -27,14 +27,9 @@ 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"
-
 	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 dmd/license.txt dmd/readme
 
 	# Cleanup line endings
 	cd "${S}/dmd"
@@ -45,37 +40,42 @@ src_unpack() {
 	edos2unix `find . -name '*.mak' -type f`
 	edos2unix `find . -name '*.txt' -type f`
 	edos2unix `find samples -name '*.html' -type f`
+	edos2unix src/phobos/linux.mak src/phobos/internal/gc/linux.mak
 
-	# Fix permissions
+	# Fix permissions and clean up
 	fperms guo=r `find . -type f`
 	fperms guo=rx `find . -type d`
 	fperms guo=rx bin/dmd bin/dumpobj bin/obj2asm bin/rdmd
+	mv bin/{dmd,dumpobj,obj2asm,rdmd} .
+	rm -r bin/
+	mkdir bin
+	mkdir lib
+	mv ./{dmd,dumpobj,obj2asm,rdmd} bin/
 }
 
 src_compile() {
+	# Don't use teh bundled library since on gentoo we do teh compile
 	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
+	sed -i -e "s:DMD=.*:DMD=${S}/dmd/bin/dmd:" linux.mak internal/gc/linux.mak
 	# Can't use emake, customized build system
-	edos2unix linux.mak internal/gc/linux.mak
 	make -f linux.mak
-	cp libphobos.a "${S}/dmd/lib"
+	cp obj/release/libphobos2.a "${S}/dmd/lib"
 
 	# Clean up
 	make -f linux.mak clean
-	rm internal/gc/*.o
 }
 
 src_install() {
 	cd "${S}/dmd"
 
-	# Broken dmd.conf
-	# http://d.puremagic.com/issues/show_bug.cgi?id=278
-	mv bin/dmd bin/dmd.bin
-	cat <<END > "bin/dmd"
-#!/bin/sh
-${LOC}/bin/dmd.bin -I${LOC}/src/phobos -L${LOC}/lib/libphobos.a \$*
+	# Setup dmd.conf
+	cat <<END > "bin/dmd.conf"
+[Environment]
+DFLAGS=-I/opt/dmd/src/phobos -L-L/opt/dmd/lib
 END
-	fperms guo=rx bin/dmd bin/dmd.bin
+	insinto /etc
+	doins bin/dmd.conf
+	rm bin/dmd.conf
 
 	# Man pages
 	doman man/man1/dmd.1
@@ -83,6 +83,10 @@ END
 	doman man/man1/obj2asm.1
 	rm -r man
 
+	# Documentation
+	dohtml html/d/* html/d/phobos/*
+	rm -r html
+
 	# Install
 	mkdir "${D}/opt"
 	mv "${S}/dmd" "${D}/opt/dmd"
@@ -92,19 +96,11 @@ END
 }
 
 pkg_postinst () {
-	ewarn "The DMD Configuration file has been disabled,    "
-	ewarn "and will be re-enabled when:                     "
-	ewarn "                                                 "
-	ewarn "http://d.puremagic.com/issues/show_bug.cgi?id=278"
-	ewarn "                                                 "
-	ewarn "has been fixed. Meanwhile, please supply all your"
-	ewarn "configuration options in the /opt/dmd/bin/dmd    "
-	ewarn "shell script.                                    "
-	ewarn "                                                 "
 	ewarn "You may need to run:                             "
-	ewarn "                                                 "
 	ewarn "env-update && source /etc/profile                "
-	ewarn "                                                 "
 	ewarn "to be able to use the compiler immediately.      "
-	ewarn "                                                 "
+	einfo "                                                 "
+	einfo "The bundled sources and samples may be found in  "
+	einfo "/opt/dmd/src and /opt/dmd/samples respectively.  "
+	einfo "                                                 "
 }
diff --git a/dev-lang/dmd-bin/files/digest-dmd-bin-1.022 b/dev-lang/dmd-bin/files/digest-dmd-bin-1.022
deleted file mode 100644
index 03ab329163c4..000000000000
--- a/dev-lang/dmd-bin/files/digest-dmd-bin-1.022
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 645b4527ae4137d0e1dc639d2cf70974 dmd.1.022.zip 4839507
-RMD160 7678a74b0f4485820f46c89cb4d231a2f40c81cb dmd.1.022.zip 4839507
-SHA256 711090403acaeaf96b392455808568db389c521431634cfc8ae53ae4fb31249e dmd.1.022.zip 4839507
diff --git a/dev-lang/dmd-bin/files/digest-dmd-bin-1.023 b/dev-lang/dmd-bin/files/digest-dmd-bin-1.023
deleted file mode 100644
index 6f8f8991bfda..000000000000
--- a/dev-lang/dmd-bin/files/digest-dmd-bin-1.023
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e641101a0938b993f853db7b70a6f7ca dmd.1.023.zip 4845839
-RMD160 8582088acee96596724b15a4427d452a4a49b7f1 dmd.1.023.zip 4845839
-SHA256 b6cc3900a95febaf3a2326b16ae8684c03c03a898e1a1c07d8dc07319b3f69d9 dmd.1.023.zip 4845839
diff --git a/dev-lang/dmd-bin/files/digest-dmd-bin-2.008 b/dev-lang/dmd-bin/files/digest-dmd-bin-2.008
new file mode 100644
index 000000000000..c2e63fcae482
--- /dev/null
+++ b/dev-lang/dmd-bin/files/digest-dmd-bin-2.008
@@ -0,0 +1,3 @@
+MD5 0c5fd34e7520ddbfadb71249829f2dd0 dmd.2.008.zip 5325757
+RMD160 13e6ba91db036210d02144d0fc37c6872b8aa98c dmd.2.008.zip 5325757
+SHA256 8d8a0b4399ebf1ecc7e88ee68852db5e944ec7b88607d7c02a150bfcdfaf2b64 dmd.2.008.zip 5325757