Commits

Providence SALUMU committed 92dad82

simplifies phobos for 9999-r1 version

Comments (0)

Files changed (3)

dev-libs/phobos/Manifest

 AUX dmd.dmd1-phobos 77 RMD160 0ccfe764051455f44bd387acbdc46259571a906a SHA1 300920fa85830c7f860664f59b8eab96eabed04a SHA256 7a281c77bbe0140a2c6a2aa3e5f81175a63f0c70d6276d5aa8fb51c70e70389b
 AUX dmd.dmd2-phobos 101 RMD160 e05ae6946c114277c2f3de71145ce2b551823c9e SHA1 32313103509305714e0ec29d070c95b8e8473828 SHA256 90d7d5fc06b2d767c37761b2bb21f766fa8dfac597a670050f83ce0e833e2cdf
+AUX druntime-path-9999-r1.patch 345 RMD160 d31141a7a7e11f9427d1c0497301cb2ccfa60206 SHA1 0612b50c240c2be77f23624870dafe6910b2e7cd SHA256 e396ee5d3f909f9f4d51ba26dab50af3175059d53f77c37366ac617e73c6db3f
 DIST dmd.1.041.zip 7214595 RMD160 81f48a6ebad9174831b6355f7c781004264e9ea2 SHA1 72cf88a7ca98f36164a7fa052a1db322154d97ab SHA256 1b9b3c1d5980089c2696dcc38977df970c70099284af8c3e2ede76e1dbee1b61
 DIST dmd.1.042.zip 7240200 RMD160 4c699dccaa021b792772264ff0124162b3a26f42 SHA1 bcff94f9b6d0ac5d071b93536b6316c827ea894c SHA256 a7aa9fcf04f7812f53979922f1d3276679f0aa97ca23964dda4e0ea84aede948
 DIST dmd.1.045.zip 8385433 RMD160 8de0045afd1f0dd3077a406173861a7a47b6795f SHA1 e4c2cec04560eb34bebb6f86f7a8ac25fc2ff634 SHA256 d58a1fb3bd8a76680d7a66852a288247d765b9f35e74d3ca4d6600d645bc5315
 EBUILD phobos-2.044.ebuild 1587 RMD160 b55fb9b2d1cff600573f60b9212ab43eeb76fa01 SHA1 ee06c7454af7fb9cfd4214bfb2fec2d81c7ada3a SHA256 ebaa0d67ffc10804f0cbe36a61eef50f8b128f49983de5f4d3e15c49d5d16110
 EBUILD phobos-2.045.ebuild 1587 RMD160 b55fb9b2d1cff600573f60b9212ab43eeb76fa01 SHA1 ee06c7454af7fb9cfd4214bfb2fec2d81c7ada3a SHA256 ebaa0d67ffc10804f0cbe36a61eef50f8b128f49983de5f4d3e15c49d5d16110
 EBUILD phobos-2.046.ebuild 1587 RMD160 b55fb9b2d1cff600573f60b9212ab43eeb76fa01 SHA1 ee06c7454af7fb9cfd4214bfb2fec2d81c7ada3a SHA256 ebaa0d67ffc10804f0cbe36a61eef50f8b128f49983de5f4d3e15c49d5d16110
-EBUILD phobos-9999-r1.ebuild 1901 RMD160 e1b389ab20e84ff7c7fc87e4dd9272039f9fb79b SHA1 b3cbaba445e60d35df71ac66f2920bf85f82d3af SHA256 4ca45ef35689204b084a52bddc4be687cde688ac3fb04680a1edbdf244f928ab
+EBUILD phobos-9999-r1.ebuild 2004 RMD160 e75411fadd195a87e12b37af8f0f20c7ab84eac0 SHA1 28cef43380c730c5d1eb892a27abf3bc08e858c3 SHA256 628d39008a4d6f1d9d69af5e2395b1692e9348149580482c2970bc0adab561cb
 EBUILD phobos-9999.ebuild 1677 RMD160 ec1aa4e39c1b3287561937e006ee44c17e2ed413 SHA1 5a7fb737e6dd8aad8e05f336becf6cd0aab830d7 SHA256 9c4e0286db9200276e7749d55e69166a27c65c54be4ddd651eb2c30809212e9b

