gentoo resync : 24.07.2021

3 files changed, 20 insertions, 4 deletions

diff --git a/dev-lang/janet/Manifest b/dev-lang/janet/Manifest
index 5f0efbde2dc8..746e936a0a44 100644
--- a/dev-lang/janet/Manifest
+++ b/dev-lang/janet/Manifest
@@ -1,5 +1,6 @@
-DIST janet-1.13.1.tar.gz 584998 BLAKE2B f1bfd9e62dde786127a1307d38f48fc7e75b9fb09f009f9d01eeefa593b67c2469e213fd366fac7c52e0372e61b1a9afdb558e8a1be1ab2f4f538b5fb39075f3 SHA512 8022ecbaf7680855611202a3c17b8e5f6dc61a9302508c9de5312dbd9e80d40c24786bb5e8ae653ab5a7b00191a2d7c44cc3e305d31245e3e8c53be0e1c80372
+AUX janet-1.16.1-make.patch 435 BLAKE2B a8d038c83a051e8d93dbdaa3456a9c93403a11dbe6b38cc2283c2b1884235ad76a42707d1c19bd5db2f66a86cdbacfd36196a12abea9fc66c4ac78fba5dcea50 SHA512 a9fab424e33d50e56c9ab3090a0b1a6c5b477e459128f1529deaf2452705345829c23d8a86b7e37bf1e7fc24fc37dffe293cc67550b24b065b439e0b5a9ead5e
 DIST janet-1.15.5.tar.gz 601033 BLAKE2B dfc8c2a2d238f2554aae667f706e84905ba15c732fa2f06b3c537f08d064375dcb00043117dfc56328365627e2e8f4e2a8f171731d9d6bc0d48206cea58f127c SHA512 ebdc090de6fbea0c94f0618957a4b36776fa0009298df77b279b79064d4524e73f42723ba2c315167cb6f3a40f2a4dffbb2a865fa2d479ba196aa9f0aa24cbf6
-EBUILD janet-1.13.1.ebuild 1748 BLAKE2B d33aedc446e1692e0c39aace488070501e3cff1efff6545fd0d43710efa16d7a5a5cc52d0fbc360756b04d78dd8f015c12526cab986bad05bd75de5326fae923 SHA512 9d41ab1921792cfc549d1bb8b9bebe3b8080de6ade08ca189ea8422bfa3a7106e722374b31d240caee2d00656b85dca99bf69608218ee20e2c2677b43083b09d
+DIST janet-1.16.1.tar.gz 493490 BLAKE2B 7542644a647d9d2ddd73d8e284f749cdad1900b8df2797c99a2f176c93eca412427b7f571493cfe62f64dd9c90bd12d8506b0f4b6b485ab2d3633e989e735cd9 SHA512 f4be0703676acad8896e41b46d79c4f6d99990c487028f1fd1abd681f756db119a06a5d6a0653b9301afcd62f45d6f1bb7876b9613c0ea28d7199e310a52895d
 EBUILD janet-1.15.5.ebuild 1748 BLAKE2B 50067fd265f5e08344fe43f59628c1a5b9c5f1a735f85e9a1d8eee680af21443915d66120dcb07dcc3c317e20201168261bd9b65ae883fcfaae74448d6ec746f SHA512 957db602a769368862904df84deb119eea06b70fe46c07a41af3cef0bbe3bd66c6dc64885440da73fe44572fd522cb6e0b5a8cd5f9560c29f228802823cdd74d
+EBUILD janet-1.16.1.ebuild 1790 BLAKE2B 09702dccd44f59a809bb2e001d9197e83d7196b8cfe17e7659a931ba3b6d83920b68a102ff9289b23539c5be1cd470fc263fcda36186f47991cbef1a30888783 SHA512 c4343c4135e929d30d78e0f9f76573c3fabb11f5760343ab833e366e0b6089fcf70fd65783ad5b79570cb2d98f2ca64e304e96c6f74780c938cf5a0f949e5d62
 MISC metadata.xml 990 BLAKE2B 7e8a261e9007ef46da4944eb81ff4ea35cde6c9c510e63f5407215974302fa0410d9c38ce1356fb7ce1648c81e0c42cb16dd74b46c2d9f277c7bf1044c5a44e3 SHA512 35291cbd14a89e3ce9b6ed31eee97253dcc7e82f6a6310f669449518778eb137a1240d04a55e5f30d5de479c50ca7eec6e0bee5e64d035e8e0705746de6cfe3d
diff --git a/dev-lang/janet/files/janet-1.16.1-make.patch b/dev-lang/janet/files/janet-1.16.1-make.patch
new file mode 100644
index 000000000000..09429f4ff08b
--- /dev/null
+++ b/dev-lang/janet/files/janet-1.16.1-make.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 7efef93b..12758ab0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -254,7 +254,7 @@ build/doc.html: $(JANET_TARGET) tools/gendoc.janet
+ 
+ build/jpm: jpm $(JANET_TARGET)
+ 	$(JANET_TARGET) tools/patch-jpm.janet jpm build/jpm "--libpath=$(LIBDIR)" "--headerpath=$(INCLUDEDIR)/janet" "--binpath=$(BINDIR)"
+-	chmod +x build/jpm
++	chmod +x jpm
+ 
+ .INTERMEDIATE: build/janet.pc
+ build/janet.pc: $(JANET_TARGET)
diff --git a/dev-lang/janet/janet-1.13.1.ebuild b/dev-lang/janet/janet-1.16.1.ebuild
index eafa5bbb9208..16f31087d1a9 100644
--- a/dev-lang/janet/janet-1.13.1.ebuild
+++ b/dev-lang/janet/janet-1.16.1.ebuild
@@ -16,6 +16,8 @@ IUSE="static-libs"
 
 MY_RELEASE="${PV::-2}"
 
+PATCHES="${FILESDIR}/janet-1.16.1-make.patch"
+
 src_configure() {
 	append-ldflags -Wl,-soname,libjanet.so.1.${MY_RELEASE}
 	append-cflags -fPIC
@@ -25,7 +27,7 @@ src_compile() {
 	# janet_build is the git hash of the commit related to the
 	# current release - it defines a constant which is then shown
 	# when starting janet
-	local janet_build='\"1.13.1\"'
+	local janet_build='\"'${PV}'\"'
 	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" JANET_BUILD="${janet_build}"
 	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" build/janet.pc JANET_BUILD="${janet_build}"
 	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" docs JANET_BUILD="${janet_build}"
@@ -34,7 +36,7 @@ src_compile() {
 
 src_install() {
 	dobin "build/janet"
-	dobin "build/jpm"
+	dobin "jpm"
 	insinto "usr/include/janet"
 	doheader "src/include/janet.h"
 	doheader "src/conf/janetconf.h"