Included upstream changes to PKGBUILD

2 files changed, 57 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f6761e1230e..783c2c162cb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,28 @@
 pkgbase = pymol-git
 	pkgdesc = Molecular visualization system on an Open Source foundation
-	pkgver = r4806.c7095ec2
-	pkgrel = 2
-	url = https://pymol.org/
+	pkgver = r5639.ca185848f
+	pkgrel = 1
+	url = https://pymol.org
 	arch = x86_64
 	license = custom
 	makedepends = desktop-file-utils
 	makedepends = gendesk
 	makedepends = mmtf-cpp
 	makedepends = msgpack-c
-	makedepends = netcdf
-	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
+	makedepends = python-setuptools
 	depends = freetype2
 	depends = glew
 	depends = glm
 	depends = glut
+	depends = netcdf
+	depends = netcdf-cxx
 	depends = python-numpy
 	depends = tcsh
-	optdepends = python-pmw: pmw based UI
 	optdepends = python-pyqt5: Qt5 based UI
-	optdepends = ffmpeg: MPEG encoding
-	provides = pymol=r4806.c7095ec2
+	provides = pymol=r5639.ca185848f
 	conflicts = pymol
 	source = pymol::git+https://github.com/schrodinger/pymol-open-source.git
 	source = pymol.png::https://c.fsdn.com/allura/p/pymol/icon
diff --git a/PKGBUILD b/PKGBUILD
index 38e4a03df55f..e603e9a3ca3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,33 @@
-# Maintainer: Lorenzo Gaifas <brisvag at gmail dot com>
+# Maintainer : Matthijs Tadema <m dot j dot tadema at pm dot com>
+# Contributor: Lorenzo Gaifas <brisvag at gmail dot com>
+# Contributor: Caleb Maclennan <caleb@alerque.com>
+# Contributor: Evgeniy Alekseev <arcanis at archlinux dot org>
+# Contributor: graysky
+# Contributor: Tomasz Żok <tomasz dot zok at gmail dot com>
 
 _name=pymol
 pkgname="${_name}-git"
-pkgver=r4806.c7095ec2
-pkgrel=2
-pkgdesc="Molecular visualization system on an Open Source foundation"
-arch=('x86_64')
-url="https://pymol.org/"
-license=('custom')
-depends=('freetype2' 'glew' 'glm' 'glut' 'python-numpy' 'tcsh')
-makedepends=('desktop-file-utils' 'gendesk' 'mmtf-cpp' 'msgpack-c' 'netcdf' 'git')
-optdepends=('python-pmw: pmw based UI'
-            'python-pyqt5: Qt5 based UI'
-			'ffmpeg: MPEG encoding')
+pkgver=r5639.ca185848f
+pkgrel=1
+pkgdesc='Molecular visualization system on an Open Source foundation'
+arch=(x86_64)
+url=https://pymol.org
+license=(custom)
+depends=(freetype2
+         glew
+         glm
+         glut
+         netcdf
+         netcdf-cxx
+         python-numpy
+         tcsh)
+makedepends=(desktop-file-utils
+             gendesk
+             mmtf-cpp
+             msgpack-c
+             python-{build,installer,wheel}
+             python-setuptools)
+optdepends=('python-pyqt5: Qt5 based UI')
 conflicts=('pymol')
 provides=("${_name}=${pkgver}")
 source=(${_name}::"git+https://github.com/schrodinger/pymol-open-source.git"
@@ -26,24 +41,31 @@ pkgver() {
 }
 
 prepare() {
-  # create desktop file
-  gendesk -f -n --pkgname "${_name}" --pkgdesc "${pkgdesc}" \
-          --name="PyMOL Molecular Graphics System" \
-          --categories="Science;Chemistry"
-
-  # suppress non-zero exit code that breaks makepkg
-  sed -i '/sys.exit/ s,2,0,' "${srcdir}/${_name}/setup.py"
+	# create desktop file
+	gendesk -f -n \
+			--pkgname "${_name}" \
+			--name="PyMOL Molecular Graphics System" \
+			--pkgdesc "$pkgdesc" \
+			--exec="${_name} %F" \
+			--mimetypes="chemical/x-pdb;chemical/pdby;chemical/x-mol2;chemical/x-mdl-molfile;chemical/x-mdl-sdfile;chemical/x-xyz;chemical/x-macromodel-input;chemical/x-vmd" \
+			--categories="Science;Chemistry"
+	cd "${srcdir}/${_name}"
+	# suppress non-zero exit code that breaks makepkg
+	sed -i -e '/sys.exit/ s,2,0,' setup.py
+	# setup script PEP 517 compatiblitiy is broken
+	local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+	sed -i -E '/def (finalize_options|make_launch_script)/a \        self.install_libbase="'$site_packages'"' setup.py
 }
 
 build() {
   cd "${srcdir}/${_name}"
-  python setup.py build
+  python -m build -wn
 }
 
 package() {
-  cd "${srcdir}/${_name}"
-  python setup.py install --prefix=/usr --root="${pkgdir}"
-  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm644 "${srcdir}/pymol.desktop" "${pkgdir}/usr/share/applications/pymol.desktop"
-  install -Dm644 "${srcdir}/pymol.png" "${pkgdir}/usr/share/pixmaps/pymol.png"
+	install -Dm0644 -t "$pkgdir/usr/share/applications/" "${srcdir}/${_name}.desktop"
+	install -Dm0644 -t "$pkgdir/usr/share/pixmaps/" "${srcdir}/${_name}.png"
+    cd "${srcdir}/${_name}"
+	python -m installer -d "$pkgdir" dist/*.whl
+	install -Dm0644 -t "$pkgdir/usr/share/licenses/${_name}/" LICENSE
 }