gentoo resync : 30.06.2019

6 files changed, 46 insertions, 4 deletions

diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index c5f8fc70f1df..110adfdba102 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-latexextra/Manifest b/dev-texlive/texlive-latexextra/Manifest
index 262bdb1df4cc..6b1572bc3025 100644
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@@ -1,4 +1,6 @@
-AUX vpe_invocation.patch 416 BLAKE2B 07549ed11d6d92d867b942149724a5aa695b222c6987e9d34ed0282d5db63b6c9a40532ce2cda6a48b520de3ff771d93f4fd059b0df21f0b8f33009d0d0f26c5 SHA512 1a505c99690cdd7c0f6b5bafa81d37ee66bfd1618a41e932a5de2d968ad8e06a323bd54bf5a61dcdb19ea89ed4d1e060d21f920dbdd400f606431c24ba65b55f
+AUX exsheets-syntax.patch 761 BLAKE2B 5d5e49f6ad46aaeee296fc29e1f44b29fbf5f649362c166299aeb6404b6b07c0b7a451727b74664dfbf62b31f60610cea6af3b029947682990588582170b84a0 SHA512 2a047ab5cefaf40a7149c9563b39f7d7237ba553ed0d1b9db8526b4a7dbbc190141ee7c6f6cf67f8e72db2736f7d1dfe5296de03ed79e9fce046d1b214598dd9
+AUX lstlinebgrd-syntax.patch 790 BLAKE2B a67f226f9346497d5254a0b8d7142ff2d568f9460898b117497cc67a3f1874a71bc4cb486690d6071ac59881d9070595a6bf5c8acc7aac01e3214d19ea9a73d4 SHA512 53e67c73d60c8d2ec2b2664dde148aab0bfd9a35b3f7a727cad6af73c0b5db0158aafae7f5a740d8ee284d5a03c76be8a915f5d7202247731fd9429febeed211
+AUX vpe_invocation.patch 405 BLAKE2B 40cdd3996332d981823c4799353b752d0e968e776032732af0b413135da15b8ff84a153c2c7def11ddc41453a1b9cc0d9ca4aaa91156a98d6ba8e800bd383675 SHA512 7f70d8293394aca36d459139ea95729cf6acec1ca05933334435e1e9a70f35f834e47d3a18a906bf41ba280cdb7df4e3f9b9f9e517fc6bf64d524730f8cf510a
 DIST texlive-module-2up-2017.tar.xz 4192 BLAKE2B e44b90d1bf221885024d4f2c7ed461fbafc1dd996b6f4f82275f7e248e4653d10081811aa5cd9f92b1cbcac24df86a6866875d4b8b75403e2b7563c957a9da0b SHA512 904d2bf91afee8813c52194e3f7f8dbabfa5d085383c4cfe55013351bbaaa74c718d148bf0fce75513c04f30027b692bc80ea69b0cb06598f40c4761475b40b4
 DIST texlive-module-2up-2019.tar.xz 4192 BLAKE2B 9dd0043345e9c6e3a721f1d2a4a5554908fbdc39d07384750ea1add7937ee56133b40bdb4323081b29c630dfb15fa27e0e82ff398c374f0393f867819e9a1d4a SHA512 b7844f246ef486d68babff92f2f648ef6b2eab28dbf8d22f649b2c9c26fc857b05f475e766a0c9b4c4cb5be1224afc690c22d19865e9efb9f4e75a8ff6d9dda8
 DIST texlive-module-2up.doc-2017.tar.xz 62736 BLAKE2B 06fe37fd58932ee5d4c6188f386ff4d59595cc90b4f73dd7d8fda42fdf684f03916243e663febccfcb62561cb844359ba71c4175275d2c580bb7168569d7a769 SHA512 d3ac2a2504fb7ab7668f47c53550bf24e2d5befb698f9276488f3285351cd3c47c95e894f6fc4febccb6dac2875cda22eaeac7931b388477e15ee85cf52aad52
