From 2415a2b094aa25ded6ff2ec28f78ceb304f326f2 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 9 Mar 2019 15:35:25 +0000
Subject: [PATCH 1/3] Python2: don't install 2to3, clashes with Python3
 equivalent

---
 .../Python2-2.7.11-017-dont-install-2to3.patch       | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/lang/Python2/patches/Python2-2.7.11-017-dont-install-2to3.patch

diff --git a/packages/lang/Python2/patches/Python2-2.7.11-017-dont-install-2to3.patch b/packages/lang/Python2/patches/Python2-2.7.11-017-dont-install-2to3.patch
new file mode 100644
index 0000000000..64c09ddf79
--- /dev/null
+++ b/packages/lang/Python2/patches/Python2-2.7.11-017-dont-install-2to3.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 69b76e7..7a50cc3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2315,7 +2315,6 @@ def main():
+ 
+           # Scripts to install
+           scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
+-                     'Tools/scripts/2to3',
+                      'Lib/smtpd.py']
+         )
+ 

From eff50203e17e1a0179b001e62413611f97299737 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 9 Mar 2019 22:02:33 +0000
Subject: [PATCH 2/3] scripts/build: clobber existing files

---
 scripts/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build b/scripts/build
index f96a07f7f6..db6ac4f707 100755
--- a/scripts/build
+++ b/scripts/build
@@ -448,7 +448,7 @@ done
 
 # Transfer the new sysroot content to the shared sysroot
 mkdir -p "${PKG_ORIG_SYSROOT_PREFIX}"
-cp -PR "${SYSROOT_PREFIX}"/* "${PKG_ORIG_SYSROOT_PREFIX}"
+cp -PRf "${SYSROOT_PREFIX}"/* "${PKG_ORIG_SYSROOT_PREFIX}"
 rm -rf "${SYSROOT_PREFIX}"
 
 export SYSROOT_PREFIX="${PKG_ORIG_SYSROOT_PREFIX}"

From 0b3103e455281560e6aa4379d84fac2affbdfed8 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 18 Mar 2019 09:46:56 +0000
Subject: [PATCH 3/3] scripts/install_addon: fix typo (cosmetic)

---
 scripts/install_addon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install_addon b/scripts/install_addon
index e74d0bb85e..47e479c9cd 100755
--- a/scripts/install_addon
+++ b/scripts/install_addon
@@ -26,7 +26,7 @@ if [ -f $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip ]; then
   if [ "$ADDON_OVERWRITE" = "yes" ]; then
     rm $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip
   else
-    build_msg "CLR_WARNING" "*** WARNING: ${PKG_ADDON_ID}-${ADDONVER}.zip already exists. Not overwrittng it. ***"
+    build_msg "CLR_WARNING" "*** WARNING: ${PKG_ADDON_ID}-${ADDONVER}.zip already exists. Not overwriting it. ***"
     exit 0
   fi
 fi