Remove python2 patch + pkgbuild cleanup (#8)

Reviewed-on: https://git.polarian.dev/AUR/google-cloud-cli/pulls/8
Co-authored-by: David Němec <david@nemec.co>
Co-committed-by: David Němec <david@nemec.co>

3 files changed, 2 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1aaeab1315e..2b609f03ddc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = google-cloud-cli
 	pkgdesc = A set of command-line tools for the Google Cloud Platform. Includes gcloud (with beta and alpha commands), gsutil, and bq.
 	pkgver = 444.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cloud.google.com/cli/
 	arch = any
 	license = Apache
 	depends = python
-	optdepends = python2: for dev_appserver.py and endpointscfg support
 	optdepends = python-crcmod: [gsutil] verify the integrity of GCS object contents
 	provides = google-cloud-sdk
 	conflicts = google-cloud-sdk
@@ -14,11 +13,9 @@ pkgbase = google-cloud-cli
 	options = staticlibs
 	source = google-cloud-cli-444.0.0.orig.tar.gz::https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/google-cloud-cli_444.0.0.orig.tar.gz
 	source = google-cloud-cli.sh
-	source = 0001-set-python2-for-dev-appserver-py.patch
 	source = 0003-add-compdef-to-zsh-completion.patch
 	sha256sums = 201194b401861e3a2b95b08e905b289b5cda14c5df05e48b5a9e84eb523ea901
 	sha256sums = e03ffb8a534b175dc497621a0396bcc29884279daa519e2cb90bd98c61d6530a
-	sha256sums = 62ec7f56e09168d375823e9e99fcdcfbf40b0fffdd75f35cf91122c5902c82e9
 	sha256sums = 4694f5191ceea7cf8076861ce5790ba9e809023da278b0f6ed862b9611e5aa93
 
 pkgname = google-cloud-cli
diff --git a/0001-set-python2-for-dev-appserver-py.patch b/0001-set-python2-for-dev-appserver-py.patch
deleted file mode 100644
index 9332d42de003..000000000000
--- a/0001-set-python2-for-dev-appserver-py.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN --color a/bin/dev_appserver.py b/bin/dev_appserver.py
---- a/bin/dev_appserver.py	2020-01-23 19:38:55.457052071 -0800
-+++ b/bin/dev_appserver.py	2020-01-23 19:41:10.211160929 -0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #
- # Copyright 2015 Google Inc. All Rights Reserved.
- #
diff --git a/PKGBUILD b/PKGBUILD
index a99fe8e9e224..f2f3203b6c48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,21 +14,19 @@
 _extractedName="google-cloud-sdk"
 pkgname="google-cloud-cli"
 pkgver=444.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of command-line tools for the Google Cloud Platform. Includes gcloud (with beta and alpha commands), gsutil, and bq."
 url="https://cloud.google.com/cli/"
 license=("Apache")
 arch=('any')
 depends=('python')
 optdepends=(
-  "python2: for dev_appserver.py and endpointscfg support"
   "python-crcmod: [gsutil] verify the integrity of GCS object contents"
 )
 options=('!strip' 'staticlibs')
 source=(
   "$pkgname-$pkgver.orig.tar.gz::https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/${pkgname}_${pkgver}.orig.tar.gz"
   "google-cloud-cli.sh"
-  "0001-set-python2-for-dev-appserver-py.patch"
   "0003-add-compdef-to-zsh-completion.patch"
 )
 # Conflict the old package name to force migration
@@ -36,7 +34,6 @@ conflicts=('google-cloud-sdk')
 provides=('google-cloud-sdk')
 sha256sums=('201194b401861e3a2b95b08e905b289b5cda14c5df05e48b5a9e84eb523ea901'
             'e03ffb8a534b175dc497621a0396bcc29884279daa519e2cb90bd98c61d6530a'
-            '62ec7f56e09168d375823e9e99fcdcfbf40b0fffdd75f35cf91122c5902c82e9'
             '4694f5191ceea7cf8076861ce5790ba9e809023da278b0f6ed862b9611e5aa93')
 
 prepare() {
@@ -68,8 +65,6 @@ package() {
     --bash-completion false \
     > /dev/null
 
-  rm -rf "${pkgdir}/opt/${pkgname}/.install/.backup"
-  mkdir "${pkgdir}/opt/${pkgname}/.install/.backup"
   find $pkgdir -name '__pycache__' -type d -exec rm -rf {} +
 
   install -D -m 0755 "${srcdir}/${source[1]}" \
@@ -83,16 +78,4 @@ package() {
 
   mkdir -p "${pkgdir}/usr/share"
   mv -f "${pkgdir}/opt/${pkgname}/help/man" "${pkgdir}/usr/share/"
-  chmod 0755 "${pkgdir}/usr/share/man"
-  chmod 0755 "${pkgdir}/usr/share/man/man1"
-
-  mkdir -p "${pkgdir}/usr/bin"
-  for i in "${pkgdir}/opt/${pkgname}/bin"/*; do
-    ln -st "${pkgdir}/usr/bin/" "${i#${pkgdir}}"
-  done
-  rm -f "${pkgdir}"/usr/bin/{bq,dev_appserver.py*,java_dev_appserver.sh}
-
-  chmod -x "${pkgdir}"/usr/share/man/man1/*
-  find "${pkgdir}/opt/${pkgname}" -name "*.html" -o -name "*.json" -exec chmod -x {} \;
-  find "${pkgdir}/opt/${pkgname}" -name "*_test.py" -exec chmod +x {} \;
 }