Switch to vendored LOAD_PATH

2 files changed, 19 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffae6a5d329c..f1f85da48370 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
 pkgbase = julia-softglobalscope
 	pkgdesc = Utilities for "soft" global scope in interactive Julia environments
 	pkgver = 1.0.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/stevengj/SoftGlobalScope.jl
 	arch = any
 	license = MIT
 	depends = julia
 	depends = julia-compat
-	source = softglobalscope-1.0.8.tar.gz::https://github.com/stevengj/SoftGlobalScope.jl/archive/v1.0.8.tar.gz
+	depends = julia-loadpath
+	source = julia-softglobalscope-1.0.8.tar.gz::https://github.com/stevengj/SoftGlobalScope.jl/archive/v1.0.8.tar.gz
+	source = julia-softglobalscope-Package.toml::https://raw.githubusercontent.com/JuliaRegistries/General/a310c7f9fd217fb3550aef0c66fc5fd3cf42c8fb/S/SoftGlobalScope/Package.toml
 	sha256sums = 6ae2150fb04756cc1b353bcfd03135e20f2d0511cb9178a9398a39ef8c6d3f47
+	sha256sums = bd88b87dce5f48dd61010d56f75d2cf8aa73ddfca287c5fdc6f71a09c2bd9ca4
 
 pkgname = julia-softglobalscope
 
diff --git a/PKGBUILD b/PKGBUILD
index 5079c0987151..1bc6711933f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,29 @@
 pkgname=julia-softglobalscope
 _pkgname=SoftGlobalScope
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Utilities for "soft" global scope in interactive Julia environments'
 arch=(any)
 url=https://github.com/stevengj/SoftGlobalScope.jl
 license=(MIT)
-depends=(julia julia-compat)
+depends=(julia julia-compat julia-loadpath)
 
-source=(${_pkgname,,}-$pkgver.tar.gz::https://github.com/stevengj/$_pkgname.jl/archive/v$pkgver.tar.gz)
-sha256sums=('6ae2150fb04756cc1b353bcfd03135e20f2d0511cb9178a9398a39ef8c6d3f47')
+_commit=a310c7f9fd217fb3550aef0c66fc5fd3cf42c8fb
+source=($pkgname-$pkgver.tar.gz::https://github.com/stevengj/$_pkgname.jl/archive/v$pkgver.tar.gz
+        $pkgname-Package.toml::https://raw.githubusercontent.com/JuliaRegistries/General/$_commit/${_pkgname:0:1}/$_pkgname/Package.toml)
+sha256sums=('6ae2150fb04756cc1b353bcfd03135e20f2d0511cb9178a9398a39ef8c6d3f47'
+            'bd88b87dce5f48dd61010d56f75d2cf8aa73ddfca287c5fdc6f71a09c2bd9ca4')
 
 package() {
-	cd $_pkgname.jl-$pkgver
-	install -dm755 $pkgdir/usr/share/julia/environments/v1.0/$_pkgname
-	cp -r {src,test} $pkgdir/usr/share/julia/environments/v1.0/$_pkgname/
+	install -d "$pkgdir"/usr/share/julia/vendor
+
+	cp      -r     $_pkgname.jl-$pkgver  "$pkgdir"/usr/share/julia/vendor/$_pkgname
+	install -m644  $pkgname-Package.toml "$pkgdir"/usr/share/julia/vendor/$_pkgname/Project.toml
+
+	install -Dm644 $_pkgname.jl-$pkgver/LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 check() {
 	cd $_pkgname.jl-$pkgver
-	JULIA_LOAD_PATH=src:$JULIA_LOAD_PATH julia test/runtests.jl
+	HOME="$srcdir" JULIA_LOAD_PATH=src: julia test/runtests.jl
 }