Switch to Python 3, don't install common license

2 files changed, 44 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c81be874432d..d2149c3bc8f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,24 @@
 pkgbase = searx-git
 	pkgdesc = Privacy-respecting metasearch engine (git)
-	pkgver = 0.15.0+r155+g8e62f760
+	pkgver = 0.15.0+r348+g34ad3d6b
 	pkgrel = 1
 	url = https://asciimoo.github.io/searx/
 	arch = any
 	license = AGPL3
 	makedepends = git
-	depends = python2-certifi
-	depends = python2-babel
-	depends = python2-flask-babel
-	depends = python2-flask
-	depends = python2-idna
-	depends = python2-jinja
-	depends = python2-lxml
-	depends = python2-pygments
-	depends = python2-pyopenssl
-	depends = python2-dateutil
-	depends = python2-yaml
-	depends = python2-requests
-	depends = python2-pysocks
+	depends = python-certifi
+	depends = python-babel
+	depends = python-flask-babel
+	depends = python-flask
+	depends = python-idna
+	depends = python-jinja
+	depends = python-lxml
+	depends = python-pygments
+	depends = python-pyopenssl
+	depends = python-dateutil
+	depends = python-yaml
+	depends = python-requests
+	depends = python-pysocks
 	optdepends = filtron: filter incoming HTTP requests
 	optdepends = morty: proxy server for search results
 	provides = searx
diff --git a/PKGBUILD b/PKGBUILD
index 8f58276e4a8e..1b1aa56eb8dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,35 +2,41 @@
 # Contributor: Reventlov <contact+aur at volcanis dot me>
 
 pkgname=searx-git
-pkgver=0.15.0+r155+g8e62f760
+pkgver=0.15.0+r348+g34ad3d6b
 pkgrel=1
 pkgdesc='Privacy-respecting metasearch engine (git)'
 arch=(any)
 url=https://asciimoo.github.io/searx/
 license=(AGPL3)
-depends=(python2-certifi
-         python2-babel
-         python2-flask-babel
-         python2-flask
-         python2-idna
-         python2-jinja
-         python2-lxml
-         python2-pygments
-         python2-pyopenssl
-         python2-dateutil
-         python2-yaml
-         python2-requests
-         python2-pysocks)
+depends=(
+  python-certifi
+  python-babel
+  python-flask-babel
+  python-flask
+  python-idna
+  python-jinja
+  python-lxml
+  python-pygments
+  python-pyopenssl
+  python-dateutil
+  python-yaml
+  python-requests
+  python-pysocks
+)
 makedepends=(git)
-optdepends=('filtron: filter incoming HTTP requests'
-            'morty: proxy server for search results')
+optdepends=(
+  'filtron: filter incoming HTTP requests'
+  'morty: proxy server for search results'
+)
 provides=(searx)
 conflicts=(searx)
 backup=(etc/searx.conf)
-source=(git+https://github.com/asciimoo/searx
-        searx.service
-        searx.sysusers.d
-        searx.tmpfiles.d)
+source=(
+  git+https://github.com/asciimoo/searx
+  searx.service
+  searx.sysusers.d
+  searx.tmpfiles.d
+)
 sha512sums=('SKIP'
             'cc58068e502b088c61016a5cd25db248f5fae146f18e00253f3aa0ccd666189ef3a407e00bf9181c23e643e68df7e4f9eec295bf680c982052978c2786325d0a'
             '39b765ade096778ad945725e0ca5c0919e4baff4e7a466e0d093e68d1a92c563a5437caed01e44accf04ac51450007e659435d32a84e818df213de3f9e546793'
@@ -43,6 +49,7 @@ pkgver() {
 
 prepare() {
   cd searx
+
   # Allow newer libraries since we can't guarantee older library versions
   sed -i 's#==#>=#g' requirements.txt
 }
@@ -50,15 +57,14 @@ prepare() {
 package() {
   cd searx
 
-  python2 setup.py install --root="$pkgdir" --optimize=1
+  python setup.py install --root="$pkgdir" -O1
+
   # Move incorrectly-placed searx files
-  mv "$pkgdir"/usr/lib/python2.7/site-packages/{README.rst,requirements*,searx}
+  mv "$pkgdir"/usr/lib/python3.8/site-packages/{README.rst,requirements*,searx}
 
   install -Dm 600 searx/settings.yml "$pkgdir"/etc/searx.conf
 
   install -Dm 644 ../searx.service -t "$pkgdir"/usr/lib/systemd/system
   install -Dm 644 ../searx.sysusers.d "$pkgdir"/usr/lib/sysusers.d/searx.conf
   install -Dm 644 ../searx.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/searx.conf
-
-  install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/searx
 }