dev-libs/phobos/files/druntime-path-9999-r1.patch

+diff --git a/posix.mak b/posix.mak
+index 6280140..6fd2cd1 100644
+--- a/posix.mak
++++ b/posix.mak
+@@ -45,7 +45,7 @@ ifeq (,$(MODEL))
+ endif
+ 
+ # Configurable stuff that's rarely edited
+-DRUNTIME_PATH = ../druntime
++DRUNTIME_PATH = ./druntime
+ ZIPFILE = phobos.zip
+ ROOT_OF_THEM_ALL = generated
+ ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)/$(MODEL)

dev-libs/phobos/phobos-9999-r1.ebuild

 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit git-2 eutils
 
 EAPI="2"
 
 DESCRIPTION="The Phobos standard library for DMD"
 HOMEPAGE="http://www.digitalmars.com/d/"
 
+EGIT_REPO_URI="git://github.com/D-Programming-Language/phobos.git"
+
 LICENSE="DMD"
 RESTRICT="mirror strip binchecks"
 SLOT="2"
 DEPEND="=dev-lang/dmd-${PVR}"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/dmd2"
+S="${WORKDIR}/phobos"
 
 src_compile() {
-# DMD
-	git clone git://github.com/D-Programming-Language/dmd.git dmd2
-	# svn co http://svn.dsource.org/projects/dmd/trunk dmd2
-	cd "${S}/src"
-#	ln -s . mars
-	make -j4 -f posix.mak || die "DMD compilation failed"
+## # DMD
+## 	git clone git://github.com/D-Programming-Language/dmd.git dmd2
+## 	# svn co http://svn.dsource.org/projects/dmd/trunk dmd2
+## 	cd "${S}/src"
+## #	ln -s . mars
+## 	make -j4 -f posix.mak || die "DMD compilation failed"
 # druntime
 #	svn co http://svn.dsource.org/projects/druntime/trunk druntime
 	git clone git://github.com/D-Programming-Language/druntime.git druntime
 	cd "druntime/"
 	(
-		export PATH="${S}/src:${PATH}"
+		export PATH="${S}:${PATH}"
 		export HOME="$(pwd)"
 		make -j4 -f posix.mak
 		cp ./lib/libdruntime.a ..
 # Phobos
 	#mkdir -p "${WORKDIR}/dmd2/src/lib"
 	#cd "${S}/src/phobos"
-	cd "${S}/src"
-#	svn co http://svn.dsource.org/projects/phobos/trunk/phobos phobos
-	git clone git://github.com/D-Programming-Language/phobos.git phobos
-	cd "phobos"
+## 	cd "${S}/src"
+## #	svn co http://svn.dsource.org/projects/phobos/trunk/phobos phobos
+## 	git clone git://github.com/D-Programming-Language/phobos.git phobos
+ 	cd "${S}"
 	echo '#!/bin/sh' > dmd
 	echo '/usr/bin/dmd2.bin -I/usr/include/druntime $*' >> dmd
 	chmod u+x dmd
 	find . -name "*.c" -print0 | xargs -0 rm -v
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/druntime-path-${PVR}.patch"
+}
+
 src_install() {
 # lib
-	dolib.a "${S}/src/phobos/generated/linux/release/32/libphobos2.a" || die "Install failed"
+	dolib.a "${S}/generated/linux/release/32/libphobos2.a" || die "Install failed"
 
 # includes
-	rm -rf "${S}/src/phobos/generated"
-	rm -rf "${S}/src/phobos/dmd"
+	rm -rf "${S}/generated"
 	dodir /usr/include/phobos2
-	mv "${S}/src/phobos"/* "${D}/usr/include/phobos2/"
+	mv "${S}"/* "${D}/usr/include/phobos2/"
 
 # Config
 	dobin "${FILESDIR}/dmd.dmd2-phobos"