Mon Mar 3 03:35:30 UTC 2014

1 files changed, 9 insertions, 38 deletions

diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD
index 134e8cb69..819ecb157 100644
--- a/community/dmd/PKGBUILD
+++ b/community/dmd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106170 2014-02-24 17:34:53Z dicebot $
+# $Id: PKGBUILD 106417 2014-03-02 21:15:14Z dicebot $
 # Maintainer: Mihails Strasunse <public@dicebot.lv>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
@@ -6,21 +6,19 @@
 # Contributor: Anders Bergh <anders1@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
-pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools')
+pkgname=('dmd' 'libphobos-devel' 'libphobos')
 groups=('dlang' 'dlang-dmd')
 pkgbase=dmd
 pkgver=2.065.0
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.dlang.org"
 makedepends=('git' 'gcc' 'make')
 source=("git+http://github.com/D-Programming-Language/dmd.git#tag=v$pkgver"
         "git+http://github.com/D-Programming-Language/druntime.git#tag=v$pkgver"
-        "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver"
-        "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver")
+        "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver")
 sha1sums=('SKIP'
           'SKIP'
-          'SKIP'
           'SKIP')
 
 [[ $CARCH == "x86_64" ]] && _archbits="64"
@@ -35,22 +33,16 @@ build() {
 
     cd $srcdir/phobos
     make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1
-
-    cd $srcdir/tools
-
-    # rdmd is used to build others
-    $srcdir/dmd/src/dmd -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-rdmd rdmd.d
-
-    for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do
-        ./dtools-rdmd --compiler=$srcdir/dmd/src/dmd --build-only -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-`basename $tool` $tool.d
-    done
 }
 
 package_dmd() {
     pkgdesc="The D programming language reference compiler"
     backup=('etc/dmd.conf')
-    depends=('gcc')
-    optdepends=('dtools: collection of useful utilities for development in D' 'libphobos-devel: standard library, development package')
+    depends=('gcc' 'libphobos-devel')
+    optdepends=(
+        'dtools: collection of useful utilities for development in D' 'libphobos-devel: standard library, development package'
+        'libphobos: standard D library, Phobos; shared library'
+    )
     provides=("d-compiler=$pkgver")
     license=('custom')
     backup=('etc/dmd.conf')
@@ -79,7 +71,6 @@ package_dmd() {
 
 package_libphobos-devel() {
     pkgdesc="The Phobos standard library for D programming language. Modules and static library."
-    depends=("dmd")
     options=("staticlibs")
     provides=("d-runtime=$pkgver" "d-stdlib=$pkgver")
     license=("custom")
@@ -104,23 +95,3 @@ package_libphobos() {
     install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.so $pkgdir/usr/lib/libphobos2.so
     install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
-
-package_dtools() {
-    pkgdesc="Ancilliary tools for the D programming language compiler"
-    depends=("curl")
-    license=("custom")
-
-    cd $srcdir/tools
-
-    mkdir -p $pkgdir/usr/bin
-    for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do
-        install -m755 -t $pkgdir/usr/bin $pkgname-$tool
-    done
-
-    cd $pkgdir
-    ln -s dtools-rdmd usr/bin/rdmd
-    ln -s dtools-dustmite usr/bin/dustmite
-
-    # same Boost license as Phobos
-    install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE
-}