gentoo auto-resync : 21:04:2023 - 12:02:15

4 files changed, 5 insertions, 41 deletions

diff --git a/app-emacs/jinx/Manifest b/app-emacs/jinx/Manifest
index 999ebd3515a5..c55cc66a030d 100644
--- a/app-emacs/jinx/Manifest
+++ b/app-emacs/jinx/Manifest
@@ -1,5 +1,4 @@
-AUX 50jinx-gentoo.el 190 BLAKE2B 8b113ff9d9d377b46055bd4c485aa8e7e93db737b1997ba0c6ee951691441a66e16c31bd2ac4485d1f34b8f170c5046da1bb927b582004482f43dc87a962bd4e SHA512 d09e497620b9f7056c7c55cee35bd0bba2cb2a5aaad4d3b760364b28c3ce2a76da7c07d31fd49e33025754a8883bce390fdf3c2e0c6f855182f2326aff0c689a
-AUX jinx-0.6-try-load-path.patch 1066 BLAKE2B 73746f6bab3633f7d9a22410c8726685d778dcbed60bcee9a1dd4e3eef8dc49e97d30c8b15364a865be2718bca5f6a27e34b526fa022302fbd77d1f5b00d23a1 SHA512 ca610b05fb205fb74d38d84871fbf507ad5a9bbf878858ae40e195d8dd6bda0a350e3e4352d6403a0b3c58ce3a0b2c9b6b1a6a156d3ff933477fe00bed138ba4
-DIST jinx-0.6.tar.xz 16692 BLAKE2B 49a391b55b809dd6749ce264b4f732b5c902c1ea67a39e681327ddcf8f728271897202ecd282dc5c4999cf336a5b37c89b9863239291fc944cee352920d99189 SHA512 aa253836d04aec04674ca6dbbd1e73719bee78f4d01d4d93eef2cb05f4c3edc6ec4a11c352fb8952780523f187581fae9c33ea0d30416ec30803b7a196d03f60
-EBUILD jinx-0.6.ebuild 880 BLAKE2B 35139546fd7ff06b7f8eb361f11263befedfb820a4f65871ba99d3c1e0f004f0b15b580eb361c05e5233cfdf8a4c4a222f7b02f06494de3e9e19b2d7cbc2be3c SHA512 a6120ceac27d5124bde41c631f5aea1bed4e3ea5cf752fbc59adc5101dcf84e5e3d9d2da09f01579d754044adcbb9786704892eec1ae416f479adf38be070e33
+AUX 50jinx-gentoo.el 191 BLAKE2B a183a9485eea61590192547a8c99e8c974b1974851073a49a33304ec0d9d43158279669aa8dc2ca26d9521c61b229c9fd490dec81643126f678585974dea7483 SHA512 dc0378743253f61f1c94d7fbcf8e3fff767296eecb26e856bbb5f24409b879e3d1a4f52efe87ea0ce106281b216396e94a72a7842b0fe4a48a80b4c41cb05921
+DIST jinx-0.7.tar.xz 17816 BLAKE2B d31ae1c35c5808237890c5c6ecaab915af7cc70260ae05de06c049a9bc250c3ff824a18256715fb7ed12e02df60b24aa957192b95fd3a0ab28e5102f5cf63718 SHA512 ed291b1d5eb5b799f629ed3d0d5bfca65e7f11d9349a672f09087a47ebe65a7bc8bef8fda6d344472dc8bc14c97c5d49c79365d45da5c9570e0cf84d51723928
+EBUILD jinx-0.7.ebuild 851 BLAKE2B 34a93054271372e697f5432bde9fe725fb0b357251a4866c3748c816c30910df8a0c130f06ef42e8ebe643117e3033f8710f4eba26fd3ca9ce99129d8af9988f SHA512 e9f0d8cc02c507f1952d09a65a3954e90517dc3a9bd390c235e26713dc5f50816ed53c0f7f9a09d9a31edd3c9062ec744ae0e7fec4d6c507962e24f4533fa0fc
 MISC metadata.xml 596 BLAKE2B 637e6f9f170f3ce64857712ff8156e123e42fa1e3495291ca05fc260f69ba267df6536c08b2a1ba042d8cc13f86f499d1e5f8dd223b89efd2c62ca38a9f37d2d SHA512 1fd1a6b8ba360f7aa2c03e8c318482b564afcf2392c20fe0c70d96b181df9323706c3b81bd3aa98916b65cff29aafcf9c9a486bfbbd55b775ff7adee85886950
diff --git a/app-emacs/jinx/files/50jinx-gentoo.el b/app-emacs/jinx/files/50jinx-gentoo.el
index 35fde43c0137..dda9db8dd61b 100644
--- a/app-emacs/jinx/files/50jinx-gentoo.el
+++ b/app-emacs/jinx/files/50jinx-gentoo.el
@@ -1,4 +1,4 @@
 ;;; app-emacs/jinx site configuration  -*- lexical-binding: t; -*-
 (add-to-list 'load-path "@SITELISP@")
 (add-to-list 'load-path "@EMACSMODULES@")
-(load "@SITELISP@/jinx-autoload.el" nil t)
+(load "@SITELISP@/jinx-autoloads.el" nil t)
diff --git a/app-emacs/jinx/files/jinx-0.6-try-load-path.patch b/app-emacs/jinx/files/jinx-0.6-try-load-path.patch
deleted file mode 100644
index 5cb498015791..000000000000
--- a/app-emacs/jinx/files/jinx-0.6-try-load-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3c0aa84130e07cf69219adce8a3494e76977fc26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@gentoo.org>
-Date: Tue, 18 Apr 2023 01:29:55 +0200
-Subject: [PATCH] Try searching the whole load-path for jinx-mod
-
-* jinx.el (jinx--load-module): Try to (locate-library module)
-before trying to look for a sibling file of jinx.el.
----
-https://github.com/minad/jinx/pull/42
-
- jinx.el | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/jinx.el b/jinx.el
-index d0cf56d..e829d50 100644
---- a/jinx.el
-+++ b/jinx.el
-@@ -472,6 +472,11 @@ If VISIBLE is non-nil, only include visible overlays."
-     (let ((default-directory
-            (file-name-directory (locate-library "jinx.el" t)))
-           (module (file-name-with-extension "jinx-mod" module-file-suffix)))
-+
-+      (let ((located-module (locate-library module)))
-+            (when located-module
-+              (setq module located-module)))
-+
-       (unless (file-exists-p module)
-         (let ((command
-                `("cc" "-I." "-O2" "-Wall" "-Wextra" "-fPIC" "-shared"
--- 
-2.40.0
-
diff --git a/app-emacs/jinx/jinx-0.6.ebuild b/app-emacs/jinx/jinx-0.7.ebuild
index 4cb2cfcb7ae9..3708e4eda694 100644
--- a/app-emacs/jinx/jinx-0.6.ebuild
+++ b/app-emacs/jinx/jinx-0.7.ebuild
@@ -23,12 +23,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+ELISP_REMOVE="${PN}-pkg.el"
 SITEFILE="50${PN}-gentoo.el"
 
-PATCHES=(
-	"${FILESDIR}"/jinx-0.6-try-load-path.patch
-)
-
 src_compile() {
 	edo $(tc-getCC) -fPIC -Wall -Wextra -shared \
 		$($(tc-getPKG_CONFIG) --cflags --libs enchant-2) \