CVS commit: pkgsrc/devel/py-jupyter_core

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Tue Feb  6 01:40:48 UTC 2018

Modified Files:
        pkgsrc/devel/py-jupyter_core: Makefile distinfo
Added Files:
        pkgsrc/devel/py-jupyter_core/patches: patch-jupyter__core_paths.py

Log Message:
devel/py-jupyter_core: Add ${PREFIX} to Jupyter's system prefixes

This enables Jupyter to discover kernels installed by pkgsrc packages
other than py-ipykernel.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-jupyter_core/Makefile \
    pkgsrc/devel/py-jupyter_core/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-jupyter_core/patches/patch-jupyter__core_paths.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-jupyter_core/Makefile
diff -u pkgsrc/devel/py-jupyter_core/Makefile:1.2 pkgsrc/devel/py-jupyter_core/Makefile:1.3
--- pkgsrc/devel/py-jupyter_core/Makefile:1.2   Thu Nov  2 10:47:37 2017
+++ pkgsrc/devel/py-jupyter_core/Makefile       Tue Feb  6 01:40:48 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2017/11/02 10:47:37 adam Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/06 01:40:48 minskim Exp $
 
 DISTNAME=      jupyter_core-4.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=j/jupyter_core/}
 
@@ -15,6 +16,12 @@ BUILD_DEPENDS+=      ${PYPKGPREFIX}-test-[0-9
 
 USE_LANGUAGES= # none
 
+SUBST_CLASSES+=                        fix-prefix
+SUBST_STAGE.fix-prefix=                pre-configure
+SUBST_MESSAGE.fix-prefix=      Fixing prefix.
+SUBST_FILES.fix-prefix=                jupyter_core/paths.py
+SUBST_SED.fix-prefix=          -e 's,@PREFIX@,${PREFIX},g'
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} jupyter jupyter${PYVERSSUFFIX} && \
Index: pkgsrc/devel/py-jupyter_core/distinfo
diff -u pkgsrc/devel/py-jupyter_core/distinfo:1.2 pkgsrc/devel/py-jupyter_core/distinfo:1.3
--- pkgsrc/devel/py-jupyter_core/distinfo:1.2   Thu Nov  2 10:47:37 2017
+++ pkgsrc/devel/py-jupyter_core/distinfo       Tue Feb  6 01:40:48 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2017/11/02 10:47:37 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/02/06 01:40:48 minskim Exp $
 
 SHA1 (jupyter_core-4.4.0.tar.gz) = 24ac33f4a1b1ff8e946cb1d563eb5989fdf8c6ef
 RMD160 (jupyter_core-4.4.0.tar.gz) = 1949d15f4f635b6919cbd07dbdd05f98702728cd
 SHA512 (jupyter_core-4.4.0.tar.gz) = 387f7f98f640b85ff0a24f11e1beae5a851d7eb3ba4a423be028940cb018c0d0ddf42ae8a1c397e3e4cafa560d3a5385b39bb8794448c7c010be7f0ddcba8a9e
 Size (jupyter_core-4.4.0.tar.gz) = 63613 bytes
+SHA1 (patch-jupyter__core_paths.py) = 2ed2b8bda891e323f7102e36fd66cfd61340b822

Added files:

Index: pkgsrc/devel/py-jupyter_core/patches/patch-jupyter__core_paths.py
diff -u /dev/null pkgsrc/devel/py-jupyter_core/patches/patch-jupyter__core_paths.py:1.1
--- /dev/null   Tue Feb  6 01:40:48 2018
+++ pkgsrc/devel/py-jupyter_core/patches/patch-jupyter__core_paths.py   Tue Feb  6 01:40:48 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-jupyter__core_paths.py,v 1.1 2018/02/06 01:40:48 minskim Exp $
+
+Enable Jupyter to discover kernels installed by pkgsrc packages.
+
+--- jupyter_core/paths.py.orig 2017-10-11 14:52:06.000000000 +0000
++++ jupyter_core/paths.py
+@@ -118,6 +118,7 @@ if os.name == 'nt':
+         SYSTEM_JUPYTER_PATH = [os.path.join(sys.prefix, 'share', 'jupyter')]
+ else:
+     SYSTEM_JUPYTER_PATH = [
++        "@PREFIX@/share/jupyter",
+         "/usr/local/share/jupyter",
+         "/usr/share/jupyter",
+     ]