gentoo resync : 10.11.2019

4 files changed, 5 insertions, 485 deletions

diff --git a/dev-tex/pgf/Manifest b/dev-tex/pgf/Manifest
index 5c2d9555f2e2..1583461b9664 100644
--- a/dev-tex/pgf/Manifest
+++ b/dev-tex/pgf/Manifest
@@ -1,10 +1,5 @@
-AUX pgfsys-luatex.def 13997 BLAKE2B 4d682ac413f03fc2c5f4bb27ffd367af121da27ba14631b1d9a30a3b80181178fa84e07a331efb2b46a0c04749c3f7ac56527b3c65259da7ca2a32a2fde4b294 SHA512 cb946ce0a946048acb03d45452c155a81d82a86cd4673ee70a07ff1e6553aa45be6d56e38cfd51988b095c540e8a3e1ff113958f6eae5255ac9dba8c46b6161d
-DIST pgf-3.1.4-pgfmanual.pdf 10376398 BLAKE2B 4e45a0d69000d1f89a995f3e5e9295b82a79af5cfd5863aba4f1fd9c3b40d05f2f07b6fc2b34a933136448728aea3dfacc4943fd013896cd4cfe52c9dc8aa3c3 SHA512 a2b934d6e9836fce0a731d238b713ebdc3764e8aa76ea4c7fd54c88f59f31fe17f8c306b6a381adc73becb410e0c6350427112e5d46ae762665fc73fcdca54a0
-DIST pgf-3.1.4-revisioned.tex.xz 244 BLAKE2B 088da7d921dcce118af216fefbedcdde5d3359cdb044d67ec51cd8a595c21aa4d314b33bc49bcd04387e5af1230f7244b136e2bca8fd83a01ee2d264dc89fad5 SHA512 690e3233052c81384b69bae5504c5b5ea1053aaba6444674d3aad7a550f66f4e326c413decf482d7435e7273e9a3a1fddc64ff1946bca0c92e93b8fd66f3f09d
-DIST pgf-3.1.4.tar.gz 2426346 BLAKE2B 44d1c709774586b4de81def3d4e7133d147e9e3c1b69078789c8f62378b97a6fc6cfbd580a5f1d292190282dbec5ca4f080d4567b2e1fa526909f08e07169547 SHA512 472ffca8f465bfb5f98cbe0880887afc5b9043bfc878aa8f64a79970502546cc3e0901010b8662aa582af9bc4a90b622ade828c075396542a1e2ee7af694181c
 DIST pgf-3.1.4b-pgfmanual.pdf 10371181 BLAKE2B c619e56fd184fea8761175efed7130b37b10f719e04e87b40448a0a72641f2b7c6be0270ae0c2386d91caf06d9cd46f8eb3eb9293d8ff46d8f4a8400662cc1d8 SHA512 f18e836774b8ad8d7a2adb1c876e529240907b9a9c695ab6366d4bc321766106ced3085dc0d17394d6c19654a2232e10d782e93152c075f7915ffb2f0e09b680
 DIST pgf-3.1.4b-revisioned.xz 244 BLAKE2B b394702704aa5b16549df795bc4cf04e5a81839a7694a1773dee89f4db66a286a276e48bf080f82e4fe3e55e3a6bf3983394ed84a83a372becc5b8f0738162a7 SHA512 4f5ca04317e58a191eaf7225fdd9a2ff70ad80d601951be98870f77da598ba559b464e2bd0ca4f03cf54c0ccd536925deb8bd6061b9464b36a883727ae85dc40
 DIST pgf-3.1.4b.tar.gz 2426541 BLAKE2B 91f1b0ea1f2f3526da6a57cd2deec76b49b4204047b9dcdbeb064db48357055324ffe83bb5bd09dd8931a9c8e8768305a72b82ec77257e20badc543a5ca803b8 SHA512 4ba8d9c70d573ff69128d41b20525badf3a3bd0bbbf76ef3c2f2e54ccc05bc0bf1da1f20102df04f8188fe1733d469965228445e6c4af0611c2aa5737ed72180
