Update to 2016.06.06 snapshot and fix pod2man issue

3 files changed, 56 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 363c2eb546be..18d82f018350 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Jun  1 17:33:46 UTC 2016
+# Sat Jun 11 02:32:55 UTC 2016
 pkgbase = swift-development
 	pkgdesc = The Swift programming language and debugger - latest development snapshot
-	pkgver = DEVELOPMENT.SNAPSHOT.2016.05.31.a
+	pkgver = DEVELOPMENT.SNAPSHOT.2016.06.06.a
 	pkgrel = 1
 	url = http://swift.org/
 	arch = i686
@@ -24,28 +24,30 @@ pkgbase = swift-development
 	depends = libxml2
 	depends = sqlite
 	depends = ncurses
-	source = swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
-	source = swift-llvm-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-llvm/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
-	source = swift-clang-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-clang/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
-	source = swift-lldb-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-lldb/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
-	source = swift-cmark-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-cmark/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
-	source = swift-llbuild-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
-	source = swift-package-manager-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
-	source = swift-corelibs-xctest-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
-	source = swift-corelibs-foundation-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
-	source = swift-integration-tests-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
+	source = swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz::https://github.com/apple/swift/archive/swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz
+	source = swift-llvm-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz::https://github.com/apple/swift-llvm/archive/swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz
+	source = swift-clang-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz::https://github.com/apple/swift-clang/archive/swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz
+	source = swift-lldb-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz::https://github.com/apple/swift-lldb/archive/swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz
+	source = swift-cmark-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz::https://github.com/apple/swift-cmark/archive/swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz
+	source = swift-llbuild-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz
+	source = swift-package-manager-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz
+	source = swift-corelibs-xctest-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz
+	source = swift-corelibs-foundation-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz
+	source = swift-integration-tests-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a.tar.gz
 	source = swift-sphinx2.patch
-	sha256sums = 80729b4288ebb36610024ecd52df1b00427b358309a0607432decfea2f1905f0
-	sha256sums = 22a9640ec711c75586017aaaa6d95f99c9a37105f4ac79a786fcfd634d71ef4b
-	sha256sums = 7dcb9dd52c4748535912a964de37f43d624197ce52f193e3c5e622fc33f1b223
-	sha256sums = 6fc979d88cedbc0017a149bf038abb4c7de50d153892ada67a565a69d8794eeb
-	sha256sums = ca8f9a8d5780417e31b26eb12eaceb0b23107839129ed3804cc25c73f32ecbad
-	sha256sums = 3536c0d62d6c941fdbdad5aa747d316a3756f2f39876924d6d8a06d771b27f60
-	sha256sums = 6d23140504fa944480f06274a8094918bf8e49758b4585562b023e1fcd4d618b
-	sha256sums = af64e2dbe1228bb9bdbe7d0c1fa37e0d4eee50008a759fd87f18aad292f8e5fa
-	sha256sums = bcd8c1ee304b5142d1c0c0f249ad92be4d6bb5ac38aca8bbc01a1dfe26bcafde
-	sha256sums = 3b211bd3708af55e9909b210d7f426c9c9307798020809beab72e657cd36a00d
+	source = pod2man_release.patch
+	sha256sums = 3f7d217ca2f36bfe730e00d3ca2a8c63228c9ddc89204540bbdb8742e1a63c72
+	sha256sums = dab946e2bbf97e9667e2ac84cbbb4aba1eb4ae617eaa32f6f96f8d4bbb2ff698
+	sha256sums = 2537fce8af3d45846fd0ee016ce29a6a3c6198999a8393ddb0554ba1ec460d4a
+	sha256sums = b244f767c4764d8ed82b59723148e198e30985f26f9f57f7c01dc1e09b88d4b5
+	sha256sums = 036e17bbab5f198d6106b72f03c38d4727015d4678690f1f77010df20b57d39b
+	sha256sums = e10173a95cf1ea3601d82838feb852413814473a963f1bfa63f593e909dc0186
+	sha256sums = 78ed41acc5e5c5528d547599f7614acaa01b23637ac097e3010a90fec1c47368
+	sha256sums = 50393861c1700f12f83228193098c987f8b647755b5682f9a16f5db428f88a32
+	sha256sums = 8a716b5c16f02b225ec0f3e1624f13a07f26452972cfc66a3e77cb8469d96895
+	sha256sums = 861d5d3c48a989f4776e234d2e8fc6b7e78cfe2731252bec9cb00d94a0e29d62
 	sha256sums = 93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f
+	sha256sums = f09977247fa2fcfa306b491523146c8772b38fa007cc1530f4169413fe7c7f3a
 
 pkgname = swift-development
 	pkgdesc = The Swift programming language compiler and tools - development snapshot
diff --git a/PKGBUILD b/PKGBUILD
index 3286416031a9..8f32fce35f07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgbase=swift-development
 pkgname=(swift-development swift-lldb-development)
