Split package into swift itself and lldb

2 files changed, 40 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d9760b072dd..8ab69c6b1a50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 # Generated by mksrcinfo v8
-# Fri Jan  8 21:39:09 UTC 2016
-pkgbase = swift
+# Fri Jan  8 23:38:11 UTC 2016
+pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
 	pkgver = 2.2.SNAPSHOT.2016.01.06.a
 	pkgrel = 1
@@ -13,6 +13,7 @@ pkgbase = swift
 	makedepends = ninja
 	makedepends = swig
 	makedepends = clang>=3.6
+	makedepends = python2-six
 	depends = python2
 	depends = libutil-linux
 	depends = icu
@@ -21,12 +22,6 @@ pkgbase = swift
 	depends = libxml2
 	depends = sqlite
 	depends = ncurses
-	depends = python2-six
-	provides = lldb
-	provides = swift-language
-	conflicts = lldb
-	conflicts = swift-language-git
-	conflicts = swift-git
 	source = swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
 	source = swift-llvm-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift-llvm/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
 	source = swift-clang-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift-clang/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
@@ -47,4 +42,15 @@ pkgbase = swift
 	sha256sums = 4d29ae29261699fe6a3c039be71ee17a5fc77c04f01fe68cf87070b20ad17818
 
 pkgname = swift
+	pkgdesc = The Swift programming language compiler and tools
+	provides = swift-language
+	conflicts = swift-language-git
+	conflicts = swift-git
+
+pkgname = swift-lldb
+	pkgdesc = The Swift programming language debugger (LLDB)
+	depends = swift
+	depends = python2-six
+	provides = lldb
+	conflicts = lldb
 
diff --git a/PKGBUILD b/PKGBUILD
index 5fd19a0a73a6..e80dd9de75e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-pkgname=swift
+pkgbase=swift-language
+pkgname=(swift swift-lldb)
 _swiftver=2.2-SNAPSHOT-2016-01-06-a
 pkgver=${_swiftver//-/.}
 pkgrel=1
@@ -7,10 +8,8 @@ arch=('i686' 'x86_64')
 url="http://swift.org/"
 license=('apache')
 depends=('python2' 'libutil-linux' 'icu' 'libbsd' 'libedit' 'libxml2'
-         'sqlite' 'ncurses' 'python2-six')
-makedepends=('git' 'cmake' 'ninja' 'swig' 'clang>=3.6')
-provides=('lldb' 'swift-language')
-conflicts=('lldb' 'swift-language-git' 'swift-git')
+         'sqlite' 'ncurses')
+makedepends=('git' 'cmake' 'ninja' 'swig' 'clang>=3.6' 'python2-six')
 source=(
     "swift-${_swiftver}.tar.gz::https://github.com/apple/swift/archive/swift-${_swiftver}.tar.gz"
     "swift-llvm-${_swiftver}.tar.gz::https://github.com/apple/swift-llvm/archive/swift-${_swiftver}.tar.gz"
@@ -80,14 +79,15 @@ check() {
     utils/build-script -R -t
 }
 
-package() {
+package_swift() {
+    pkgdesc='The Swift programming language compiler and tools'
+    provides=('swift-language')
+    conflicts=('swift-language-git' 'swift-git')
+
     cd "$srcdir/build/Ninja-ReleaseAssert"
 
-    # Install swift-capable lldb
-    (
-        cd lldb-linux-$CARCH
-        DESTDIR="$pkgdir" ninja install
-    )
+    install -dm755 "$pkgdir/usr/bin"
+    install -dm755 "$pkgdir/usr/lib/swift"
 
     # Swift's components don't provide an install target :(
     # These are based on what's included in the binary release packages
@@ -102,7 +102,6 @@ package() {
         gzip "$pkgdir/usr/share/man/man1/swift.1"
 
         umask 0022
-        install -dm755 "$pkgdir/usr/lib/swift"
         cp -rL lib/swift/{clang,glibc,linux,shims} "$pkgdir/usr/lib/swift/"
     )
     (
@@ -136,6 +135,21 @@ package() {
     # License file
     install -dm755 "$pkgdir/usr/share/licenses/swift"
     install -m644 "$srcdir/swift/LICENSE.txt" "$pkgdir/usr/share/licenses/swift"
+}
+
+package_swift-lldb() {
+    pkgdesc='The Swift programming language debugger (LLDB)'
+    depends=('swift' 'python2-six')
+    provides=('lldb')
+    conflicts=('lldb')
+
+    cd "$srcdir/build/Ninja-ReleaseAssert"
+
+    # Install swift-capable lldb
+    (
+        cd lldb-linux-$CARCH
+        DESTDIR="$pkgdir" ninja install
+    )
 
     # This should be provided from python2-six
     rm "$pkgdir/usr/lib/python2.7/site-packages/six.py"