@@ -6161,5 +6163,5 @@ DIST texlive-module-zwpagelayout-2019.tar.xz 8900 BLAKE2B 5d97ff0db7056208bd5dc8
 DIST texlive-module-zwpagelayout.doc-2017.tar.xz 591516 BLAKE2B 2c7a6199ffd8262858bdda2697b6f9aabde0c1d4cbcacaef223683be09fa1fc2db87be5a7542fc68de96a62ccab7f45468a41d1ba0303ddbbfd2a1947791864c SHA512 0a31ba65d49cbc111d6a5ca3ff1b2f9aa91614a23d6606aad1d5b9d37cd40f0f72c95bdfd56e56cb5f408279870e867282d862d0267d8e829fde608a49c079de
 DIST texlive-module-zwpagelayout.doc-2019.tar.xz 591556 BLAKE2B 730827ec5a3373b2375a640f33d4b3ba0b20b9f3856f043ac6a50879286ffbd689cec58577eb2e4c5db3d7dba4711e6212d63d41c787685adab1f844c46d615c SHA512 6f2a0c3e646f442e570ce576cf638a6a290b0bf0f120b19a27c1f190fb3d20d0d3dcd2a2e3490e9671846338b9d6890884f54296a31593993be9bfd06a7241fb
 EBUILD texlive-latexextra-2017.ebuild 39377 BLAKE2B 152d4eb28e925b7834276eb478a267b2b26db5a722bcb1f04959a08193ed761fe1acc35ef40f5b1c61ebe84557114757cd854a117452e871f80c214757305bc8 SHA512 4235adfc2251d152160e53f8d4bf193551f47c26063ea85fdfe51835a629b9e862336b59967f6982a3720f68d4b8f212dd752993ec17e3c7c033f1847253c6ff
-EBUILD texlive-latexextra-2019-r1.ebuild 42918 BLAKE2B 20c299f7d83d19156d097aa570189873726a106bc241b2de9d3466300c8a16d59b51fe9afcef3e8e21f2ee307129cdd408050002ba7863003d43e7ba1f4ec6ef SHA512 e6b85a82f8a6c06c8e324543bb8ceb0c7463555bcfa9d566727d335b323b74809791f89e8e7b3e48f48a5aa8897b2dec022f24c291461c56d22906478a03c5e6
+EBUILD texlive-latexextra-2019-r2.ebuild 43043 BLAKE2B ff498c68c456435ffacfc4a55eda689c5d0f17e13e42457f86daead1295c55853984456f95c30ba681bb603d059f07287e6891e91b309cf20be12e13cce930b3 SHA512 db3be49906cfd410cbe3ba048abb6eaf86c9d0b8a43315f9cbc4568dec5e97b4384601e7e1725393121bea1b0157108e2063f9e40ec5932f55b5ab8a1e50743b
 MISC metadata.xml 464 BLAKE2B f44661c9ab79ec9d3ca261cea4af7b64fbef81b0d63218137c940e804a8254b7a8638564d51b4f843e4ec59fc15711bbebd09f4b1fefd5a070ce0819345ce778 SHA512 f2f516eb45d8d405e29e91886fd2ffeb54e6126028d2ac218eb0bf43e009ab225f0a0661ce99436dda82b5f63b47e5930ab047e2bf16a2e306da510453fbe6a0
