Switch to vendored LOAD_PATH

2 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1caa46221618..9043fbd889b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
 pkgbase = julia-orderedcollections
 	pkgdesc = Julia implementation of associative containers that preserve insertion order
 	pkgver = 1.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/JuliaCollections/OrderedCollections.jl
 	arch = any
 	license = MIT
 	depends = julia
+	depends = julia-loadpath
 	source = julia-orderedcollections-1.0.2.tar.gz::https://github.com/JuliaCollections/OrderedCollections.jl/archive/v1.0.2.tar.gz
+	source = julia-orderedcollections-Package.toml::https://raw.githubusercontent.com/JuliaRegistries/General/18f9a555382c1ee43861bbc4b1e2df7b3ae0829b/O/OrderedCollections/Package.toml
 	sha256sums = 33d4e568f7cbffe9187d7548e86487f375ec0be07fa0da3743a2e008a8453707
+	sha256sums = 70bf9e181599853f1903f8c8f2ca5f26d9aab31d945df87796d6a2f3c8019060
 
 pkgname = julia-orderedcollections
 
diff --git a/PKGBUILD b/PKGBUILD
index fe58ffb4d508..8479d9649e66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,27 @@
 pkgname=julia-orderedcollections
 _pkgname=OrderedCollections
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Julia implementation of associative containers that preserve insertion order '
 arch=(any)
 url="https://github.com/JuliaCollections/OrderedCollections.jl"
 license=(MIT)
-depends=(julia)
+depends=(julia julia-loadpath)
 
-source=($pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz)
-sha256sums=('33d4e568f7cbffe9187d7548e86487f375ec0be07fa0da3743a2e008a8453707')
+_commit=18f9a555382c1ee43861bbc4b1e2df7b3ae0829b
+source=($pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz
+        $pkgname-Package.toml::https://raw.githubusercontent.com/JuliaRegistries/General/$_commit/${_pkgname:0:1}/$_pkgname/Package.toml)
+sha256sums=('33d4e568f7cbffe9187d7548e86487f375ec0be07fa0da3743a2e008a8453707'
+            '70bf9e181599853f1903f8c8f2ca5f26d9aab31d945df87796d6a2f3c8019060')
 
 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
 }
 
 check() {
 	cd $_pkgname.jl-$pkgver
-	JULIA_LOAD_PATH=src:$JULIA_LOAD_PATH julia test/runtests.jl
+	JULIA_LOAD_PATH=:src julia test/runtests.jl
 }