-_swiftver=DEVELOPMENT-SNAPSHOT-2016-05-31-a
+_swiftver=DEVELOPMENT-SNAPSHOT-2016-06-06-a
 pkgver=${_swiftver//-/.}
 pkgrel=1
 pkgdesc="The Swift programming language and debugger - latest development snapshot"
@@ -22,19 +22,20 @@ source=(
     "swift-corelibs-xctest-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-${_swiftver}.tar.gz"
     "swift-corelibs-foundation-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-${_swiftver}.tar.gz"
     "swift-integration-tests-${_swiftver}.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-${_swiftver}.tar.gz"
-    "swift-sphinx2.patch"
+    "swift-sphinx2.patch" "pod2man_release.patch"
 )
-sha256sums=('80729b4288ebb36610024ecd52df1b00427b358309a0607432decfea2f1905f0'
-            '22a9640ec711c75586017aaaa6d95f99c9a37105f4ac79a786fcfd634d71ef4b'
-            '7dcb9dd52c4748535912a964de37f43d624197ce52f193e3c5e622fc33f1b223'
-            '6fc979d88cedbc0017a149bf038abb4c7de50d153892ada67a565a69d8794eeb'
-            'ca8f9a8d5780417e31b26eb12eaceb0b23107839129ed3804cc25c73f32ecbad'
-            '3536c0d62d6c941fdbdad5aa747d316a3756f2f39876924d6d8a06d771b27f60'
-            '6d23140504fa944480f06274a8094918bf8e49758b4585562b023e1fcd4d618b'
-            'af64e2dbe1228bb9bdbe7d0c1fa37e0d4eee50008a759fd87f18aad292f8e5fa'
-            'bcd8c1ee304b5142d1c0c0f249ad92be4d6bb5ac38aca8bbc01a1dfe26bcafde'
-            '3b211bd3708af55e9909b210d7f426c9c9307798020809beab72e657cd36a00d'
-            '93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f')
+sha256sums=('3f7d217ca2f36bfe730e00d3ca2a8c63228c9ddc89204540bbdb8742e1a63c72'
+            'dab946e2bbf97e9667e2ac84cbbb4aba1eb4ae617eaa32f6f96f8d4bbb2ff698'
+            '2537fce8af3d45846fd0ee016ce29a6a3c6198999a8393ddb0554ba1ec460d4a'
+            'b244f767c4764d8ed82b59723148e198e30985f26f9f57f7c01dc1e09b88d4b5'
+            '036e17bbab5f198d6106b72f03c38d4727015d4678690f1f77010df20b57d39b'
+            'e10173a95cf1ea3601d82838feb852413814473a963f1bfa63f593e909dc0186'
+            '78ed41acc5e5c5528d547599f7614acaa01b23637ac097e3010a90fec1c47368'
+            '50393861c1700f12f83228193098c987f8b647755b5682f9a16f5db428f88a32'
+            '8a716b5c16f02b225ec0f3e1624f13a07f26452972cfc66a3e77cb8469d96895'
+            '861d5d3c48a989f4776e234d2e8fc6b7e78cfe2731252bec9cb00d94a0e29d62'
+            '93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f'
+            'f09977247fa2fcfa306b491523146c8772b38fa007cc1530f4169413fe7c7f3a')
 
 prepare() {
     # Use python2 where appropriate
@@ -62,6 +63,12 @@ prepare() {
     # Sphinx 1.3.5 raises a warning (promoted to error) when using an unknown
     # syntax highlighting language (like "swift").
     ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/swift-sphinx2.patch" )
+
+    # Recent versions of pod2man require an argument to --release.  If no
+    # argument is provided, it will treat the next option as its argument,
+    # thereby breaking all subsequent arguments.  So let's put something
+    # useful there instead :)
+    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/pod2man_release.patch" )
 }
 
 build() {
diff --git a/pod2man_release.patch b/pod2man_release.patch
new file mode 100644
index 000000000000..9943e5a06921
--- /dev/null
+++ b/pod2man_release.patch
@@ -0,0 +1,12 @@
+diff -rpuN a/cmake/modules/SwiftManpage.cmake b/cmake/modules/SwiftManpage.cmake
+--- a/cmake/modules/SwiftManpage.cmake	2016-06-10 16:36:37.737343117 -0700
++++ b/cmake/modules/SwiftManpage.cmake	2016-06-10 16:36:13.480423171 -0700
+@@ -30,7 +30,7 @@ function(manpage)
+       unused_var
+       COMMAND
+         "${POD2MAN}" "--section" "${MP_MAN_SECTION}"
+-        "--center" "${MP_PAGE_HEADER}" "--release"
++        "--center" "${MP_PAGE_HEADER}" "--release" "3.0-DEVELOPMENT"
+         "--name" "${MP_MAN_FILE_BASENAME}"
+         "--stderr"
+         "${MP_SOURCE}" > "${output_file_name}"