* [gentoo-commits] repo/gentoo:master commit in: app-emacs/org-mode/files/, app-emacs/org-mode/
@ 2021-12-22 8:41 Ulrich Müller
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2021-12-22 8:41 UTC (permalink / raw
To: gentoo-commits
commit: 1c908871e0a615a3a4ce3e21dabfa5c1b1712011
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 08:39:02 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 08:41:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c908871
app-emacs/org-mode: Fix parallel build failure
Closes: https://bugs.gentoo.org/829055
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../files/org-mode-9.5-parallel-make.patch | 73 ++++++++++++++++++++++
app-emacs/org-mode/org-mode-9.5.ebuild | 2 +
2 files changed, 75 insertions(+)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emacs/org-mode/files/, app-emacs/org-mode/
@ 2022-02-13 22:40 Ulrich Müller
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2022-02-13 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 255253e7efdc5cc8b55d0a48ce742c26d065c642
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 22:37:45 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 22:40:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255253e7
app-emacs/org-mode: Remove old
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-emacs/org-mode/Manifest | 2 -
.../files/org-mode-9.5-parallel-make.patch | 73 ----------------------
app-emacs/org-mode/org-mode-9.4.4.ebuild | 59 -----------------
app-emacs/org-mode/org-mode-9.5.ebuild | 50 ---------------
4 files changed, 184 deletions(-)
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index c40bdb899746..890e2aefa8fb 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,4 +1,2 @@
-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.2.tar.gz 2047430 BLAKE2B 3df1ea84d3513ff4ceeea69d6afcdbd68ac1dd0112831a4d202d4d8ab730067d9b9d72bc86e40157282d487c0020e4c2161d611f71da40951f3e322923efce9b SHA512 6d61e2db7f3bc736e299f47e85b3fd7c31324d0f60bf4b84f5540b717e7d394957bd5f9196aa8d3840e8798eb2b597818b03fa239fc1427ffb54c8ed74b5c9ae
-DIST org-mode-release_9.5.tar.gz 2043985 BLAKE2B 7f8c45be0c3c873eb9dada8d637088aa0fac4d2b2e4ddd7523c305e0c1acdc10c58ed36646285cff2ecac78d5d862f08fcd113dcb4fa853db04e59a6252a1d7a SHA512 9f05ef6d4adb89224248299ca7c8120924b6ad4c2fa5d0804ac4985b35f87382e20e0c6fecfed59bd52917cd1b6e57830505d47fc80102390cbc6336029fe132
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
deleted file mode 100644
index 92ff5d3182f8..000000000000
--- a/app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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.4.4.ebuild b/app-emacs/org-mode/org-mode-9.4.4.ebuild
deleted file mode 100644
index bffbcb8d7146..000000000000
--- a/app-emacs/org-mode/org-mode-9.4.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-NEED_EMACS=24
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="https://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-BDEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- emake datadir="${EPREFIX}${SITEETC}/${PN}"
- use doc && emake pdf card
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- ETCDIRS="styles $(use odt-schema && echo schema)" \
- lispdir="${EPREFIX}${SITELISP}/${PN}" \
- datadir="${EPREFIX}${SITEETC}/${PN}" \
- infodir="${EPREFIX}/usr/share/info" \
- install
-
- cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
-
- if use contrib; then
- elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
- ( docinto contrib; dodoc -r contrib/README contrib/scripts )
- find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
- -exec rm -f '{}' '+'
- # add the contrib subdirectory to load-path
- sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
- "${T}/${SITEFILE}" || die
- fi
-
- elisp-site-file-install "${T}/${SITEFILE}"
- dodoc README etc/ORG-NEWS
- use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-
- DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
- so you may have to install one or more additional packages.
- A non-exhaustive list of these dependencies may be found at
- <http://orgmode.org/worg/org-dependencies.html>."
- readme.gentoo_create_doc
-}
diff --git a/app-emacs/org-mode/org-mode-9.5.ebuild b/app-emacs/org-mode/org-mode-9.5.ebuild
deleted file mode 100644
index 064ab2444a98..000000000000
--- a/app-emacs/org-mode/org-mode-9.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-NEED_EMACS=24
-
-inherit elisp readme.gentoo-r1
-
-MY_P="${PN}-release_${PV}"
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc odt-schema"
-RESTRICT="test"
-
-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
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- ETCDIRS="styles csl $(use odt-schema && echo schema)" \
- lispdir="${EPREFIX}${SITELISP}/${PN}" \
- datadir="${EPREFIX}${SITEETC}/${PN}" \
- infodir="${EPREFIX}/usr/share/info" \
- install
-
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- dodoc README CONTRIBUTE etc/ORG-NEWS
- use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-
- local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
- so you may have to install one or more additional packages.
- A non-exhaustive list of these dependencies may be found at
- <http://orgmode.org/worg/org-dependencies.html>."
- readme.gentoo_create_doc
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-13 22:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-22 8:41 [gentoo-commits] repo/gentoo:master commit in: app-emacs/org-mode/files/, app-emacs/org-mode/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2022-02-13 22:40 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox