public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-doc/pms/files/, app-doc/pms/
@ 2021-05-21  5:24 Ulrich Müller
  0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2021-05-21  5:24 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-doc/pms/files/, app-doc/pms/
@ 2022-03-22 16:48 Ulrich Müller
  0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2022-03-22 16:48 UTC (permalink / raw
  To: gentoo-commits

commit:     0f2e13a11f240d351164d9cdecb15af387487853
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 16:46:48 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 16:48:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f2e13a1

app-doc/pms: Remove old

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-doc/pms/Manifest                   |  1 -
 app-doc/pms/files/pms-5-Makefile.patch | 24 ------------------
 app-doc/pms/files/pms-5-parskip.patch  | 25 ------------------
 app-doc/pms/pms-5_p20120920-r1.ebuild  | 46 ----------------------------------
 4 files changed, 96 deletions(-)

diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index db1bfd46dc1f..4f87dbbf1a75 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -1,3 +1,2 @@
-DIST pms-5.tar.xz 50284 BLAKE2B ecf3c34d79aa1439e0f0f4bca540b673440db04a7f533f103f5956f6a27e994ee42836ae2871c11fadf9230e2b5973d3d1db9e17167f886a6c929e533ece4d45 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e
 DIST pms-7_p20180430.tar.xz 60072 BLAKE2B 58afb1759c84ae86a1dd69aa04a6e8b799fd0cc1e1877cf1f6224f5b1bdbdfcdeaadcabbd9c37c263d62cb24b4164056a88d3524031d1704b059c376d5572101 SHA512 9bb64de842e0aa8f1a6488d12fffba76bfd190e53523e9261161467b30f001f20cddf593cd32e75ace4af309476eb7eb6966665d7ae9b54a5915237094110a47
 DIST pms-8_p20210613.tar.xz 61820 BLAKE2B 1e7e53cb8ea76c4b6f7e571b495bdc41956bee9d90fa1828b8875c262c0a500f8df25a3a53deb9fa9843250e8f3b914514a87019e57f0ecf329e8a62581c842f SHA512 07ef44b0be9b5d5c73e76f78aba2535eb57a8c555ec19bc4ba0a18a6b3b796cb44d6d9e67be49b704f43fa7ad6a8d111f7128d42caa43278dd269863dd59dc15

diff --git a/app-doc/pms/files/pms-5-Makefile.patch b/app-doc/pms/files/pms-5-Makefile.patch
deleted file mode 100644
index 5f50404881c7..000000000000
--- a/app-doc/pms/files/pms-5-Makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -19,19 +19,11 @@
- 	@# need to do it twice to make the big env var table work
- 	mk4ht xhlatex pms
- 	mk4ht xhlatex pms
-+	@# ... and a third time for the eapi features table
-+	mk4ht xhlatex pms
- 	@# some www servers ignore meta tags, resulting in a wrong charset.
- 	@# therefore recode the very few non-ascii characters
- 	recode -d l1..h3 pms.html
--	@# work around irregularity in how links to longtables are
--	@# formatted in the List of Tables
--	LC_ALL=C sed -i -e '/<span class="lotToc" >&#x00A0;/{N;N;s/\(&#x00A0;<a \nhref="[^"]\+">\)\([0-9A-Z.]\+\)[ \n]/\2\1/}' pms.html
--	@# fix xhtml syntax in longtable captions
--	LC_ALL=C sed -i -e 's%</td>\( *<div class="multicolumn"\)%\1%;tx;b;:x;s%</tr>%</td>&%;t;n;bx' pms.html
--	@# indent algorithms properly, and avoid adding extra vertical
--	@# space in Konqueror
--	LC_ALL=C sed -i -e 's/span style="width:/span style="display:-moz-inline-box;display:inline-block;height:1px;width:/' pms.html
--	@# align algorithm line numbers properly
--	LC_ALL=C sed -i -e '/<span class="ALCitem">/{N;s/\n\(class="[^"]\+">\)\([0-9]:<\/span>\)/\1\&#x2007;\2/}' pms.html
- 
- pms.bbl: pms.bib pms.tex vc.tex eapi-cheatsheet.pdf
- 	latex pms

diff --git a/app-doc/pms/files/pms-5-parskip.patch b/app-doc/pms/files/pms-5-parskip.patch
deleted file mode 100644
index 767e53a6c25c..000000000000
--- a/app-doc/pms/files/pms-5-parskip.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/pms-5_p20120920-r1.ebuild b/app-doc/pms/pms-5_p20120920-r1.ebuild
deleted file mode 100644
index 3c3d8e0db6d2..000000000000
--- a/app-doc/pms/pms-5_p20120920-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-${PV%%_*}"
-DESCRIPTION="Gentoo Package Manager Specification"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${MY_P}.tar.xz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="${PV#*_p}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="html"
-
-BDEPEND="dev-texlive/texlive-bibtexextra
-	>=dev-texlive/texlive-latexextra-2020-r2
-	dev-texlive/texlive-mathscience
-	virtual/latex-base
-	html? (
-		app-text/recode
-		>=dev-tex/tex4ht-20090611_p1038-r11
-	)"
-RDEPEND="!app-doc/pms-bin"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	"${FILESDIR}/${PN}-5-Makefile.patch"
-	"${FILESDIR}/${PN}-5-parskip.patch"
-)
-
-src_compile() {
-	# just in case; we shouldn't be generating any fonts
-	export VARTEXFONTS="${T}/fonts"
-	emake
-	use html && emake html
-}
-
-src_install() {
-	dodoc pms.pdf eapi-cheatsheet.pdf
-	if use html; then
-		docinto html
-		dodoc *.html pms.css
-		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
-	fi
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-03-22 16:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-22 16:48 [gentoo-commits] repo/gentoo:master commit in: app-doc/pms/files/, app-doc/pms/ Ulrich Müller
  -- strict thread matches above, loose matches on Subject: below --
2021-05-21  5:24 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