gentoo resync : 21.06.2020

5 files changed, 43 insertions, 2 deletions

diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 7a9ac17a8649..c53ccfb3ba5e 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -1,6 +1,8 @@
+AUX pms-5-Makefile.patch 1200 BLAKE2B d493382c48e9ee6eab2369ab32e04cc3eec48250c9a66254c778f714e16a00a9e0d58ca77b0db4a973348d4a86fc14828d765d2d225c6c90cc15e9ae24f2109f SHA512 aa8bd061754d82018824ca5750539bd1d88a16e56281f9190a519c16e126fa68ddeecc9da2543a1ca16eb9259beca05d464847bf7d597f42cbfeca5ba539b0ce
+AUX pms-7-Makefile.patch 564 BLAKE2B 048273a5f5a49d4df06277a22abd3ef37c9726c9c111e3fbcbe2f27726511d449c652c3883cac993defd934ffdffb364602c7738547875b77c2662126702e0fe SHA512 ecdd4f5e416ce547ec78dab8002292cdd7ce8be3f7910a7f241e8cd6e6ad1e38603832a4cea419dff2e84279edf25bcd5a9a0ded2ad9349be9c9682bf2932b64
 DIST pms-5.tar.xz 50284 BLAKE2B ecf3c34d79aa1439e0f0f4bca540b673440db04a7f533f103f5956f6a27e994ee42836ae2871c11fadf9230e2b5973d3d1db9e17167f886a6c929e533ece4d45 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e
 DIST pms-7_p20180430.tar.xz 60072 BLAKE2B 58afb1759c84ae86a1dd69aa04a6e8b799fd0cc1e1877cf1f6224f5b1bdbdfcdeaadcabbd9c37c263d62cb24b4164056a88d3524031d1704b059c376d5572101 SHA512 9bb64de842e0aa8f1a6488d12fffba76bfd190e53523e9261161467b30f001f20cddf593cd32e75ace4af309476eb7eb6966665d7ae9b54a5915237094110a47
-EBUILD pms-5_p20120920.ebuild 1259 BLAKE2B 21915810ab0c1e5f8b60d7990d1728a692afa84a8dbef1424cc006123cac4e93fe81dec7c960723caad14a838a6606992e73ad18d687d29f0186b51dddffbc9e SHA512 dc2542cb47a07a0d89d65b8a363df74c9ef4743db408e06340bd6f063ac939ac6c07815bdf40ce79e204693a6df73ec4468c9841116dd08eb515bdafb8b8afc6
-EBUILD pms-7_p20180430-r1.ebuild 1438 BLAKE2B 9ac997445ded18f95703ae23d2917ee1c5d892b8fc3764a0048b9baa3e2db7ffa2b7dd41946d1a09a0c076dc201838d227e16a526ee4f56e8dfc4da8d17e6c77 SHA512 f086bc165b957950211db7a1174babf504afbcd82019851802b4ba52ea6fe4ab0e417f44d00174b6b27883fc9df714a6f9273d8eab664ba04ef236de0c3488b1
+EBUILD pms-5_p20120920.ebuild 1306 BLAKE2B af5f8197314cee9a358c71813fb904bb633e1bb34643638a029962a7d28ce9d3a06dd41f05dd4213955342b293059dead8cde307c3b3ecf0f607403976819c3d SHA512 70baff7d7bf5b1e05f0ba0537ad4edf860f69425398b5df6dbda20ac827920788f1bf3f02b8096f22e457255f2b130b424c0984d4b39cab30564a9b2b455c6e7
+EBUILD pms-7_p20180430-r1.ebuild 1486 BLAKE2B f063c197a73010e65279c8ada30532a096ed042b8d5635c2e0b65a66d0bd05c281f60a12b68c52478c06e269b72436547ce11edd206699e60ae4aaa226e8082b SHA512 3734de5c5a3c9dcd7659d1111a713b8fe0a846eacf18509b1925fcfa12303d020c7fcf5b7caf601df1d2ee50ef52295a80a74f609757348c1dc6414d185867c7
 EBUILD pms-9999.ebuild 1233 BLAKE2B 0a96671e313a3f2a725c0d5f436587f30cb39b08c1fdbf3d4d2737abec4f24ca0abe2b96a76330d907feb3e52974c201287b9759b216f1a9150d7fbf9b7aa21c SHA512 1d0aee888971bb84bbf98036d44783f5f013c06fc209fb15362e89d899a32b97a2982ba31016cbca33bea9b8752e3b8f2f131cea05bbb4221bf8ee9d3a2e98af
 MISC metadata.xml 439 BLAKE2B 3d5b7ec10330bc77a6234beb03de1400af3a295b88e9f2382c76232e2519c944b8b518923d93d2a474e1b96cbd6801458814704b12f0b993165e802bc1fb9b7c SHA512 aa8e7627fb52d1a5357b7758f4cbdb74cef129b3cc45f48a8c58973141e5cea65c0007333fb8e388fd99de8606d8ca137e03f906f5c6e75df68f6eb96099949d
diff --git a/app-doc/pms/files/pms-5-Makefile.patch b/app-doc/pms/files/pms-5-Makefile.patch
new file mode 100644
index 000000000000..5f50404881c7
--- /dev/null
+++ b/app-doc/pms/files/pms-5-Makefile.patch
@@ -0,0 +1,24 @@
+--- 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-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/pms-5_p20120920.ebuild b/app-doc/pms/pms-5_p20120920.ebuild
index 7ceaee494365..51d0d7b9b25a 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920.ebuild
@@ -27,6 +27,7 @@ BDEPEND="dev-tex/leaflet
 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
diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r1.ebuild
index a71c1856b811..975b3f69fc83 100644
--- a/app-doc/pms/pms-7_p20180430-r1.ebuild
+++ b/app-doc/pms/pms-7_p20180430-r1.ebuild
@@ -29,6 +29,8 @@ BDEPEND="dev-tex/leaflet
 	)"
 RDEPEND="!app-doc/pms-bin"
 
+PATCHES=("${FILESDIR}/${PN}-7-Makefile.patch")
+
 src_compile() {
 	# just in case; we shouldn't be generating any fonts
 	export VARTEXFONTS="${T}/fonts"