From e5de90d2c97b13e916e9843c189e2260fca7c0a4 Mon Sep 17 00:00:00 2001
From: Milton Woods <milton.woods@bom.gov.au>
Date: Sun, 30 Apr 2017 11:40:31 +1000
Subject: [PATCH] qt: move licence acceptance from qt3krell.patch to
 qt3accept.patch

---
 .../repos/builtin/packages/qt/package.py      |  1 +
 .../repos/builtin/packages/qt/qt3accept.patch | 38 +++++++++++++++++++
 .../repos/builtin/packages/qt/qt3krell.patch  | 38 -------------------
 3 files changed, 39 insertions(+), 38 deletions(-)
 create mode 100644 var/spack/repos/builtin/packages/qt/qt3accept.patch

diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 3f3defeb8cd..8e0c89f538c 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -71,6 +71,7 @@ class Qt(Package):
     # see https://github.com/Homebrew/homebrew-core/pull/5951
     patch('restore-pc-files.patch', when='@5.9: platform=darwin')
 
+    patch('qt3accept.patch', when='@3.3.8b')
     patch('qt3krell.patch', when='@3.3.8b+krellpatch')
 
     # see https://bugreports.qt.io/browse/QTBUG-57656
diff --git a/var/spack/repos/builtin/packages/qt/qt3accept.patch b/var/spack/repos/builtin/packages/qt/qt3accept.patch
new file mode 100644
index 00000000000..32dfb9df08e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/qt/qt3accept.patch
@@ -0,0 +1,38 @@
+--- qt-x11-free-3.3.8b/configure	2008-01-15 13:09:15.000000000 -0600
++++ qt-x11-free-3.3.8b-fixes/configure	2015-07-08 15:49:03.379560633 -0500
+@@ -2339,7 +2339,7 @@
+         else
+             echo "Do you accept the terms of the $TheLicense? \c"
+         fi
+-        read acceptance
++        acceptance=yes
+         echo
+ 	if [ "$acceptance" = yes ]; then
+ 	    break
+@@ -2397,7 +2397,7 @@
+ 	else
+ 	    echo "Do you accept the terms of $affix license? \c"
+ 	fi
+-	read acceptance
++        acceptance=yes
+ 	echo
+ 	if [ "$acceptance" = "yes" ]; then
+ 	    break
+@@ -2443,7 +2443,7 @@
+ 	else
+ 	    echo "Do you accept the terms of the license? \c"
+ 	fi
+-	read acceptance
++        acceptance=yes
+ 	echo
+ 	if [ "$acceptance" = "yes" ]; then
+ 	    break
+@@ -2524,7 +2524,7 @@
+ 	else
+ 	    echo "Do you accept the terms of the $Platform License? \c"
+ 	fi
+-	read acceptance
++        acceptance=yes
+ 	echo
+ 	if [ "$acceptance" = "yes" ]; then
+ 	    break
diff --git a/var/spack/repos/builtin/packages/qt/qt3krell.patch b/var/spack/repos/builtin/packages/qt/qt3krell.patch
index 3333eeacd4c..4f1c12e43e8 100644
--- a/var/spack/repos/builtin/packages/qt/qt3krell.patch
+++ b/var/spack/repos/builtin/packages/qt/qt3krell.patch
@@ -28,41 +28,3 @@
  #endif
  
  template <class T>
---- qt-x11-free-3.3.8b/configure	2008-01-15 13:09:15.000000000 -0600
-+++ qt-x11-free-3.3.8b-fixes/configure	2015-07-08 15:49:03.379560633 -0500
-@@ -2339,7 +2339,7 @@
-         else
-             echo "Do you accept the terms of the $TheLicense? \c"
-         fi
--        read acceptance
-+        acceptance=yes
-         echo
- 	if [ "$acceptance" = yes ]; then
- 	    break
-@@ -2397,7 +2397,7 @@
- 	else
- 	    echo "Do you accept the terms of $affix license? \c"
- 	fi
--	read acceptance
-+        acceptance=yes
- 	echo
- 	if [ "$acceptance" = "yes" ]; then
- 	    break
-@@ -2443,7 +2443,7 @@
- 	else
- 	    echo "Do you accept the terms of the license? \c"
- 	fi
--	read acceptance
-+        acceptance=yes
- 	echo
- 	if [ "$acceptance" = "yes" ]; then
- 	    break
-@@ -2524,7 +2524,7 @@
- 	else
- 	    echo "Do you accept the terms of the $Platform License? \c"
- 	fi
--	read acceptance
-+        acceptance=yes
- 	echo
- 	if [ "$acceptance" = "yes" ]; then
- 	    break