3 files changed, 30 insertions, 28 deletions
diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest
index 04c87a17c3a7..d237e74d262d 100644
--- a/dev-texlive/texlive-pictures/Manifest
+++ b/dev-texlive/texlive-pictures/Manifest
@@ -75,6 +75,8 @@ DIST tl-ditaa-2020.tar.xz 1184 BLAKE2B d405d5f4c8f06b1f1e49b798fa47e1819aab9b990
 DIST tl-ditaa.doc-2020.tar.xz 105808 BLAKE2B 38475efefcbcb1999086e56345eb444828adda8691988037df7d65dad6cebed01dbe5b47ee73874fb316e2681254764edb1a5120cbf00cd9a81873fe964490a2 SHA512 345d6d7d3f21d2dc728b93e2cbfeb4fc1f589797e852604809b1ff3e7bca53414d684571faf8245c740a50205e7d8787afd5304beb89efd3545a389ec4a74331
 DIST tl-doc-pictex-2020.tar.xz 468 BLAKE2B a894250cf26ae780a8f1181ababe30c26ab94f96cbb0795d1f9fa6dab69bd493d8dfbab54fe244c8c5ec983d131a1aa832faa83047bd69ece3b46a4d76340666 SHA512 c866f0855f701917fa81966c16a7f1c869320ddaf38e2c1c2a71844fa7b224fe2216f267b7b700ef6e36a13f97fa6f33a1d05342d5a7a8dd47ccda761fc577f4
 DIST tl-doc-pictex.doc-2020.tar.xz 1508 BLAKE2B d9b37db6c733c75a46dcb4234b8f30f29bed5297c2d819f38ba9ecfa805a3d108ecc137fcb4e2f092b1761056aa94c763460baf21871b7754f6ef74279513170 SHA512 3440fd4d0e2117594d6b350dcfed891506ce7fc0500ecdd4f156431363a38e399061469f5def9082d59c39b14b65ebc19ccb3204fef71ade300825cf35659158
