commit: c978b99358eedecfedeb75a497e1f0e4ada79770
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri May 21 05:23:06 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri May 21 05:24:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c978b993
app-doc/pms: Fix page breaks with TeX Live 2021
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-doc/pms/files/pms-5-parskip.patch | 25 +++++++++++++++++++++++++
app-doc/pms/files/pms-7-parskip.patch | 25 +++++++++++++++++++++++++
app-doc/pms/pms-5_p20120920.ebuild | 5 ++++-
app-doc/pms/pms-7_p20180430-r1.ebuild | 5 ++++-
4 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/app-doc/pms/files/pms-5-parskip.patch
b/app-doc/pms/files/pms-5-parskip.patch
new file mode 100644
index 00000000000..767e53a6c25
--- /dev/null
+++ b/app-doc/pms/files/pms-5-parskip.patch
@@ -0,0 +1,25 @@
+Require version 1 of parskip.sty
+
+Newer versions change the spacing after headings which causes
+different page breaks.
+
+Backported from master, commit 4ebd8cb.
+
+--- a/pms.cls
++++ b/pms.cls
+@@ -17,6 +17,7 @@
+ % Enable UTF-8 input encoding
+ \PassOptionsToPackage{utf8}{inputenc}
+ % algorithmic and algorithm to be loaded last to avoid failures
++\RequirePackage{parskip}[=v1] % Space between paragraphs instead of
indentation
+ \RequirePackage{%
+ fontenc, % Load extended font sets
+ isodate, % Date formatting and conversions
+@@ -30,7 +31,6 @@
+ lscape, % Rotating pages
+ marginnote, % Typeset a paragraph in the page margin
+ paralist, % Additional list environments
+- parskip, % Space between paragraphs instead of indentation
+ verbatim % Extend the print-as-is functionality
+ }
+
diff --git a/app-doc/pms/files/pms-7-parskip.patch
b/app-doc/pms/files/pms-7-parskip.patch
new file mode 100644
index 00000000000..8e39c234472
--- /dev/null
+++ b/app-doc/pms/files/pms-7-parskip.patch
@@ -0,0 +1,25 @@
+Require version 1 of parskip.sty
+
+Newer versions change the spacing after headings which causes
+different page breaks.
+
+Backported from master, commit 4ebd8cb.
+
+--- a/pms.cls
++++ b/pms.cls
+@@ -27,6 +27,7 @@
+ \PassOptionsToPackage{hyphens}{url} % url.sty implicitly loaded by hyperref
+ \PassOptionsToPackage{chapter}{algorithm}
+ % algorithmic and algorithm to be loaded last to avoid failures
++\RequirePackage{parskip}[=v1] % Space between paragraphs instead of
indentation
+ \RequirePackage{%
+ fontenc, % Load extended font sets
+ isodate, % Date formatting and conversions
+@@ -39,7 +40,6 @@
+ lscape, % Rotating pages
+ marginnote, % Typeset a paragraph in the page margin
+ paralist, % Additional list environments
+- parskip, % Space between paragraphs instead of indentation
+ underscore, % Allow simple _ instead of \_
+ verbatim, % Extend the print-as-is functionality
+ chngcntr, % Redefinition of counters
diff --git a/app-doc/pms/pms-5_p20120920.ebuild
b/app-doc/pms/pms-5_p20120920.ebuild
index 327ec129020..39ea2d6a34a 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920.ebuild
@@ -24,7 +24,10 @@ BDEPEND="dev-texlive/texlive-bibtexextra
RDEPEND="!app-doc/pms-bin"
S="${WORKDIR}/${MY_P}"
-PATCHES=("${FILESDIR}/${PN}-5-Makefile.patch")
+PATCHES=(
+ "${FILESDIR}/${PN}-${PV%%_*}-Makefile.patch"
+ "${FILESDIR}/${PN}-${PV%%_*}-parskip.patch"
+)
src_compile() {
# just in case; we shouldn't be generating any fonts
diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild
b/app-doc/pms/pms-7_p20180430-r1.ebuild
index 5be961b03fe..6e7b7c7a6e1 100644
--- a/app-doc/pms/pms-7_p20180430-r1.ebuild
+++ b/app-doc/pms/pms-7_p20180430-r1.ebuild
@@ -26,7 +26,10 @@ BDEPEND="dev-texlive/texlive-bibtexextra
)"
RDEPEND="!app-doc/pms-bin"
-PATCHES=("${FILESDIR}/${PN}-7-Makefile.patch")
+PATCHES=(
+ "${FILESDIR}/${PN}-${PV%%_*}-Makefile.patch"
+ "${FILESDIR}/${PN}-${PV%%_*}-parskip.patch"
+)
src_compile() {
# just in case; we shouldn't be generating any fonts
