summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-doc/pms')
-rw-r--r--app-doc/pms/Manifest2
-rw-r--r--app-doc/pms/files/pms-7-Makefile.patch12
-rw-r--r--app-doc/pms/files/pms-7-parskip.patch25
-rw-r--r--app-doc/pms/metadata.xml5
-rw-r--r--app-doc/pms/pms-5_p20120920.ebuild45
-rw-r--r--app-doc/pms/pms-7_p20180430-r2.ebuild (renamed from app-doc/pms/pms-7_p20180430-r1.ebuild)28
-rw-r--r--app-doc/pms/pms-8_p20210613-r1.ebuild40
-rw-r--r--app-doc/pms/pms-9999.ebuild27
8 files changed, 109 insertions, 75 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-7-Makefile.patch b/app-doc/pms/files/pms-7-Makefile.patch
new file mode 100644
index 000000000000..d96abd421f0b
--- /dev/null
+++ b/app-doc/pms/files/pms-7-Makefile.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -52,9 +52,6 @@
+ recode -d l1..h3 $@
+ @# declare encoding as utf-8, although it is pure ascii
+ LC_ALL=C sed -i -e '/<?xml\|<meta/s/iso-8859-1/utf-8/' $@
+- @# 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/}' $@
+ @# remove redundant span elements
+ LC_ALL=C sed -i -e ':x;/<span\(\s\+[^>]*\)\?$$/{N;bx;};:y;s/\(<span\s\+[^>]*>\)\([^<]*\)<\/span>\1/\1\2/;ty' $@
+
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-5_p20120920.ebuild b/app-doc/pms/pms-5_p20120920.ebuild
deleted file mode 100644
index 7ceaee494365..000000000000
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="html"
-
-BDEPEND="dev-tex/leaflet
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-latexrecommended
- dev-texlive/texlive-mathscience
- html? (
- app-text/recode
- >=dev-tex/tex4ht-20090115_p0029
- )"
-RDEPEND="!app-doc/pms-bin"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-}
diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r2.ebuild
index a71c1856b811..3ca6420dabd8 100644
--- a/app-doc/pms/pms-7_p20180430-r1.ebuild
+++ b/app-doc/pms/pms-7_p20180430-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,26 +9,28 @@ 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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: plainurl.bst
-# texlive-latexextra: chngcntr, isodate, marginnote, paralist, tocbibind
-# texlive-mathscience: algorithm, algorithmic
-# leaflet used by eapi-cheatsheet
-BDEPEND="dev-tex/leaflet
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-latexrecommended
+# texlive-bibtexextra for plainurl.bst
+# texlive-latexextra for chngcntr, isodate, leaflet, marginnote,
+# paralist, tocbibind
+# texlive-mathscience for algorithm, algorithmic
+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-r5
+ >=dev-tex/tex4ht-20090611_p1038-r11
)"
RDEPEND="!app-doc/pms-bin"
+PATCHES=(
+ "${FILESDIR}/${PN}-7-Makefile.patch"
+ "${FILESDIR}/${PN}-7-parskip.patch"
+)
+
src_compile() {
# just in case; we shouldn't be generating any fonts
export VARTEXFONTS="${T}/fonts"
diff --git a/app-doc/pms/pms-8_p20210613-r1.ebuild b/app-doc/pms/pms-8_p20210613-r1.ebuild
new file mode 100644
index 000000000000..5ea4ac19b31b
--- /dev/null
+++ b/app-doc/pms/pms-8_p20210613-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo Package Manager Specification"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+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-latexextra-2020-r2
+ 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 $(usev twoside TWOSIDE=yes)
+ 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
+}
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 001aee4fd9fb..337c699dd800 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 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,28 +10,25 @@ 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"
-# leaflet: used by eapi-cheatsheet
-# tl-bibtexextra: unsrturl.bst
-# tl-latexextra: chngcntr, gitinfo2, isodate, marginnote, paralist, tocbibind
-# tl-mathscience: algorithm, algorithmic
-BDEPEND="dev-tex/leaflet
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-latexrecommended
+# 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-latexextra-2020-r2
dev-texlive/texlive-mathscience
- html? ( >=dev-tex/tex4ht-20090611_p1038-r5 )"
+ 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
}