+DIST tl-dot2texi-2020.tar.xz 3740 BLAKE2B 4c792247a165100ec5f42a58cb5171118021e44e819d708e26e416053b82318b69025c7a319aeee9000c56a83ff17b8de31ef193cb9d4a870054fd5918b693ea SHA512 20cc54f907b00e2eb14e4641d5098dd4886ce8d4627f391421bc5e819614dec97e0ec42c92794bacb8ffcb03737cb8736c308fad6984abf13c127f6d1174ee0f
+DIST tl-dot2texi.doc-2020.tar.xz 216576 BLAKE2B 4e7190cfba4c0dd2ada60f0adc0ad1adff7f1ffdc9c1c935ebefcd86a8a140826e3fa6b745778d7148cadeb084725f14dbf0f509203e95ca946354336871b8b9 SHA512 9e8461946582e0c99ee35437522e25769e2afe5d7051f072937a57c5d4e1a0c8e144509c751f9ddb7ef576f43ca408ffca663f81c8b5e69fb176a4233ff45ea3
 DIST tl-dottex-2020.tar.xz 2596 BLAKE2B b92d717e24213ef7847505f190c9abf51b68bfd82f81c44bb044f10ae5b652fbf54be4bfef9602f4b0b36e62a30c13560d0939aa340ace9708d33674f76c921e SHA512 037586577425d8a38a2170bc4bb9a7fa28a7886ad852d1c85483f7c3b625321c41a204b613479382ff5fb9e8cc3f8f9d8ff6e0a07c14b71ce6fdc68280515e33
 DIST tl-dottex.doc-2020.tar.xz 88372 BLAKE2B b68114e7e42e9f6a82dbb5f792d6010476b7eb64732936518f777d00d537922e9ef52bc62b74dcca4c3dfb64856d868bcc0acccd1351f866f16c274745309c12 SHA512 3708e08c630e27d744c3a865cc02e91868a32b1648b4d390cea0f20ea6340c56ea1720348f6b82796df6cc3f4d5b7feaf59ffe7e24c32e34535a4e5763318df6
 DIST tl-dottex.source-2020.tar.xz 4668 BLAKE2B 0c03b5ec230d37eddbaddbe81e5965d9697617437ef9c0e900e042cc1bf97f949174fb43adde352381143cdcc5e852ed0853005292a3bf94836e5e52d8d6335b SHA512 adf26c722ad1e2fa26d10488125267516923db87c1185068a33a082c6f51bf5ec644ace69aefa0630eab9a604bfc28032cb5d10db15ef0c80ab28fc93839a13b
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2020-r1.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2020-r1.ebuild
deleted file mode 100644
index c927c734cdb9..000000000000
--- a/dev-texlive/texlive-pictures/texlive-pictures-2020-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-TEXLIVE_MODULE_CONTENTS="adigraph aobs-tikz askmaps asyfig asypictureb autoarea bardiag beamerswitch binarytree blochsphere bloques blox bodegraph bondgraph bondgraphs braids bxeepic cachepic callouts celtic chemfig combinedgraphics circuit-macros circuitikz curve curve2e curves dcpic diagmac2 ditaa doc-pictex dottex  dratex drs duotenzor dynkin-diagrams ecgdraw eepic ellipse endofproofwd  epspdfconversion esk euflag fast-diagram fig4latex fitbox flowchart forest genealogytree getmap gincltex gnuplottex gradientframe grafcet graph35 graphicxpsd graphviz gtrlib-largetrees harveyballs here hf-tikz hobby hvfloat istgame kblocks knitting knittingpattern ladder lapdf latex-make lpic lroundrect luamesh luasseq maker makeshape mathspic milsymb miniplot mkpic modiagram neuralnetwork numericplots pb-diagram penrose petri-nets  pgf-blur pgf-cmykshadings pgf-soroban pgf-spectra pgf-umlcd pgf-umlsd pgfgantt pgfkeyx pgfmolbio pgfmorepages pgfopts pgfplots picinpar pict2e pictex pictex2 pinlabel pixelart pmgraph postage prerex productbox ptolemaicastronomy pxpgfmark qcircuit quantikz qrcode randbild randomwalk realhats reotex rviewport sa-tikz schemabloc scsnowman scratch scratch3 setdeck simpleoptics signchart smartdiagram spath3 spectralsequences swimgraf table-fct texdraw ticollege tipfr tikz-3dplot tikz-bayesnet tikz-cd tikz-dependency tikz-dimline tikz-feynhand tikz-feynman tikz-imagelabels tikz-inet tikz-kalender tikz-karnaugh tikz-ladder tikz-layers tikz-nef tikz-network tikz-opm tikz-optics tikz-page tikz-palattice tikz-qtree tikz-relay tikz-sfc tikz-timing tikz-trackschematic tikz-truchet tikzcodeblocks tikzducks tikzinclude tikzlings tikzmark tikzmarmots tikzorbital tikzpagenodes tikzpfeile tikzpeople tikzposter tikzscale tikzsymbols timing-diagrams tqft tkz-base tkz-doc tkz-euclide tkz-orm tkz-tab tsemlines tufte-latex venndiagram visualpstricks xpicture xypic collection-pictures
-"
-TEXLIVE_MODULE_DOC_CONTENTS="adigraph.doc aobs-tikz.doc askmaps.doc asyfig.doc asypictureb.doc autoarea.doc bardiag.doc beamerswitch.doc binarytree.doc blochsphere.doc bloques.doc blox.doc bodegraph.doc bondgraph.doc bondgraphs.doc braids.doc bxeepic.doc cachepic.doc callouts.doc celtic.doc chemfig.doc combinedgraphics.doc circuit-macros.doc circuitikz.doc curve.doc curve2e.doc curves.doc dcpic.doc diagmac2.doc ditaa.doc doc-pictex.doc dottex.doc dratex.doc drs.doc duotenzor.doc dynkin-diagrams.doc ecgdraw.doc eepic.doc ellipse.doc endofproofwd.doc epspdfconversion.doc esk.doc euflag.doc fast-diagram.doc fig4latex.doc fitbox.doc flowchart.doc forest.doc genealogytree.doc getmap.doc gincltex.doc gnuplottex.doc gradientframe.doc grafcet.doc graph35.doc graphicxpsd.doc graphviz.doc gtrlib-largetrees.doc harveyballs.doc here.doc hf-tikz.doc hobby.doc hvfloat.doc istgame.doc kblocks.doc knitting.doc knittingpattern.doc ladder.doc lapdf.doc latex-make.doc lpic.doc lroundrect.doc luamesh.doc luasseq.doc maker.doc makeshape.doc mathspic.doc milsymb.doc miniplot.doc mkpic.doc modiagram.doc neuralnetwork.doc numericplots.doc pb-diagram.doc penrose.doc petri-nets.doc pgf-blur.doc pgf-cmykshadings.doc pgf-soroban.doc pgf-spectra.doc pgf-umlcd.doc pgf-umlsd.doc pgfgantt.doc pgfkeyx.doc pgfmolbio.doc pgfmorepages.doc pgfopts.doc pgfplots.doc picinpar.doc pict2e.doc pictex.doc pinlabel.doc pixelart.doc pmgraph.doc postage.doc prerex.doc productbox.doc ptolemaicastronomy.doc pxpgfmark.doc qcircuit.doc quantikz.doc qrcode.doc randbild.doc randomwalk.doc realhats.doc reotex.doc rviewport.doc sa-tikz.doc schemabloc.doc scsnowman.doc scratch.doc scratch3.doc setdeck.doc simpleoptics.doc signchart.doc smartdiagram.doc spath3.doc spectralsequences.doc swimgraf.doc table-fct.doc texdraw.doc ticollege.doc tipfr.doc tikz-3dplot.doc tikz-bayesnet.doc tikz-cd.doc tikz-dependency.doc tikz-dimline.doc tikz-feynhand.doc tikz-feynman.doc tikz-imagelabels.doc tikz-inet.doc tikz-kalender.doc tikz-karnaugh.doc tikz-ladder.doc tikz-layers.doc tikz-nef.doc tikz-network.doc tikz-opm.doc tikz-optics.doc tikz-page.doc tikz-palattice.doc tikz-qtree.doc tikz-relay.doc tikz-sfc.doc tikz-timing.doc tikz-trackschematic.doc tikz-truchet.doc tikzcodeblocks.doc tikzducks.doc tikzinclude.doc tikzlings.doc tikzmark.doc tikzmarmots.doc tikzorbital.doc tikzpagenodes.doc tikzpfeile.doc tikzpeople.doc tikzposter.doc tikzscale.doc tikzsymbols.doc timing-diagrams.doc tqft.doc tkz-base.doc tkz-doc.doc tkz-euclide.doc tkz-orm.doc tkz-tab.doc tufte-latex.doc venndiagram.doc visualpstricks.doc xpicture.doc xypic.doc "
-TEXLIVE_MODULE_SRC_CONTENTS="aobs-tikz.source asyfig.source asypictureb.source beamerswitch.source binarytree.source blochsphere.source blox.source bondgraphs.source braids.source celtic.source combinedgraphics.source curve.source curve2e.source curves.source dottex.source ecgdraw.source ellipse.source esk.source euflag.source fitbox.source flowchart.source forest.source gincltex.source gnuplottex.source gradientframe.source graph35.source graphviz.source gtrlib-largetrees.source hf-tikz.source hobby.source latex-make.source lroundrect.source luasseq.source makeshape.source penrose.source pgf-blur.source pgf-cmykshadings.source pgfgantt.source pgfmolbio.source pgfopts.source pgfplots.source pict2e.source pixelart.source postage.source productbox.source ptolemaicastronomy.source qrcode.source randbild.source randomwalk.source realhats.source rviewport.source signchart.source smartdiagram.source spath3.source tikz-imagelabels.source tikz-page.source tikz-timing.source tikz-truchet.source tikzinclude.source tikzmark.source tikzpagenodes.source tikzpfeile.source tikzposter.source tikzscale.source tikzsymbols.source tqft.source venndiagram.source xpicture.source "
-inherit  texlive-module
-DESCRIPTION="TeXLive Graphics, pictures, diagrams"
-
-LICENSE=" Apache-2.0 BSD-2 GPL-2 CC-BY-SA-4.0 "
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=dev-texlive/texlive-basic-2020
->=dev-tex/pgf-3.0.1
-"
-RDEPEND="${DEPEND} "
-TEXLIVE_MODULE_BINSCRIPTS="
-	texmf-dist/scripts/cachepic/cachepic.tlu
-	texmf-dist/scripts/fig4latex/fig4latex
-	texmf-dist/scripts/mathspic/mathspic.pl
-	texmf-dist/scripts/mkpic/mkpic
-	texmf-dist/scripts/getmap/getmapdl.lua
-	texmf-dist/scripts/petri-nets/pn2pdf
-"
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild
new file mode 100644
index 000000000000..ce9dd3a27ccc
--- /dev/null
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+TEXLIVE_MODULE_CONTENTS="adigraph aobs-tikz askmaps asyfig asypictureb autoarea bardiag beamerswitch binarytree blochsphere bloques blox bodegraph bondgraph bondgraphs braids bxeepic cachepic callouts celtic chemfig combinedgraphics circuit-macros circuitikz curve curve2e curves dcpic diagmac2 ditaa doc-pictex dot2texi dottex  dratex drs duotenzor dynkin-diagrams ecgdraw eepic ellipse endofproofwd  epspdfconversion esk euflag fast-diagram fig4latex fitbox flowchart forest genealogytree getmap gincltex gnuplottex gradientframe grafcet graph35 graphicxpsd graphviz gtrlib-largetrees harveyballs here hf-tikz hobby hvfloat istgame kblocks knitting knittingpattern ladder lapdf latex-make lpic lroundrect luamesh luasseq maker makeshape mathspic milsymb miniplot mkpic modiagram neuralnetwork numericplots pb-diagram penrose petri-nets  pgf-blur pgf-cmykshadings pgf-soroban pgf-spectra pgf-umlcd pgf-umlsd pgfgantt pgfkeyx pgfmolbio pgfmorepages pgfopts pgfplots picinpar pict2e pictex pictex2 pinlabel pixelart pmgraph postage prerex productbox ptolemaicastronomy pxpgfmark qcircuit quantikz qrcode randbild randomwalk realhats reotex rviewport sa-tikz schemabloc scsnowman scratch scratch3 setdeck simpleoptics signchart smartdiagram spath3 spectralsequences swimgraf table-fct texdraw ticollege tipfr tikz-3dplot tikz-bayesnet tikz-cd tikz-dependency tikz-dimline tikz-feynhand tikz-feynman tikz-imagelabels tikz-inet tikz-kalender tikz-karnaugh tikz-ladder tikz-layers tikz-nef tikz-network tikz-opm tikz-optics tikz-page tikz-palattice tikz-qtree tikz-relay tikz-sfc tikz-timing tikz-trackschematic tikz-truchet tikzcodeblocks tikzducks tikzinclude tikzlings tikzmark tikzmarmots tikzorbital tikzpagenodes tikzpfeile tikzpeople tikzposter tikzscale tikzsymbols timing-diagrams tqft tkz-base tkz-doc tkz-euclide tkz-orm tkz-tab tsemlines tufte-latex venndiagram visualpstricks xpicture xypic collection-pictures
+"
+TEXLIVE_MODULE_DOC_CONTENTS="adigraph.doc aobs-tikz.doc askmaps.doc asyfig.doc asypictureb.doc autoarea.doc bardiag.doc beamerswitch.doc binarytree.doc blochsphere.doc bloques.doc blox.doc bodegraph.doc bondgraph.doc bondgraphs.doc braids.doc bxeepic.doc cachepic.doc callouts.doc celtic.doc chemfig.doc combinedgraphics.doc circuit-macros.doc circuitikz.doc curve.doc curve2e.doc curves.doc dcpic.doc diagmac2.doc ditaa.doc doc-pictex.doc dot2texi.doc dottex.doc dratex.doc drs.doc duotenzor.doc dynkin-diagrams.doc ecgdraw.doc eepic.doc ellipse.doc endofproofwd.doc epspdfconversion.doc esk.doc euflag.doc fast-diagram.doc fig4latex.doc fitbox.doc flowchart.doc forest.doc genealogytree.doc getmap.doc gincltex.doc gnuplottex.doc gradientframe.doc grafcet.doc graph35.doc graphicxpsd.doc graphviz.doc gtrlib-largetrees.doc harveyballs.doc here.doc hf-tikz.doc hobby.doc hvfloat.doc istgame.doc kblocks.doc knitting.doc knittingpattern.doc ladder.doc lapdf.doc latex-make.doc lpic.doc lroundrect.doc luamesh.doc luasseq.doc maker.doc makeshape.doc mathspic.doc milsymb.doc miniplot.doc mkpic.doc modiagram.doc neuralnetwork.doc numericplots.doc pb-diagram.doc penrose.doc petri-nets.doc pgf-blur.doc pgf-cmykshadings.doc pgf-soroban.doc pgf-spectra.doc pgf-umlcd.doc pgf-umlsd.doc pgfgantt.doc pgfkeyx.doc pgfmolbio.doc pgfmorepages.doc pgfopts.doc pgfplots.doc picinpar.doc pict2e.doc pictex.doc pinlabel.doc pixelart.doc pmgraph.doc postage.doc prerex.doc productbox.doc ptolemaicastronomy.doc pxpgfmark.doc qcircuit.doc quantikz.doc qrcode.doc randbild.doc randomwalk.doc realhats.doc reotex.doc rviewport.doc sa-tikz.doc schemabloc.doc scsnowman.doc scratch.doc scratch3.doc setdeck.doc simpleoptics.doc signchart.doc smartdiagram.doc spath3.doc spectralsequences.doc swimgraf.doc table-fct.doc texdraw.doc ticollege.doc tipfr.doc tikz-3dplot.doc tikz-bayesnet.doc tikz-cd.doc tikz-dependency.doc tikz-dimline.doc tikz-feynhand.doc tikz-feynman.doc tikz-imagelabels.doc tikz-inet.doc tikz-kalender.doc tikz-karnaugh.doc tikz-ladder.doc tikz-layers.doc tikz-nef.doc tikz-network.doc tikz-opm.doc tikz-optics.doc tikz-page.doc tikz-palattice.doc tikz-qtree.doc tikz-relay.doc tikz-sfc.doc tikz-timing.doc tikz-trackschematic.doc tikz-truchet.doc tikzcodeblocks.doc tikzducks.doc tikzinclude.doc tikzlings.doc tikzmark.doc tikzmarmots.doc tikzorbital.doc tikzpagenodes.doc tikzpfeile.doc tikzpeople.doc tikzposter.doc tikzscale.doc tikzsymbols.doc timing-diagrams.doc tqft.doc tkz-base.doc tkz-doc.doc tkz-euclide.doc tkz-orm.doc tkz-tab.doc tufte-latex.doc venndiagram.doc visualpstricks.doc xpicture.doc xypic.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="aobs-tikz.source asyfig.source asypictureb.source beamerswitch.source binarytree.source blochsphere.source blox.source bondgraphs.source braids.source celtic.source combinedgraphics.source curve.source curve2e.source curves.source dottex.source ecgdraw.source ellipse.source esk.source euflag.source fitbox.source flowchart.source forest.source gincltex.source gnuplottex.source gradientframe.source graph35.source graphviz.source gtrlib-largetrees.source hf-tikz.source hobby.source latex-make.source lroundrect.source luasseq.source makeshape.source penrose.source pgf-blur.source pgf-cmykshadings.source pgfgantt.source pgfmolbio.source pgfopts.source pgfplots.source pict2e.source pixelart.source postage.source productbox.source ptolemaicastronomy.source qrcode.source randbild.source randomwalk.source realhats.source rviewport.source signchart.source smartdiagram.source spath3.source tikz-imagelabels.source tikz-page.source tikz-timing.source tikz-truchet.source tikzinclude.source tikzmark.source tikzpagenodes.source tikzpfeile.source tikzposter.source tikzscale.source tikzsymbols.source tqft.source venndiagram.source xpicture.source "
+inherit  texlive-module
+DESCRIPTION="TeXLive Graphics, pictures, diagrams"
+
+LICENSE=" Apache-2.0 BSD-2 GPL-2 GPL-2+ CC-BY-SA-4.0 "
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND=">=dev-texlive/texlive-basic-2020
+>=dev-tex/pgf-3.0.1
+"
+RDEPEND="${DEPEND} "
+TEXLIVE_MODULE_BINSCRIPTS="
+	texmf-dist/scripts/cachepic/cachepic.tlu
+	texmf-dist/scripts/fig4latex/fig4latex
+	texmf-dist/scripts/mathspic/mathspic.pl
+	texmf-dist/scripts/mkpic/mkpic
+	texmf-dist/scripts/getmap/getmapdl.lua
+	texmf-dist/scripts/petri-nets/pn2pdf
+"