diff options
Diffstat (limited to 'app-emacs/org-mode')
-rw-r--r-- | app-emacs/org-mode/Manifest | 3 | ||||
-rw-r--r-- | app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch | 73 | ||||
-rw-r--r-- | app-emacs/org-mode/org-mode-9.5.ebuild | 2 |
3 files changed, 77 insertions, 1 deletions
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest index 4996d85f8522..20a3224f8fd2 100644 --- a/app-emacs/org-mode/Manifest +++ b/app-emacs/org-mode/Manifest @@ -1,9 +1,10 @@ AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000 +AUX org-mode-9.5-parallel-make.patch 2234 BLAKE2B 9bd3c123ffd619c0478a17a7ec52293e2f01bd89129f15c38dc9769e7c71e4b4a2e11967f7f5cfbd90c822b89c3cfa4ec9efcf66ea3cd9264cc2268a61ee6659 SHA512 e768a99cb5e849f89fb3eb8d893f0d3aff3ecf9aaa450abe63cea98b543a423d22b415dfb1504978984ab029ac49caeb3d06c3c62662286ddd87e87741426814 DIST org-9.4.4.tar.gz 4725983 BLAKE2B 69fcd15e13c55b71a2c0c6185a0b82dfd8f72ef2c68a8ccc5aa9d3e9f134233d7c7c3cb38f4957cc7d5d70a082067412b61be2111b484b6a91a8a2e5f077bb39 SHA512 ec857f9765a869371bd3425aaecdbe1c8bb8f605640d81efebd7ed13afcb05439cf3a5277457ed399bc501f95a6d823bda7f46b6991cd5f21cf53cf0e666d831 DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8fa94c24eb041a42a6fca1fd6da7f242be89e6b0ca5e7b80d879096f9114dca0ba86b20a5d26d2a185baa537 SHA512 7e50d7e9e2073bc0f06d2c861f59d4c9b8af4cf63c98f730c810a3a8721e65829fe9ef7ba0ac99f49bf9da427a4d5ad1d028e05c1a8ab6a3bea2ff2020c0e61d DIST org-mode-release_9.5.tar.gz 2043985 BLAKE2B 7f8c45be0c3c873eb9dada8d637088aa0fac4d2b2e4ddd7523c305e0c1acdc10c58ed36646285cff2ecac78d5d862f08fcd113dcb4fa853db04e59a6252a1d7a SHA512 9f05ef6d4adb89224248299ca7c8120924b6ad4c2fa5d0804ac4985b35f87382e20e0c6fecfed59bd52917cd1b6e57830505d47fc80102390cbc6336029fe132 EBUILD org-mode-9.4.4.ebuild 1710 BLAKE2B 4f0a97a455d97ade5ed4743abef2c8027a6e20bec8f758d146cd027123f8ed9cdc6c282e93a7b6325b6bd728158350caf36cd6eadc523d91278f3169b8900436 SHA512 f60a2887ae93d3ff50cc1e2300703b2154d983923e445e63dc8736245c39d80db60ad8d9aa86c8f2780bf051930dea53f865fb611d84e472e13f178f687a693f EBUILD org-mode-9.4.6.ebuild 1713 BLAKE2B ce3a94f20fcef4d3d9ffe14908227763159cadc44b86af63d33788452320e382728b78841582d38b329365d881a44aa909b35686235c7a3be259dbf58a34c481 SHA512 46982cd5c1880aafbf6a9ee14bcb7b5c1c5188a549fd2ac86fe9de3e8ca33e327a6f270992fc1eb5bca46962c376413bc68b04ffa48a670d036d52db34669bb6 -EBUILD org-mode-9.5.ebuild 1357 BLAKE2B bd6f1c161575a24cbde34d6a8a9242d0a846df938a79af2b00d8af2814449fe864558c45579e60b9da4b731fe5a8f03ce1e93e8f11e9cc7dce8997e159509516 SHA512 7313065c1f6245682e0dcbcb8614d5186b3eaab6f4716710ecb7087055651ed2b18122c53a4db4baea5838041bfd7b414fcd500fa056cce2b90e52b2d3d5b85f +EBUILD org-mode-9.5.ebuild 1407 BLAKE2B 4b65efd70242ed5f4aff1f1efbd8a3fde3193a99e848d8c64f17cc76d75aa2f99daffcc68859eb0f8f38a34ace57454ec7a5231030cc4c1169d476e7352f9b3e SHA512 75260ad66c878bdb5cfef389739c72cc5ce25abd64ab61dc81dd647152c83cffd1c531745a0eb832311ef2d1e07ebd7facfe5a6ccd304aa9f39ced439d86628f EBUILD org-mode-9999.ebuild 1537 BLAKE2B a8bd3199be2117253f7e1d4009c98384cac23c3b9d3094e3285a0418e5b3ae4c910251bc278a00cc92225dd8106ba8f472ca32ead00f7fb1a6ff967f57a96400 SHA512 640f00ee00d72c2be2fa373b50b138400c5b2cc9f113eebf385d853cf477aa93d93f70ff8ebfbff5948aa4b57993425c53ab89d2cb5abb544d5a8715c40d7fb3 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1 diff --git a/app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch b/app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch new file mode 100644 index 000000000000..92ff5d3182f8 --- /dev/null +++ b/app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch @@ -0,0 +1,73 @@ +https://bugs.gentoo.org/829055 + +From b6c5f028a061557e2edb64eef897cd4a28b2afeb Mon Sep 17 00:00:00 2001 +From: Marco Wahl <marcowahlsoft@gmail.com> +Date: Mon, 20 Dec 2021 22:27:50 +0100 +Subject: [PATCH] Fix parallel make of docs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* doc/Makefile: Split multiple target "org.texi orgguide.texi". +* mk/org-fixup.el (org-make-manual, org-make-guide): New functions. + (org-make-manuals): Make obsolete. + +Reported by Ulrich Müller. https://list.orgmode.org/uee67gr96@gentoo.org/ +--- + doc/Makefile | 10 ++++++++-- + mk/org-fixup.el | 15 +++++++++++++++ + 2 files changed, 23 insertions(+), 2 deletions(-) + +diff --git a/doc/Makefile b/doc/Makefile +index 7fb96e65d..cb6d72bdc 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -27,11 +27,17 @@ guide:: orgguide.texi org-version.inc + ../mk/guidesplit.pl $@/* + endif + +-org.texi orgguide.texi: org-manual.org org-guide.org ++org.texi: org-manual.org + $(BATCH) \ + --eval '(add-to-list `load-path "../lisp")' \ + --eval '(load "../mk/org-fixup.el")' \ +- --eval '(org-make-manuals)' ++ --eval '(org-make-manual)' ++ ++orgguide.texi: org-guide.org ++ $(BATCH) \ ++ --eval '(add-to-list `load-path "../lisp")' \ ++ --eval '(load "../mk/org-fixup.el")' \ ++ --eval '(org-make-guide)' + + org-version.inc: org.texi + @echo "org-version: $(ORGVERSION) ($(GITVERSION))" +diff --git a/mk/org-fixup.el b/mk/org-fixup.el +index c0eef23cb..0e26cc7e7 100644 +--- a/mk/org-fixup.el ++++ b/mk/org-fixup.el +@@ -27,6 +27,21 @@ + (require 'autoload) + (require 'org-compat "org-compat.el") + ++(defun org-make-manual () ++ "Generate the Texinfo file out of the Org manual." ++ (require 'ox-texinfo) ++ (find-file "../doc/org-manual.org") ++ (org-texinfo-export-to-texinfo)) ++ ++(defun org-make-guide () ++ "Generate the Texinfo file out of the Org guide." ++ (require 'ox-texinfo) ++ (find-file "../doc/org-guide.org") ++ (org-texinfo-export-to-texinfo)) ++ ++(make-obsolete 'org-make-manuals ++ "use org-make-manual and org-make-guide." ++ "9.6") + (defun org-make-manuals () + "Generate the Texinfo files out of Org manuals." + (require 'ox-texinfo) +-- +2.34.1 + diff --git a/app-emacs/org-mode/org-mode-9.5.ebuild b/app-emacs/org-mode/org-mode-9.5.ebuild index d4f4644be22f..064ab2444a98 100644 --- a/app-emacs/org-mode/org-mode-9.5.ebuild +++ b/app-emacs/org-mode/org-mode-9.5.ebuild @@ -22,6 +22,8 @@ BDEPEND="doc? ( virtual/texi2dvi )" SITEFILE="50${PN}-gentoo.el" +PATCHES=("${FILESDIR}/${P}-parallel-make.patch") + src_compile() { emake datadir="${EPREFIX}${SITEETC}/${PN}" use doc && emake pdf card |