-EBUILD pgf-3.1.4-r1.ebuild 1377 BLAKE2B a1025c092321a6272e74d03cab8fb9d258a1c9e8e80ab1800ab15ab5cdf733d015227964f1c893af1c169bce0adee2ea673664fa91f024cb90031b90c55907e8 SHA512 6e510624f768d4a870f6666547a275ad03bf507141f512cd77e351761180110e8ef5b9793da2d7caf6ee16ae6243a5ddc38ad985e7b54ee5d981114484295c53
-EBUILD pgf-3.1.4b-r1.ebuild 1369 BLAKE2B 8251866a9a39e7a0dea66bb1a8bcd2a227a07f5e7d41d20d5d3edb08565de5de788568c11470c1085a38e7380301eb5a6cfb8d5cbd94101c686792bf8543f080 SHA512 a6b984a5593175bf65c68be1bbdca054c6f83106973c2b7e93fa95b63332a0ae330952ccb4e20d9fc050334d5942e235d95c2dd58342790f3d13b6d345083e77
+EBUILD pgf-3.1.4b-r2.ebuild 1355 BLAKE2B b10a8928d96418c20ab68d66fd0da04b059f3ca53b817e72b0e108e829d49e518df2d5bb10fadec64b6a402a0d99463a6f72c89f232fdabca0c997cb18c7be6e SHA512 2adbe75d8737574231a921e827e12927c735e95fdbfab17fa9264fed5ea9e60a2f3341eaaaffc17a6c189db5024df8a7fe9875ebc8d85b6991e964e9e472a8b2
 MISC metadata.xml 322 BLAKE2B 1c28b0fcafac554548ea1862a338974f28c5d6b62745847627ffdba18494551b1fbc596c2e155787e5fc0b3410814a284f1792ee8fbb241cbae774c140a1d00a SHA512 09860d1821637bfc17aef0aae7b14913af3b5171c95a3a9edf7ab00a3b006e5335cd1d7770953a3d4956f7b876cd990affbad468b0a24d9290c69b5e1ef95ae4
