Switch to vendored LOAD_PATH. Generate Project.toml.

2 files changed, 61 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d8ff8e4d3ae9..032dca1d3668 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,23 @@
 pkgbase = julia-primes
 	pkgdesc = Prime numbers in Julia
 	pkgver = 0.4.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/JuliaMath/Primes.jl
 	arch = any
 	license = MIT
 	depends = julia
 	depends = julia-compat
 	depends = julia-datastructures
+	depends = julia-loadpath
 	depends = julia-orderedcollections
 	source = julia-primes-0.4.0.tar.gz::https://github.com/JuliaMath/Primes.jl/archive/v0.4.0.tar.gz
+	source = julia-primes-Deps.toml::https://raw.githubusercontent.com/JuliaRegistries/General/a5407c18c94c6c262603337392426894f86b3f79/P/Primes/Deps.toml
+	source = julia-primes-Package.toml::https://raw.githubusercontent.com/JuliaRegistries/General/a5407c18c94c6c262603337392426894f86b3f79/P/Primes/Package.toml
+	source = julia-primes-Versions.toml::https://raw.githubusercontent.com/JuliaRegistries/General/a5407c18c94c6c262603337392426894f86b3f79/P/Primes/Versions.toml
 	sha256sums = 489f5c77fc2fceb00b2d8c2571b1e85808322c8e762a5d1712e8bfbfb3c8bc36
+	sha256sums = 1c08fdc3105498ea73a5486a753edab162088ecdff1b7fbfb682855f63344fae
+	sha256sums = 52c8ba7d166e9593828b8ed5bf12e58cccdcc4ae86ea28e63fa8310468f91a14
+	sha256sums = 2abd6401f33937b90d28df5d4a8c806bc4110a4a3e65ece3ba623ab72e1e1c51
 
 pkgname = julia-primes
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f309abefd17..415acdbcfcb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,66 @@
 pkgname=julia-primes
 _pkgname=Primes
 pkgver=0.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Prime numbers in Julia'
 arch=(any)
 url=https://github.com/JuliaMath/Primes.jl
 license=(MIT)
-depends=(julia julia-compat julia-datastructures julia-orderedcollections)
+depends=(julia julia-compat julia-datastructures julia-loadpath julia-orderedcollections)
 
-source=($pkgname-$pkgver.tar.gz::https://github.com/JuliaMath/$_pkgname.jl/archive/v$pkgver.tar.gz)
-sha256sums=('489f5c77fc2fceb00b2d8c2571b1e85808322c8e762a5d1712e8bfbfb3c8bc36')
+_commit=a5407c18c94c6c262603337392426894f86b3f79
+source=($pkgname-$pkgver.tar.gz::https://github.com/JuliaMath/$_pkgname.jl/archive/v$pkgver.tar.gz
+$pkgname-Deps.toml::https://raw.githubusercontent.com/JuliaRegistries/General/$_commit/${_pkgname:0:1}/$_pkgname/Deps.toml
+        $pkgname-Package.toml::https://raw.githubusercontent.com/JuliaRegistries/General/$_commit/${_pkgname:0:1}/$_pkgname/Package.toml
+        $pkgname-Versions.toml::https://raw.githubusercontent.com/JuliaRegistries/General/$_commit/${_pkgname:0:1}/$_pkgname/Versions.toml)
+sha256sums=('489f5c77fc2fceb00b2d8c2571b1e85808322c8e762a5d1712e8bfbfb3c8bc36'
+            '1c08fdc3105498ea73a5486a753edab162088ecdff1b7fbfb682855f63344fae'
+            '52c8ba7d166e9593828b8ed5bf12e58cccdcc4ae86ea28e63fa8310468f91a14'
+            '2abd6401f33937b90d28df5d4a8c806bc4110a4a3e65ece3ba623ab72e1e1c51')
+
+_slug() {
+	local uuid=$(grep uuid $pkgname-Package.toml | cut -f3 -d' ')
+	local sha1=$(grep \"$pkgver\" -a1 $pkgname-Versions.toml | tail -n1 | cut -f3 -d' ')
+	julia -e "u = Base.UUID($uuid);
+	          s = Base.SHA1(hex2bytes($sha1));
+	          println(Base.version_slug(u,s));"
+}
+
+_deps() {
+	julia -e "using Pkg
+
+	          alldeps = Pkg.TOML.parsefile(\"$srcdir/$pkgname-Deps.toml\")
+	          version = join(split(\"$pkgver\", \".\")[1:2],\".\")
+	          deps = Dict{String,Any}()
+
+	          for (key, value) in alldeps
+	            vers = split(key, \"-\")
+
+	            if version == vers[1] || (version > vers[1] && length(vers) == 2 && version <= vers[2])
+	              merge!(deps, value)
+	            end
+	          end
+
+	          Pkg.TOML.print(deps)"
+}
+
+prepare() {
+	# Generate a Project.toml from Registry metadata
+	rm -f Project.toml && touch Project.toml
+	cat $pkgname-Package.toml       >> Project.toml
+	echo -e "version = \"$pkgver\"" >> Project.toml
+	echo -e "\n[deps]"              >> Project.toml
+	echo -e "$(_deps)" | sort       >> Project.toml
+}
 
 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,packages/$_pkgname}
+
+	cp      -r    $_pkgname.jl-$pkgver   "$pkgdir"/usr/share/julia/vendor/$_pkgname
+	install -m644 Project.toml           "$pkgdir"/usr/share/julia/vendor/$_pkgname/Project.toml
+	ln      -s    ../../vendor/$_pkgname "$pkgdir"/usr/share/julia/packages/$_pkgname/$(_slug)
+
+	install -Dm644 $_pkgname.jl-$pkgver/LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 check() {