diff --git a/dev-texlive/texlive-latexextra/files/exsheets-syntax.patch b/dev-texlive/texlive-latexextra/files/exsheets-syntax.patch
new file mode 100644
index 000000000000..3b6763488a60
--- /dev/null
+++ b/dev-texlive/texlive-latexextra/files/exsheets-syntax.patch
@@ -0,0 +1,20 @@
+--- a/texmf-dist/tex/latex/exsheets/exsheets.sty	2017-02-11 00:30:33.000000000 +0100
++++ b/texmf-dist/tex/latex/exsheets/exsheets.sty	2019-06-09 10:13:30.917543183 +0200
+@@ -2760,7 +2760,7 @@
+       }
+   }
+   
+-\cs_new_protected:Npn \__exsheets_blank_skip:N #1
++\cs_new_protected:Npn \__exsheets_blank_skip:n #1
+   {
+     \bool_if:NTF \l__exsheets_blank_width_bool
+       { \dim_set:Nn \l__exsheets_tmpa_dim {#1} }
+@@ -2791,7 +2791,7 @@
+       }
+       { \exsheets_write_blank:n { \skip_horizontal:N \l__exsheets_tmpa_dim } }
+   }
+-\cs_generate_variant:Nn \__exsheets_blank_skip:N { n }
++\cs_generate_variant:Nn \__exsheets_blank_skip:n { n, V }
+ 
+ % the following code from Heiko Oberdieck in d.c.t.t served as inspiration
+ % and basis for the \blank command:
diff --git a/dev-texlive/texlive-latexextra/files/lstlinebgrd-syntax.patch b/dev-texlive/texlive-latexextra/files/lstlinebgrd-syntax.patch
new file mode 100644
index 000000000000..16f9da12d056
--- /dev/null
+++ b/dev-texlive/texlive-latexextra/files/lstlinebgrd-syntax.patch
@@ -0,0 +1,16 @@
+--- a/texmf-dist/tex/latex/lstaddons/lstlinebgrd.sty	2019-06-21 16:32:09.158990775 +0200
++++ b/texmf-dist/tex/latex/lstaddons/lstlinebgrd.sty	2019-06-21 16:31:45.408991817 +0200
+@@ -27,10 +27,10 @@
+ \lst@Key{numbers}{none}{%
+     \def\lst@PlaceNumber{\lst@linebgrd}%
+     \lstKV@SwitchCases{#1}%
+-    {none&\\%
+-     left&\def\lst@PlaceNumber{\llap{\normalfont
++    {none:\\%
++     left:\def\lst@PlaceNumber{\llap{\normalfont
+                 \lst@numberstyle{\thelstnumber}\kern\lst@numbersep}\lst@linebgrd}\\%
+-     right&\def\lst@PlaceNumber{\rlap{\normalfont
++     right:\def\lst@PlaceNumber{\rlap{\normalfont
+                 \kern\linewidth \kern\lst@numbersep
+                 \lst@numberstyle{\thelstnumber}}\lst@linebgrd}%
+     }{\PackageError{Listings}{Numbers #1 unknown}\@ehc}}
diff --git a/dev-texlive/texlive-latexextra/files/vpe_invocation.patch b/dev-texlive/texlive-latexextra/files/vpe_invocation.patch
index e4c114ec1a08..06f4534fd5b8 100644
--- a/dev-texlive/texlive-latexextra/files/vpe_invocation.patch
+++ b/dev-texlive/texlive-latexextra/files/vpe_invocation.patch
@@ -3,8 +3,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=289818
 
 Index: work/texmf-dist/scripts/vpe/vpe.pl
 ===================================================================
---- work.orig/texmf-dist/scripts/vpe/vpe.pl
-+++ work/texmf-dist/scripts/vpe/vpe.pl
+--- a/texmf-dist/scripts/vpe/vpe.pl
++++ b/texmf-dist/scripts/vpe/vpe.pl
 @@ -1,5 +1,4 @@
 -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
 -  if 0;
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2019-r1.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2019-r2.ebuild
index 964814d49359..e9ab3f8e0036 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2019-r1.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2019-r2.ebuild
@@ -37,3 +37,7 @@ TEXLIVE_MODULE_BINSCRIPTS="
 	texmf-dist/scripts/exceltex/exceltex
 	texmf-dist/scripts/makedtx/makedtx.pl
 "
+
+PATCHES=( "${FILESDIR}"/exsheets-syntax.patch
+	"${FILESDIR}"/lstlinebgrd-syntax.patch
+	"${FILESDIR}"/vpe_invocation.patch )