Replaced PKGBUILD with mine after adoption.

3 files changed, 53 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a529ffe4d48c..a871b20523d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jupyter-matlab_kernel-git
 	pkgdesc = A Jupyter/IPython kernel for Matlab
-	pkgver = r156.3755cb2
+	pkgver = 0.16.9.r0.gab41f9b
 	pkgrel = 1
 	url = https://github.com/Calysto/matlab_kernel.git
 	arch = any
@@ -9,12 +9,14 @@ pkgbase = jupyter-matlab_kernel-git
 	makedepends = jupyter-metakernel
 	depends = python
 	depends = jupyter
-	depends = matlab-engine-for-python
 	depends = jupyter-metakernel
+	optdepends = matlab-engine-for-python: Runtime dependency on matlab kernel.
 	provides = jupyter-matlab_kernel
 	conflicts = jupyter-matlab_kernel
-	source = matlab_kernel::git+https://github.com/Calysto/matlab_kernel.git
+	source = git+https://github.com/Calysto/matlab_kernel.git
+	source = matlab_kernel.install
 	sha256sums = SKIP
+	sha256sums = 1e38965cb9e4b08d253262c0d4cf04a6a420f5924c3823a043138fb3fc0fbded
 
 pkgname = jupyter-matlab_kernel-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 35359b7f6549..4493dcb0d6e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,50 @@
-# Maintainer: Brendan Van Hook <brendan at vastactive dot com>
+# Maintainer: Batuhan Baserdem
+# vim:ft=PKGBUILD
 
-_pkgname=matlab_kernel
-pkgname=jupyter-$_pkgname-git
-pkgver=r156.3755cb2
+_name=matlab_kernel
+pkgname="jupyter-${_name}-git"
+pkgver=0.16.9.r0.gab41f9b
 pkgrel=1
 pkgdesc="A Jupyter/IPython kernel for Matlab"
 arch=('any')
-url="https://github.com/Calysto/matlab_kernel.git"
+url="https://github.com/Calysto/${_name}.git"
 license=('BSD')
-depends=('python' 'jupyter' 'matlab-engine-for-python' 'jupyter-metakernel')
+depends=('python' 'jupyter' 'jupyter-metakernel')
 makedepends=('git' 'jupyter-metakernel')
-provides=(jupyter-$_pkgname)
-conflicts=(jupyter-$_pkgname)
-source=("$_pkgname::git+https://github.com/Calysto/matlab_kernel.git")
-sha256sums=('SKIP')
+optdepends=('matlab-engine-for-python: Runtime dependency on matlab kernel.')
+provides=("jupyter-${_name}")
+conflicts=("jupyter-${_name}")
+source=("git+https://github.com/Calysto/${_name}.git"
+        'matlab_kernel.install')
+sha256sums=('SKIP'
+            '1e38965cb9e4b08d253262c0d4cf04a6a420f5924c3823a043138fb3fc0fbded')
 
 pkgver() {
-  cd $_pkgname
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    # Get git version name
+    cd "${_name}"
+    git describe --long --tags | sed 's|\([^-]*-g\)|r\1|;s|-|.|g;s|^v||g'
 }
 
 build() {
-  cd $srcdir/$_pkgname
-  python setup.py build
-  python -W ignore -c "import json; from matlab_kernel.kernel import MatlabKernel; print(json.dumps(MatlabKernel.kernel_json))" > kernel.json
+    # Build files
+    cd "${srcdir}/${_name}"
+    python setup.py build
 }
 
 package() {
-  cd $srcdir/$_pkgname
-  python setup.py install --root="${pkgdir}" --optimize=1
+    # Install files
+    cd "${srcdir}/${_name}"
+    python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/${pkgname}/LICENSE
-  install -D -m644 kernel.json "$pkgdir/usr/share/jupyter/kernels/$_pkgname/kernel.json"
+    # Install license
+    install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  local _pyver=$(python --version | grep -o "3\.[0-9]")
-  local _pydir=/usr/lib/python${_pyver}/site-packages
-  cd $pkgdir/usr/share/jupyter/kernels/$_pkgname
-  ln -s "$_pydir/metakernel/images/logo-32x32.png"
-  ln -s "$_pydir/metakernel/images/logo-64x64.png"
+    # Input links to images
+    _pyver="$(python --version | grep -o "3\.[0-9]")"
+    _pypre="$(python -c 'import sys; print(sys.prefix)')"
+    _pydir="${_pypre}/lib/python${_pyver}/site-packages"
+    _lndir="${pkgdir}/usr/share/jupyter/kernels/${_name}"
+    install -dm 0755 "${_lndir}"
+    ln -s "${_pydir}/metakernel/images/logo-32x32.png" "${_lndir}/logo-32x32.png"
+    ln -s "${_pydir}/metakernel/images/logo-64x64.png" "${_lndir}/logo-64x64.png"
 }
diff --git a/matlab_kernel.install b/matlab_kernel.install
new file mode 100644
index 000000000000..4ca7e7b25f3c
--- /dev/null
+++ b/matlab_kernel.install
@@ -0,0 +1,15 @@
+post_install() {
+    # Warn users
+    echo '[jupyter-matlab_kernel-git]==> WARNING!'
+    echo 'matlab-engine-for-python is listed as an optional dependency.'
+    echo 'The reason for this is the AUR packaged version is not a proper package,'
+    echo 'AND most people will not bother packaging MATLAB for arch.'
+    echo 'For proper integration; you can;'
+    echo '* Install MATLAB Engine API for Python directly from your MATLAB installation'
+    echo '  https://www.mathworks.com/help/matlab/matlab_external/install-the-matlab-engine-for-python.html'
+    echo '* Run the PKGBUILD for the API on a machine that already has MATLAB'
+    echo '  (Read through the script to make sure your MATLAB is detected correctly.)'
+    echo '* Check my MATLAB PKGBUILD on how to package your MATLAB installation.'
+    echo '  https://github.com/bbaserdem/Arch/tree/master/matlab'
+    echo 'Without a working MATLAB python API installation; the kernel will not work'
+}