diff options
Diffstat (limited to 'app-doc/pms')
| -rw-r--r-- | app-doc/pms/Manifest | 2 | ||||
| -rw-r--r-- | app-doc/pms/files/pms-5-Makefile.patch | 24 | ||||
| -rw-r--r-- | app-doc/pms/files/pms-7-parskip.patch | 25 | ||||
| -rw-r--r-- | app-doc/pms/metadata.xml | 5 | ||||
| -rw-r--r-- | app-doc/pms/pms-7_p20180430-r2.ebuild (renamed from app-doc/pms/pms-7_p20180430-r1.ebuild) | 11 | ||||
| -rw-r--r-- | app-doc/pms/pms-8_p20210613-r1.ebuild (renamed from app-doc/pms/pms-5_p20120920.ebuild) | 31 | ||||
| -rw-r--r-- | app-doc/pms/pms-9999.ebuild | 12 |
7 files changed, 54 insertions, 56 deletions
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest index 5fcabc96127e..4f87dbbf1a75 100644 --- a/app-doc/pms/Manifest +++ b/app-doc/pms/Manifest @@ -1,2 +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" > /{N;N;s/\( <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\ \2/}' pms.html - - pms.bbl: pms.bib pms.tex vc.tex eapi-cheatsheet.pdf - latex pms 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 000000000000..8e39c234472d --- /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/metadata.xml b/app-doc/pms/metadata.xml index cdd2d5fbcfeb..e72d4ffc4c69 100644 --- a/app-doc/pms/metadata.xml +++ b/app-doc/pms/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>pms@gentoo.org</email> @@ -10,4 +10,7 @@ <flag name="html">Generate and install PMS as .html as well</flag> <flag name="twoside">Enable two-sided layout suitable for printing</flag> </use> +<upstream> + <remote-id type="gentoo">proj/pms</remote-id> +</upstream> </pkgmetadata> diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r2.ebuild index 43942577e488..3ca6420dabd8 100644 --- a/app-doc/pms/pms-7_p20180430-r1.ebuild +++ b/app-doc/pms/pms-7_p20180430-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="html twoside" # texlive-bibtexextra for plainurl.bst @@ -17,18 +17,19 @@ IUSE="html twoside" # paralist, tocbibind # texlive-mathscience for algorithm, algorithmic BDEPEND="dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latex >=dev-texlive/texlive-latexextra-2020-r2 - dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience + virtual/latex-base html? ( app-text/recode >=dev-tex/tex4ht-20090611_p1038-r11 )" RDEPEND="!app-doc/pms-bin" -PATCHES=("${FILESDIR}/${PN}-7-Makefile.patch") +PATCHES=( + "${FILESDIR}/${PN}-7-Makefile.patch" + "${FILESDIR}/${PN}-7-parskip.patch" +) src_compile() { # just in case; we shouldn't be generating any fonts diff --git a/app-doc/pms/pms-5_p20120920.ebuild b/app-doc/pms/pms-8_p20210613-r1.ebuild index 60afba7a6136..5ea4ac19b31b 100644 --- a/app-doc/pms/pms-5_p20120920.ebuild +++ b/app-doc/pms/pms-8_p20210613-r1.ebuild @@ -1,37 +1,32 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -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" +SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${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" +LICENSE="CC-BY-SA-4.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="html twoside" +# texlive-bibtexextra for unsrturl.bst +# texlive-latexextra for chngcntr, gitinfo2, isodate, leaflet, marginnote, +# paralist, tocbibind +# texlive-mathscience for algorithm, algorithmic BDEPEND="dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latex >=dev-texlive/texlive-latexextra-2020-r2 - dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience - html? ( - app-text/recode - >=dev-tex/tex4ht-20090611_p1038-r11 - )" + virtual/latex-base + html? ( >=dev-tex/tex4ht-20090611_p1038-r11 )" RDEPEND="!app-doc/pms-bin" -S="${WORKDIR}/${MY_P}" -PATCHES=("${FILESDIR}/${PN}-5-Makefile.patch") - src_compile() { # just in case; we shouldn't be generating any fonts export VARTEXFONTS="${T}/fonts" - emake + emake $(usev twoside TWOSIDE=yes) use html && emake html } diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild index 19a316cc11aa..337c699dd800 100644 --- a/app-doc/pms/pms-9999.ebuild +++ b/app-doc/pms/pms-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit git-r3 @@ -10,7 +10,7 @@ EGIT_BRANCH="master" DESCRIPTION="Gentoo Package Manager Specification (draft)" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification" -LICENSE="CC-BY-SA-3.0" +LICENSE="CC-BY-SA-4.0" SLOT="live" IUSE="html twoside" @@ -19,18 +19,16 @@ IUSE="html twoside" # paralist, tocbibind # texlive-mathscience for algorithm, algorithmic BDEPEND="dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latex >=dev-texlive/texlive-latexextra-2020-r2 - dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience + virtual/latex-base html? ( >=dev-tex/tex4ht-20090611_p1038-r11 )" RDEPEND="!app-doc/pms-bin" src_compile() { # just in case; we shouldn't be generating any fonts export VARTEXFONTS="${T}/fonts" - emake $(usex twoside TWOSIDE=yes "") + emake $(usev twoside TWOSIDE=yes) use html && emake html } |