Merging 18 commit(s) from Chromium's toolchain-utils am: 0ae38c8498 am: 2a19d36a82 am: e617e3393dr_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-b-release

Change-Id: I3f25c7ee034b2e20e37ed941b8eae24eec7043eb

1 files changed, 27 insertions, 25 deletions

diff --git a/llvm_extra/create_ebuild_file.py b/llvm_extra/create_ebuild_file.py
index 459e702a..058a270b 100755
--- a/llvm_extra/create_ebuild_file.py
+++ b/llvm_extra/create_ebuild_file.py
@@ -1,25 +1,21 @@
-#!/usr/bin/env python2
-
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 # Copyright 2018 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from __future__ import print_function
+"""Create llvm ebuild file.
 
-import os
-import sys
+This script takes an existing host llvm compiler ebuild and
+creates another build that should be installable in a prefixed location.
+The script patches a few lines in the llvm ebuild to make that happen.
 
-# This script takes an existing host llvm compiler ebuild and
-# creates another build that should be installable in a prefixed location.
-# The script patches a few lines in the llvm ebuild to make that happen.
-#
-# Since the script is based on the current llvm ebuild patterns,
-# it may need to be updated if those patterns change.
-#
-# This script should normally be invoked by the shell script
-# create_llvm_extra.sh .
+Since the script is based on the current llvm ebuild patterns,
+it may need to be updated if those patterns change.
+
+This script should normally be invoked by the shell script
+create_llvm_extra.sh .
 
-"""
 Below is an example of the expected diff of the newly generated ebuild with
 some explanation of the diffs.
 
@@ -40,8 +36,8 @@ diff -Nuar llvm-pre7.0_pre335547_p20180529.ebuild newly-created-file.ebuild
  # Change USE flags to match llvm ebuild installtion. To see the set of flags
  enabled in llvm compiler ebuild, run $ sudo emerge -pv llvm
 
--IUSE="debug +default-compiler-rt +default-libcxx doc libedit +libffi multitarget
-+IUSE="debug +default-compiler-rt +default-libcxx doc libedit +libffi +multitarget
+-IUSE="debug +default-compiler-rt +default-libcxx doc libedit +libffi"
++IUSE="debug +default-compiler-rt +default-libcxx doc libedit +libffi
         ncurses ocaml python llvm-next llvm-tot test xml video_cards_radeon"
 
  COMMON_DEPEND="
@@ -59,8 +55,8 @@ diff -Nuar llvm-pre7.0_pre335547_p20180529.ebuild newly-created-file.ebuild
 
         # Allow custom cmake build types (like 'Gentoo')
  # Convert use of PN to llvm in epatch commands.
--       epatch "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch
-+       epatch "${FILESDIR}"/cmake/llvm-3.8-allow_custom_cmake_build_types.patch
+-       epatch "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build.patch
++       epatch "${FILESDIR}"/cmake/llvm-3.8-allow_custom_cmake_build.patch
 
         # crbug/591436
         epatch "${FILESDIR}"/clang-executable-detection.patch
@@ -94,6 +90,12 @@ diff -Nuar llvm-pre7.0_pre335547_p20180529.ebuild newly-created-file.ebuild
         # some users may find it useful
 """
 
+from __future__ import print_function
+
+import os
+import sys
+
+
 def process_line(line, text):
   # Process the line and append to the text we want to generate.
   # Check if line has any patterns that we want to handle.
@@ -103,7 +105,7 @@ def process_line(line, text):
     text.append(line)
   elif line.startswith('SLOT='):
     # Change SLOT to "${PV%%_p[[:digit:]]*}"
-    SLOT_STRING='SLOT="${PV%%_p[[:digit:]]*}"\n'
+    SLOT_STRING = 'SLOT="${PV%%_p[[:digit:]]*}"\n'
     text.append(SLOT_STRING)
   elif line.startswith('IUSE') and 'multitarget' in line:
     # Enable multitarget USE flag.
@@ -137,9 +139,9 @@ def process_line(line, text):
 
 def main():
   if len(sys.argv) != 3:
-     filename = os.path.basename(__file__)
-     print ('Usage: ', filename,' <input.ebuild> <output.ebuild>')
-     return 1
+    filename = os.path.basename(__file__)
+    print('Usage: ', filename, ' <input.ebuild> <output.ebuild>')
+    return 1
 
   text = []
   with open(sys.argv[1], 'r') as infile:
@@ -147,10 +149,10 @@ def main():
       process_line(line, text)
 
   with open(sys.argv[2], 'w') as outfile:
-    outfile.write("".join(text))
+    outfile.write(''.join(text))
 
   return 0
 
 
-if __name__== "__main__":
+if __name__ == '__main__':
   sys.exit(main())