diff --git a/dev-tex/pgf/files/pgfsys-luatex.def b/dev-tex/pgf/files/pgfsys-luatex.def
deleted file mode 100644
index 4e00695f3815..000000000000
--- a/dev-tex/pgf/files/pgfsys-luatex.def
+++ /dev/null
@@ -1,431 +0,0 @@
-% Copyright 2006 by Till Tantau
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-%
-% See the file doc/generic/pgf/licenses/LICENSE for more details.
-
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-luatex.def,v 1.35 2014/10/11 09:23:31 vibrovski Exp $
-
-
-% Driver commands for pdf
-
-%
-% Load common pdf commands:
-%
-\input pgfsys-common-pdf.def
-
-%
-% pdftex-specific stuff:
-%
-\def\pgfsys@invoke#1{\pdfextension literal{#1}}
-
-% Synced hboxes
-\def\pgfsys@hboxsynced#1{%
-  {%
-    \pgfsys@beginscope%
-    \setbox\pgf@hbox=\hbox{%
-      \hskip\pgf@pt@x%
-      \raise\pgf@pt@y\hbox{%
-        \pgf@pt@x=0pt%
-        \pgf@pt@y=0pt%
-        \pgflowlevelsynccm% 
-        \pgfsys@hbox#1}%
-      \hss%
-    }%
-    \wd\pgf@hbox=0pt%
-    \ht\pgf@hbox=0pt%
-    \dp\pgf@hbox=0pt%
-    \box\pgf@hbox%
-    \pgfsys@endscope%
-  }%
-}
-
-
-
-\def\pgfsys@imagesuffixlist{.pdf:.jpg:.jpeg:.png:}
-\def\pgfsys@defineimage{% width, height, page number
-  \ifx\pgf@imagewidth\pgfutil@empty\else\edef\pgf@imagewidth{ width \pgf@imagewidth }\fi%
-  \ifx\pgf@imageheight\pgfutil@empty\else\edef\pgf@imageheight{ height \pgf@imageheight }\fi%
-  \ifx\pgf@imagepage\pgfutil@empty\else\edef\pgf@imagepage{ page \pgf@imagepage }\fi%
-  \ifx\saveimageresource\@undefined% old version of lualatex
-    \ifx\pgf@imagepage\pgfutil@empty\else%
-      \pgfwarning{Page selection not supported. Ignoring page selection}%
-    \fi%
-    \setbox\pgfutil@tempboxa=\hbox{%
-      \pdfimage \pgf@imageheight \pgf@imagewidth {\pgf@filename}}%
-    \pdfform\pgfutil@tempboxa%
-    \edef\pgf@image{\noexpand\pdfrefform\the\pdflastform}%
-  \else% new version
-    {\saveimageresource \pgf@imageheight \pgf@imagewidth attr
-      {/Interpolate \pgf@imageinterpolate\space\pgf@imagemask} \pgf@imagepage
-      {\pgf@filename}}%
-    \edef\pgf@image{\noexpand\useimageresource\the\lastsavedimageresourceindex}%
-  \fi
-}%
-\def\pgfsys@definemask#1{%
-  \ifx\pgf@maskmatte\pgfutil@empty%
-  \else%
-    \edef\pgf@maskmatte{/Matte [\pgf@maskmatte]}%
-  \fi%
-  \edef\pgf@attr{{\pgf@maskmatte\space /Decode [1 0]}}%
-  \immediate\saveimageresource attr \pgf@attr {\pgf@filename}%
-  \edef\pgf@mask{/SMask \the\lastsavedimageresourceindex\space 0 R}%
-}
-\def\pgfsys@horishading#1#2#3{%
-  {%
-    \pgf@parsefunc{#3}%
-    \pgfmathparse{#2}%
-    \setbox\pgfutil@tempboxa=\hbox to\pgf@max{\vbox to\pgfmathresult pt{\vfil\pgfsys@invoke{/Sh sh}}\hfil}%
-    \pgf@process{\pgfpoint{\pgf@max}{#2}}%
-    \immediate\saveboxresource resources {%
-      /Shading << /Sh << /ShadingType 2
-      /ColorSpace /DeviceRGB
-      /Domain [\pgf@pdfparseddomain]
-      /Coords [\pgf@doma\space0 \pgf@domb\space0]
-      /Function \pgf@pdfparsedfunction
-      /Extend [false false] >> >>}\pgfutil@tempboxa% <<
-    \expandafter\xdef\csname @pgfshading#1!\endcsname{\leavevmode\noexpand\useboxresource\the\lastsavedboxresourceindex}% 
-  }%
-}
-\def\pgfsys@vertshading#1#2#3{%
-  {%
-    \pgf@parsefunc{#3}%
-    \pgfmathparse{#2}%
-    \setbox\pgfutil@tempboxa=\hbox to\pgfmathresult pt{\vbox to\pgf@max{\vfil\pgfsys@invoke{/Sh sh}}\hfil}%
-    \pgf@process{\pgfpoint{#2}{\pgf@max}}%
-    \immediate\saveboxresource resources {%
-      /Shading << /Sh << /ShadingType 2
-      /ColorSpace /DeviceRGB
-      /Domain [\pgf@pdfparseddomain]
-      /Coords [0 \pgf@doma\space0 \pgf@domb]
-      /Function \pgf@pdfparsedfunction
-      /Extend [false false] >> >>}\pgfutil@tempboxa% <<
-    \expandafter\xdef\csname @pgfshading#1!\endcsname{\leavevmode\noexpand\useboxresource\the\lastsavedboxresourceindex}%
-  }%
-}
-\def\pgfsys@radialshading#1#2#3{%
-  {%
-    \pgf@parsefunc{#3}%
-    \setbox\pgfutil@tempboxa=\hbox to2\pgf@max{\vbox to2\pgf@max{\vfil\pgfsys@invoke{/Sh sh}}\hfil}%
-    \pgf@process{#2}%
-    \pgf@xa=\pgf@x%
-    \pgf@ya=\pgf@y%
-    \pgf@process{\pgfpoint{\pgf@max}{\pgf@max}}%
-    \advance\pgf@xa by \pgf@x%
-    \advance\pgf@ya by \pgf@y%
-    \pgf@sys@bp@correct{\pgf@x}%
-    \pgf@sys@bp@correct{\pgf@y}%
-    \pgf@sys@bp@correct{\pgf@xa}%
-    \pgf@sys@bp@correct{\pgf@ya}%
-    \immediate\saveboxresource resources {%
-      /Shading << /Sh << /ShadingType 3
-      /ColorSpace /DeviceRGB
-      /Domain [\pgf@pdfparseddomain]
-      /Coords [\pgf@sys@tonumber{\pgf@xa} \pgf@sys@tonumber{\pgf@ya} \pgf@doma\space \pgf@sys@tonumber{\pgf@x} \pgf@sys@tonumber{\pgf@y} \pgf@domb]
-      /Function \pgf@pdfparsedfunction
-      /Extend [true false] >> >>}\pgfutil@tempboxa% <<
-    \expandafter\xdef\csname @pgfshading#1!\endcsname{\leavevmode\noexpand\useboxresource\the\lastsavedboxresourceindex}%
-  }%
-}%
-\def\pgfsys@functionalshading#1#2#3#4{%
-  {%
-    \pgf@process{#2}%
-    \pgf@xa=\pgf@x%
-    \pgf@ya=\pgf@y%
-    \pgf@process{#3}%
-    \pgf@xb=\pgf@x%
-    \pgf@yb=\pgf@y%
-    \advance\pgf@x by-\pgf@xa%
-    \advance\pgf@y by-\pgf@ya%
-    \setbox\pgfutil@tempboxa=\hbox to\pgf@x{\vbox to\pgf@y{\vfil\pgfsys@invoke{/Sh sh}}\hfil}%
-    \pgf@sys@bp@correct{\pgf@xa}%
-    \pgf@sys@bp@correct{\pgf@ya}%
-    \pgf@sys@bp@correct{\pgf@xb}%
-    \pgf@sys@bp@correct{\pgf@yb}%
-    \pgf@xc=-\pgf@xa%
-    \pgf@yc=-\pgf@ya%
-    % Now build the function
-    \pdfextension obj 
-    stream
-    attr
-    {
-      /FunctionType 4
-      /Domain [\pgf@sys@tonumber{\pgf@xa}\space\pgf@sys@tonumber{\pgf@xb}\space\pgf@sys@tonumber{\pgf@ya}\space\pgf@sys@tonumber{\pgf@yb}]
-      /Range [0 1 0 1 0 1]
-    }
-    {{#4}}%
-    \edef\pgf@temp@num{\the\numexpr\pdffeedback lastobj\relax}%
-    \saveboxresource resources {%
-      /Shading << /Sh << /ShadingType 1
-      /ColorSpace /DeviceRGB
-      /Matrix [1 0 0 1 \pgf@sys@tonumber{\pgf@xc}\space\pgf@sys@tonumber{\pgf@yc}]
-      /Domain [\pgf@sys@tonumber{\pgf@xa}\space\pgf@sys@tonumber{\pgf@xb}\space\pgf@sys@tonumber{\pgf@ya}\space\pgf@sys@tonumber{\pgf@yb}]
-      /Function \pgf@temp@num\space 0 R 
-      >> >>}\pgfutil@tempboxa% <<
-    \expandafter\xdef\csname @pgfshading#1!\endcsname{%
-      \leavevmode%
-      \noexpand\useboxresource\the\lastsavedboxresourceindex%
-      \noexpand\pdfextension refobj \pgf@temp@num%
-    }%
-  }%
-}
-
-
-
-% Patterns
-
-\def\pgfsys@declarepattern#1#2#3#4#5#6#7#8#9{%
-  % Start building the pattern dictionary:
-  \pgf@xa=#2\relax%
-  \pgf@ya=#3\relax% 
-  \pgf@xb=#4\relax%
-  \pgf@yb=#5\relax%
-  \pgf@xc=#6\relax%
-  \pgf@yc=#7\relax%
-  \pgf@sys@bp@correct\pgf@xa%
-  \pgf@sys@bp@correct\pgf@ya%
-  \pgf@sys@bp@correct\pgf@xb%
-  \pgf@sys@bp@correct\pgf@yb%
-  \pgf@sys@bp@correct\pgf@xc%
-  \pgf@sys@bp@correct\pgf@yc%
-  % Now create the pattern object:
-  \immediate\pdfextension obj  stream
-  attr
-  {
-    /Type /Pattern
-    /PatternType 1
-    /PaintType \ifnum#9=0 2 \else 1 \fi
-    /TilingType 1
-    /BBox [\pgf@sys@tonumber\pgf@xa\space\pgf@sys@tonumber\pgf@ya\space\pgf@sys@tonumber\pgf@xb\space\pgf@sys@tonumber\pgf@yb]
-    /XStep \pgf@sys@tonumber\pgf@xc\space
-    /YStep \pgf@sys@tonumber\pgf@yc\space
-    /Resources << >> %<<
-  }
-  {#8}% 
-  \pgfutil@addpdfresource@patterns{/pgfpat#1\space \the\numexpr\pdffeedback lastobj\relax\space 0 R}%
-}
-
-\def\pgfsys@setpatternuncolored#1#2#3#4{%
-  \pgfsysprotocol@literal{/pgfprgb cs #2 #3 #4 /pgfpat#1\space scn}%
-}
-
-\def\pgfsys@setpatterncolored#1{%
-  \pgfsysprotocol@literal{/Pattern cs /pgfpat#1\space scn}%
-}
-
-% System layer for meta patterns
-% Takes 15(!) arguments
-% #1    pattern name
-% #2 #3 bounding box lower left
-% #4 #5 bounding box upper right
-% #6 #7 tile size
-% #8 #9 #10 #11 #12 #13 transformation matrix
-% #14   protocoled text
-% #15   pattern type
-\def\pgfsys@declarepattern@meta#1#2#3#4#5#6#7{%
-  % Start building the pattern dictionary:
-  \pgf@xa=#2\relax%
-  \pgf@ya=#3\relax% 
-  \pgf@xb=#4\relax%
-  \pgf@yb=#5\relax%
-  \pgf@xc=#6\relax%
-  \pgf@yc=#7\relax%
-  \pgf@sys@bp@correct\pgf@xa%
-  \pgf@sys@bp@correct\pgf@ya%
-  \pgf@sys@bp@correct\pgf@xb%
-  \pgf@sys@bp@correct\pgf@yb%
-  \pgf@sys@bp@correct\pgf@xc%
-  \pgf@sys@bp@correct\pgf@yc%
-  \pgfsys@@declarepattern@meta{#1}}
-
-\def\pgfsys@@declarepattern@meta#1#2#3#4#5#6#7#8#9{%
-   \pgfutil@tempdima=#6\relax%
-   \pgfutil@tempdimb=#7\relax%
-   \pgf@sys@bp@correct\pgf@xa%
-   \pgf@sys@bp@correct\pgf@ya%
-   % Now create the pattern object:
-   \immediate\pdfextension obj  stream
-   attr
-   {
-     /Type /Pattern
-     /PatternType 1
-     /PaintType \ifnum#9=0 2 \else 1 \fi
-     /TilingType 1
-     /BBox [\pgf@sys@tonumber\pgf@xa\space\pgf@sys@tonumber\pgf@ya\space\pgf@sys@tonumber\pgf@xb\space\pgf@sys@tonumber\pgf@yb]
-     /XStep \pgf@sys@tonumber\pgf@xc\space
-     /YStep \pgf@sys@tonumber\pgf@yc\space
-     /Matrix [#2\space#3\space#4\space#5\space\pgf@sys@tonumber\pgfutil@tempdima\space\pgf@sys@tonumber\pgfutil@tempdimb]
-     /Resources << >> %<<
-   }
-   {#8}% 
-   \pgfutil@addpdfresource@patterns{/pgfpat#1\space \the\numexpr\pdffeedback lastobj\relax\space 0 R}%
- }
-
-
-
-\def\pgfsys@papersize#1#2{\pageheight#2\relax\pagewidth#1\relax}
-
-\def\pgfsys@global@papersize#1#2{\global\pageheight#2\relax\global\pagewidth#1\relax}
-
-\ifx\paperheight\@undefined
-  \def\pgfsys@thepageheight{\pageheight}
-  \def\pgfsys@thepagewidth{\pagewidth}
-\fi
-
-
-%
-% Position tracking
-%
-\def\pgfsys@markposition#1{%
-  \savepos%
-  \edef\pgf@temp{#1}%
-  \expandafter\pgfutil@writetoaux\expandafter{%
-    \expandafter\noexpand\expandafter\pgfsyspdfmark\expandafter{\pgf@temp}{\the\lastxpos}{\the\lastypos}}%
-}
-
-\def\pgfsyspdfmark#1#2#3{%
-  \expandafter\gdef\csname pgf@sys@pdf@mark@pos@#1\endcsname{\pgfqpoint{#2sp}{#3sp}}%
-  \pgfutil@check@rerun{#1}{{#2}{#3}}%
-}
-
-\def\pgfsys@getposition#1#2{%
-  \edef\pgf@marshal{\let\noexpand#2=\expandafter\noexpand\csname pgf@sys@pdf@mark@pos@#1\endcsname}%
-  \pgf@marshal%
-}
-
-\def\pgf@sys@pdf@mark@pos@pgfpageorigin{\pgfqpoint{\hoffset}{\voffset}}
-
-
-%
-% Opacity masks
-%
-\def\pgfsys@fadingfrombox#1#2{%
-  {%
-    \pgf@sys@pdf@check@resources%
-    \pgf@x=-.5\wd#2%
-    \pgf@y=-.5\ht#2%
-    \advance\pgf@y by.5\dp#2%
-    \expandafter\xdef\csname pgfsmasktrans@#1\endcsname{%
-      \noexpand\pgftransformcm{1}{0}{0}{1}{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}}%
-    \saveboxresource resources { \pgf@sys@pdf@possible@resources } #2%
-    \expandafter\xdef\csname pgfsmaskxform@#1\endcsname{\the\lastsavedboxresourceindex}%
-  }%
-}
-\def\pgfsys@usefading#1#2#3#4#5#6#7{%
-  \expandafter\ifx\csname pgfsmaskxform@#1\endcsname\relax%
-    \pgferror{Undefined fading '#1'}%
-  \else%
-    {%
-      \expandafter\ifx\csname pgfsmaks@#1\endcsname\relax%
-        \pgf@sys@pdf@install@mask{#1}%
-      \fi%
-      \pgftransformreset%
-      \pgftransformcm{#2}{#3}{#4}{#5}{\pgfpoint{#6}{#7}}%
-      \csname pgfsmasktrans@#1\endcsname%
-      {%
-        \pgflowlevelsynccm%
-        \pgfsys@invoke{/pgfsmask\csname pgfsmask@#1\endcsname\space gs}%
-      }%
-      \pgftransforminvert%
-      \pgflowlevelsynccm%
-    }%
-  \fi
-}
-
-\def\pgf@sys@pdf@install@mask#1{%
-  \setbox\pgfutil@tempboxa=\hbox{\useboxresource\csname pgfsmaskxform@#1\endcsname}
-  \immediate\saveboxresource%
-    attr {
-    /Group
-    <<
-      /S /Transparency
-      /CS /DeviceGray
-    >>
-  }% <<
-  \pgfutil@tempboxa% 
-  \pgfutil@addpdfresource@extgs{%
-    /pgfsmask\the\lastsavedboxresourceindex\space
-    <<
-      /SMask
-      <<
-        /S /Luminosity
-        /G \the\lastsavedboxresourceindex\space 0 R
-      >>
-    >> } %<<
-  \expandafter\xdef\csname pgfsmask@#1\endcsname{\the\lastsavedboxresourceindex}%
-}
-
-%
-% Transparency groups
-%
-\def\pgfsys@transparencygroupfrombox#1{%
-  \pgf@sys@pdf@check@resources%
-  \saveboxresource
-  attr { /Group << /S /Transparency
-    /I \ifpgfsys@transparency@group@isolated true \else false \fi
-    /K \ifpgfsys@transparency@group@knockout true \else false \fi >> } %<<
-  resources { \pgf@sys@pdf@possible@resources }
-  #1%
-  \setbox#1=\hbox{\useboxresource\lastsavedboxresourceindex}%
-}
-
-
-
-
-%
-% Resource management
-%
-
-\def\pgf@sys@setuppdfresources@plain{%
-  % This command will setup pdf resource in plain and in latex
-  % mode. ConTeXt has its own handler
-  % Page resources (they are kept in objects and only written at the
-  % very end)
-  \pdfextension obj  reserveobjnum \edef\pgf@sys@pdf@extgs@objnum{\the\numexpr\pdffeedback lastobj\relax}
-  \pdfextension obj  reserveobjnum \edef\pgf@sys@pdf@pattern@objnum{\the\numexpr\pdffeedback lastobj\relax}
-  \pdfextension obj  reserveobjnum \edef\pgf@sys@pdf@colrospaces@objnum{\the\numexpr\pdffeedback lastobj\relax}
-  \def\pgf@sys@pdf@possible@resources{%
-    /ColorSpace \pgf@sys@pdf@colrospaces@objnum\space 0 R
-    /Pattern    \pgf@sys@pdf@pattern@objnum\space 0 R
-    /ExtGState  \pgf@sys@pdf@extgs@objnum\space 0 R
-  }
-  \let\pgf@sys@pdf@check@resources=\relax%
-  \def\pgf@sys@pdf@install@pageresources{
-    {
-      \edef\temp{
-        \pgf@sys@pdf@possible@resources
-      }
-      \expandafter\global\expandafter\pdfvariable pageresources\expandafter{\temp}
-    }
-  }
-  \pgf@sys@pdf@install@pageresources
-  \expandafter\pgfutil@everybye\expandafter{%
-    \the\pgfutil@everybye%
-    \immediate \pdfextension obj  useobjnum \pgf@sys@pdf@extgs@objnum {<<\pgf@sys@pgf@resource@list@extgs>>}%<<
-    \immediate \pdfextension obj  useobjnum \pgf@sys@pdf@pattern@objnum {<<\pgf@sys@pgf@resource@list@patterns>>}%<<
-    \immediate \pdfextension obj  useobjnum \pgf@sys@pdf@colrospaces@objnum {<<\pgf@sys@pgf@resource@list@colorspaces>>}%<<
-  }
-  \let\pgf@sys@pgf@resource@list@extgs=\pgfutil@empty%
-  \let\pgf@sys@pgf@resource@list@patterns=\pgfutil@empty%
-  \let\pgf@sys@pgf@resource@list@colorspaces=\pgfutil@empty%
-  \def\pgf@sys@addpdfresource@extgs@plain##1{\xdef\pgf@sys@pgf@resource@list@extgs{\pgf@sys@pgf@resource@list@extgs\space##1}}
-  \def\pgf@sys@addpdfresource@patterns@plain##1{\xdef\pgf@sys@pgf@resource@list@patterns{\pgf@sys@pgf@resource@list@patterns\space##1}}
-  \def\pgf@sys@addpdfresource@colorspaces@plain##1{\xdef\pgf@sys@pgf@resource@list@colorspaces{\pgf@sys@pgf@resource@list@colorspaces\space##1}}
-}
-\pgfutil@setuppdfresources % possibly call the above
-
-\pgfutil@addpdfresource@colorspaces{ /pgfprgb [/Pattern /DeviceRGB] }
-
-\def\pgfsys@color@unstacked#1{%
-	\pdfextension literal{\csname\string\color@#1\endcsname}%
-}
-
-\endinput
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% End: 
diff --git a/dev-tex/pgf/pgf-3.1.4-r1.ebuild b/dev-tex/pgf/pgf-3.1.4-r1.ebuild
deleted file mode 100644
index e48b8a08ba48..000000000000
--- a/dev-tex/pgf/pgf-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="The TeX Portable Graphic Format"
-HOMEPAGE="https://github.com/pgf-tikz/pgf"
-SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}-revisioned.tex.xz
-	doc? ( https://github.com/pgf-tikz/pgf/releases/download/${PV}/pgfmanual.pdf -> ${P}-pgfmanual.pdf )"
-
-LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-RDEPEND="dev-texlive/texlive-latexrecommended
-	dev-tex/xcolor"
-
-src_install() {
-	insinto "${TEXMF}"
-	doins -r tex
-	insinto "${TEXMF}"/tex/generic/${PN}
-	newins "${WORKDIR}"/${P}-revisioned.tex pgf.revision.tex
-
-	if use source ; then
-		doins -r source
-	fi
-
-	cd "${S}/doc/generic/pgf" || die
-	dodoc AUTHORS ChangeLog README
-	if use doc; then
-		insinto /usr/share/doc/${PF}/texdoc
-		# pgfmanual is now split from the main tar archive
-		newdoc "${DISTDIR}/${P}-pgfmanual.pdf" pgfmanual.pdf
-		doins -r images macros text-en version-*
-
-		dosym "/usr/share/doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
-		docompress -x "/usr/share/doc/${PF}/texdoc/"
-	fi
-}
diff --git a/dev-tex/pgf/pgf-3.1.4b-r1.ebuild b/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
index e36bb603e2c5..a5f040467eeb 100644
--- a/dev-tex/pgf/pgf-3.1.4b-r1.ebuild
+++ b/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
@@ -16,8 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
-RDEPEND="dev-texlive/texlive-latexrecommended
-	dev-tex/xcolor"
+RDEPEND="dev-texlive/texlive-latexrecommended"
 
 src_install() {
 	insinto "${TEXMF}"
@@ -32,12 +31,12 @@ src_install() {
 	cd "${S}/doc/generic/pgf" || die
 	dodoc AUTHORS ChangeLog README
 	if use doc; then
-		insinto /usr/share/doc/${PF}/texdoc
+		docinto /usr/share/doc/${P}/texdoc
 		# pgfmanual is now split from the main tar archive
 		newdoc "${DISTDIR}/${P}-pgfmanual.pdf" pgfmanual.pdf
 		doins -r images macros text-en version-*
 
-		dosym "/usr/share/doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
-		docompress -x "/usr/share/doc/${PF}/texdoc/"
+		dosym "${ED}/usr/share/doc/${P}/texdoc" "${TEXMF}/doc/latex/${PN}"
+		docompress -x "/usr/share/doc/${P}/texdoc/"
 	fi
 }