gentoo resync : 14.07.2018

17 files changed, 630 insertions, 0 deletions

diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
new file mode 100644
index 000000000000..c6730701ff2e
--- /dev/null
+++ b/dev-tex/latex2html/Manifest
@@ -0,0 +1,20 @@
+AUX latex2html-2017.2-brace-2.patch 561 BLAKE2B a7e3a26af1e3ebdf0f564cc0f0047f56480fcc9bea3b5d89b72af38c9708e5e5f07592dfbafe40a4b505bcb7bb557bb5def387ae6ffefb2218f94c91a5ea63a3 SHA512 002b71718b63d0c87c07c3d88dba9d33d8ecd2e08889f787f5b01fa3976cdbe215802c835013c2d1f686be01f4bedcca020039e7eb025098dc93e8a839a45bcd
+AUX latex2html-2017.2-brace.patch 1402 BLAKE2B 30142f799ba70526f1e46ba5b3ee1c201aa4a36ba76d83c48102d255481f2eba10e9156e1ec992a1dc75d334220e3dd1d0a3fcf56b280246d3ceb3bc1cc2799e SHA512 f138757d62cd047452377f67276bb385c37636352db575ae8da8debd0586d6f9620902505dba2809d77eb28eef670f463b38d7450f63cdc19711090487cbd2f7
+AUX latex2html-2017.2-dotinc-2.patch 499 BLAKE2B 54e08cb79ff1eba0382f1d7c4b01e733e1c447b2fbd315782d4a6a38e1822a5798b355534e7bc5d1cff9e7591de498a5815c74456f44191cf3fd7632f3955382 SHA512 370511bbfbb1c62f0b18d73129b51a726c29e79793aea0324f27a1ddd5ced00df0b6e2799a70f7b31b8b7939bf00b81c0f1d57605ecddf4d02f8c186748ac666
+AUX latex2html-2017.2-dotinc.patch 1130 BLAKE2B 0587124ff83a8ab9a360d490da31f031b9ac5ccfdf67194a718110dd63a2e4e8bcfa30b53deb4248dcd5dd2f48e231734462e5b69d7c69e37876bc9ab5f39ed4 SHA512 a9dfcbe11501cc6a1d61eb435a690c9c06ab200dcccf55477d35f76614a0a1c7da713664408b9c06a49c44f46a7f80eaad385cb8fb1f4135172157fac9de5ae6
+AUX latex2html-convert-length.patch 1148 BLAKE2B 1cea0bbb84ca6729ece192491997a146183cadd77b90b5520c4ff3a4eed96f6694f627dcf48965740b5bad3f9724428987662ef212fb0b1ed31c1f91d675c028 SHA512 f5bb3c29006e783728915d0761cbae4b0fddd65aa323749f9459ccf439d6896fd96c3608c2984868bb82be2ff390a6fe39933f01d3b12c94d50d61824f6368e1
+AUX latex2html-destdir.patch 703 BLAKE2B 47693763782d056eef223856a679112fe0989379e589f0b9d891f7dcd6b2b316de7a5d631c0b089709122d844f08ae268cb496055726abcee01ffece268640e8 SHA512 dbc4e9272ed54949fa34da8fd4b0e15db646461ef564e65d7b4a20dd89425227b93987a2a214ec57984b200135085b6456d758efd2faffd89c16d305d315d744
+AUX latex2html-extract-major-version-2.patch 640 BLAKE2B 2a839b05f7c7c0035b69d439e8818aea9c63f741e3d49b4a366c32b3999af70c689ffcb378d2daee99ad0cd922ab316e87220eabe217e897e1579edd29c4a506 SHA512 924fc8212250b20a4dea15e9588376d067740966174268e10922edb59da8be6f5095411570f06610593e5c0ffe54d3340e10a6f8050f4966ba29dbf5c12f3dc9
+AUX latex2html-extract-major-version.patch 635 BLAKE2B 01b28d2c1d7767052fcafa980b0c17920ac9f3b1335938fafdf21613e04e2329e842380df515147ab86c31cb25e902200cf4251f58be9d639928f761ae4baf89 SHA512 a8bedf07b233d6ffa7329fc6eb4c051639fc9871d8c6cc33efdfa49fce9c5e57e41e309beeb50546dd63feec2ee6e3b54f2e233956d8ee8f7b97b3fb050217eb
+AUX latex2html-perl_name.patch 445 BLAKE2B 5393870cd3c090c03c790235e36a255cf4d066a2a941500fa971f09403e02af4e2fcedb217aaf0bf42f1fbc8c46c72067e805e9debd81176dab3a7ad255337e1 SHA512 2f20147e0c4c5818f1e3843e3f7176ce84d332d2b3f3266cf86e4b4432c72ce626110805613b5f8f9f72b44332a532a203d1e4b091f9b447ec1bfda23585b6db
+AUX latex2html-tests.patch 1052 BLAKE2B 7f8e2f08d0f0dc102a08837333bfef91610075c316831721ea97f1efa3c65649c2efc61c071560621efe93e2789b5b9ee6b28080b56278a83c5dcd7f1dc106fe SHA512 b3c17ded5c45526f114c8bfdc9bc348e41d3297da377b99af2d0507f953b828d362ec9bdcf166677646b6350a7900f073ea7896dcdd7d3e6f7b265274ffaaeda
+DIST latex2html-2008.tar.gz 1133054 BLAKE2B c4ef102d55592f8ecbaf9372ce90d952866f89223b5db80d038a1305db7e4f835c585affed515f6c920fb0c43b2a3e55d4fcb315b272764f805398b8d12a5895 SHA512 e5a9d1700fcc45e6fcb7bae79e25acd52b7a84b70a75b3c7f1e746f65adbd48219a828420f6a7c437613d5c74dfb0405c91df01ac9c1535e9850f3a3e5c47f60
+DIST latex2html-2015.tar.gz 1217699 BLAKE2B e9daea005b7674ebb6a8c5902b77b609a633515b4127a2b3fe4d1b15bc2428c02ccc024df62545d5fe63e7034ad4b1532905fee97057d49730ec27f12913c55e SHA512 dd031944250efd28691edeba5e83b4c5c0deec3a2e7c2ab2a9bd285a911f6ab21a02cd0ef697bebc2c7c7c0ebd285493c1d6b01b0db9355fc7f3316a2af65e2c
+DIST latex2html-2017.2.tar.gz 1131438 BLAKE2B 0a13cca95e1f7d8a9fd7d6b077726e083a6d33fbc712b883be46d57fbdea91d1d02a2a2f1990c5827cf2a4b9db18033f41f326af0a69770988bf4ff5e53a010a SHA512 0e1ab1b2005dc71988b1500884d7a13bfbdce73a62ef7f6cc6e83e29d776c98eb09cff3f8d0c162493586094c9ca6f07d47e98d2137f223f27044d03e9bb3473
+DIST latex2html-match-multiline.patch.bz2 8147 BLAKE2B 32a2bbe82c5ae08c4a2fdec9f057b8d5750518dc2159e12c53d0435b17841328ee4402b8b776866ad4d72aa2cd2d918c60caad3dc56548a478bd65bb5fff0542 SHA512 01ec0dd1705f030736432a7fa8bf99c83c9e4f01c9755319d36e65e18737361d23073277692a8c44af529a1c37caabcc9e720a4be57e64300f945060e88f6641
+EBUILD latex2html-2008-r1.ebuild 2682 BLAKE2B 5a6fac62f1169bb17e006b214220e0bec84555e666a4140a6ece8189e1b78818adaacf4febf3eb8714d7f5c0902c7d3e7335a67f786df415c04482defadaa5eb SHA512 10e129ad46a9681d74036dd2d5d6ef51a1b2da4646e82f38d5f205ec5ad0a452233733da18c33db10e568ba7993d19e7a2c4a81f2e782b21ce26d59bc36274f7
+EBUILD latex2html-2008.ebuild 2376 BLAKE2B 643b90102289a97015fb60326e7a37a9f2cafa5be15d3cff37d94cc024066eebab71367b4b48be71681658e7f97012d0ab3581eac96164b26973011b33c161da SHA512 d8b6d4ae3be4d7be4c419c2a0f13f0817fefa7c11d2d0f9c57a00447f227ad77852134ad86171f960802922f841839fc24968db2dff07c103e0abae3b2d6c27e
+EBUILD latex2html-2015.ebuild 2227 BLAKE2B f6c6c1f7382994a5e99fccbea12ff3cff0bc36c21daa6b92143e7e042917af96e8ac2efe49b7e182a2994cb8bcdeb3de00dd9fb9b706ed51b1c255e775a55acc SHA512 e8c3469e64f414e88cbc1099220c61e71aac9338db7bcff88ebce319b30a8b5e898ed9d0287c5f5b8b6faefbf3db2f4c7f1d7b1497d54b1bf4cefac7b3c2a7b6
+EBUILD latex2html-2017.2-r1.ebuild 2138 BLAKE2B f1361232644f54149a0f857d4bff968025c671076c7948928aab0b57f1d92443e51e9f8acccae70362ae8a7e80be04cc4a716d2bd71fb5034e522f49cd43bbec SHA512 0419754406dd4dac3827cfe26deadade7767bb3ad46270e83032b7ad1ce4d73921ba4e7eca3976bd7fd331a56109616b3105a7c1007a775e5a1b0d3ea85cc1e0
+EBUILD latex2html-2017.2-r2.ebuild 2172 BLAKE2B b04f1624b902bb84684f7b56880e9e68f73ae2e07f996f6f221a80cd88f75ba906098a3dbf951dd544def62e95ddc68b81ce430930de8cf838cb2c674b8cab6d SHA512 5e611f6eda3d3ef8a80e2a78221693ea012415f6cb9a72d6dedfd5779c17849d706f289d860029c6170f3571030104055ef0abbc781d1d55315d926803850d7e
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/latex2html/files/latex2html-2017.2-brace-2.patch b/dev-tex/latex2html/files/latex2html-2017.2-brace-2.patch
new file mode 100644
index 000000000000..533cbc0c75cf
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-2017.2-brace-2.patch
@@ -0,0 +1,12 @@
+diff -ruN latex2html-2017.2.orig/styles/frames.perl latex2html-2017.2/styles/frames.perl
+--- latex2html-2017.2.orig/styles/frames.perl	2017-01-23 18:14:25.000000000 +0100
++++ latex2html-2017.2/styles/frames.perl	2017-09-23 15:49:27.184088195 +0200
+@@ -706,7 +706,7 @@
+     $_[0] =~ s/<(META NAME|LINK)[^>]*>\s*//g;
+     $_[0] =~ s/$more_links_mark/$NO_ROBOTS\n$LATEX2HTML_META/g;
+     local($savedRS)=$/; $/ = '';
+-    $_[0] =~ s/\n{2;}/\n/sg;
++    $_[0] =~ s/\n\{2;}/\n/sg;
+     $_[0] =~ s/\s$//s;
+     $_[0] =~ s!\s*(\n</HEAD>\n)\s*!$1!s;
+     $/ = $savedRS;
diff --git a/dev-tex/latex2html/files/latex2html-2017.2-brace.patch b/dev-tex/latex2html/files/latex2html-2017.2-brace.patch
new file mode 100644
index 000000000000..4782fb313e79
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-2017.2-brace.patch
@@ -0,0 +1,36 @@
+diff -ruN latex2html-2017.2.orig/versions/html3_2.pl latex2html-2017.2/versions/html3_2.pl
+--- latex2html-2017.2.orig/versions/html3_2.pl	2017-01-23 17:14:25.000000000 -0000
++++ latex2html-2017.2/versions/html3_2.pl	2017-08-04 09:38:17.219909442 -0000
+@@ -607,7 +607,7 @@
+ 
+     if ($color_env) {
+ 	local($color_test) = join(',',@$open_tags_R);
+-	if ($color_test =~ /(color{[^}]*})/g ) {
++	if ($color_test =~ /(color\{[^}]*})/g ) {
+ 	    $color_env = $1;
+ 	}
+     }
+diff -ruN latex2html-2017.2.orig/versions/html4_01.pl latex2html-2017.2/versions/html4_01.pl
+--- latex2html-2017.2.orig/versions/html4_01.pl	2017-01-23 17:14:25.000000000 -0000
++++ latex2html-2017.2/versions/html4_01.pl	2017-08-04 09:39:32.529023088 -0000
+@@ -976,7 +976,7 @@
+ 
+     if ($color_env) {
+ 	local($color_test) = join(',',@$open_tags_R);
+-	if ($color_test =~ /(color{[^}]*})/g ) {
++	if ($color_test =~ /(color\{[^}]*})/g ) {
+ 	    $color_env = $1;
+ 	}
+     }
+diff -ruN latex2html-2017.2.orig/versions/html4_1.pl latex2html-2017.2/versions/html4_1.pl
+--- latex2html-2017.2.orig/versions/html4_1.pl	2017-01-23 17:14:25.000000000 -0000
++++ latex2html-2017.2/versions/html4_1.pl	2017-08-04 09:37:48.507866114 -0000
+@@ -976,7 +976,7 @@
+ 
+     if ($color_env) {
+ 	local($color_test) = join(',',@$open_tags_R);
+-	if ($color_test =~ /(color{[^}]*})/g ) {
++	if ($color_test =~ /(color\{[^}]*})/g ) {
+ 	    $color_env = $1;
+ 	}
+     }
diff --git a/dev-tex/latex2html/files/latex2html-2017.2-dotinc-2.patch b/dev-tex/latex2html/files/latex2html-2017.2-dotinc-2.patch
new file mode 100644
index 000000000000..2e58c0070d7d
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-2017.2-dotinc-2.patch
@@ -0,0 +1,12 @@
+diff -ruN latex2html-2017.2.orig/configure latex2html-2017.2/configure
+--- latex2html-2017.2.orig/configure	2017-01-23 17:14:25.000000000 -0000
++++ latex2html-2017.2/configure	2017-08-04 09:21:02.929355288 -0000
+@@ -1225,7 +1225,7 @@
+ fi
+ 
+ # this is used to get the values from the config file
+-eval `perl -w -e 'use cfgcache; foreach(keys %cfg) { print qq($_='"'"'$cfg{$_}'"'"'\n);}'`
++eval `perl -w -e 'use lib q[.]; use cfgcache; foreach(keys %cfg) { print qq($_='"'"'$cfg{$_}'"'"'\n);}'`
+ 
+ 
+ 
diff --git a/dev-tex/latex2html/files/latex2html-2017.2-dotinc.patch b/dev-tex/latex2html/files/latex2html-2017.2-dotinc.patch
new file mode 100644
index 000000000000..e7f29ad5779c
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-2017.2-dotinc.patch
@@ -0,0 +1,33 @@
+diff -ruN latex2html-2017.2.orig/config/build.pl latex2html-2017.2/config/build.pl
+--- latex2html-2017.2.orig/config/build.pl	2017-01-23 17:14:25.000000000 -0000
++++ latex2html-2017.2/config/build.pl	2017-08-04 09:13:26.040867263 -0000
+@@ -145,6 +145,7 @@
+ # Read in the system's configuration
+ use FindBin;
+ use lib "$FindBin::Bin/..";
++use lib "$FindBin::Bin";
+ use cfgcache;
+ 
+ my $dd = $cfg{'dd'};
+diff -ruN latex2html-2017.2.orig/config/config.pl latex2html-2017.2/config/config.pl
+--- latex2html-2017.2.orig/config/config.pl	2017-01-23 17:14:25.000000000 -0000
++++ latex2html-2017.2/config/config.pl	2017-08-04 09:13:45.500980317 -0000
+@@ -435,6 +435,7 @@
+ 
+ use FindBin;
+ use lib "$FindBin::Bin/..";
++use lib "$FindBin::Bin";
+ use L2hos;
+ 
+ #use diagnostics;
+diff -ruN latex2html-2017.2.orig/config/install.pl latex2html-2017.2/config/install.pl
+--- latex2html-2017.2.orig/config/install.pl	2017-08-04 09:08:53.608284554 -0000
++++ latex2html-2017.2/config/install.pl	2017-08-04 09:13:57.116047796 -0000
+@@ -183,6 +183,7 @@
+ 
+ use FindBin;
+ use lib "$FindBin::Bin/..";
++use lib "$FindBin::Bin";
+ use cfgcache;
+ use L2hos;
+ 
diff --git a/dev-tex/latex2html/files/latex2html-convert-length.patch b/dev-tex/latex2html/files/latex2html-convert-length.patch
new file mode 100644
index 000000000000..4171fd7c05e9
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-convert-length.patch
@@ -0,0 +1,22 @@
+--- latex2html-2002-2-1/versions/html2_2.pl.old	2006-02-21 20:37:50.000000000 +0100
++++ latex2html-2002-2-1/versions/html2_2.pl	2006-02-21 20:38:03.000000000 +0100
+@@ -91,7 +91,7 @@
+     ($pxs,$len);
+ }
+ # should no longer be needed, as this is defined in latex2html.pin
+-if (undefined &convert_length) { sub convert_length {&convert_length_table(@_)} }
++if (!defined (&convert_length)) { sub convert_length {&convert_length_table(@_)} }
+ 
+ # Translates LaTeX column specifications to HTML. Again, Netscape
+ # needs some extra work with its width attributes in the <td> tags.
+--- latex2html-2002-2-1/versions/table.pl.old	2006-02-21 20:37:54.000000000 +0100
++++ latex2html-2002-2-1/versions/table.pl	2006-02-21 20:38:11.000000000 +0100
+@@ -91,7 +91,7 @@
+     ($pxs,$len);
+ }
+ # should no longer be needed, as this is defined in latex2html.pin
+-if (undefined &convert_length) { sub convert_length {&convert_length_table(@_)} }
++if (!defined (&convert_length)) { sub convert_length {&convert_length_table(@_)} }
+ 
+ # Translates LaTeX column specifications to HTML. Again, Netscape
+ # needs some extra work with its width attributes in the <td> tags.
diff --git a/dev-tex/latex2html/files/latex2html-destdir.patch b/dev-tex/latex2html/files/latex2html-destdir.patch
new file mode 100644
index 000000000000..2d07beff449b
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-destdir.patch
@@ -0,0 +1,15 @@
+Index: latex2html-2008/config/install.pl
+===================================================================
+--- latex2html-2008.orig/config/install.pl
++++ latex2html-2008/config/install.pl
+@@ -372,7 +372,9 @@ foreach $item (sort keys %Install_items)
+ 
+ if($cfg{TEXPATH}) {
+   print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n     ($cfg{TEXPATH})\n";
+-  unless(mkpath($cfg{TEXPATH})) {
++  my $destdir = $cfg{TEXPATH};
++  $destdir = $ENV{'DESTDIR'}.$destdir if($ENV{'DESTDIR'});
++  unless(mkpath($destdir)) {
+   #my $testpath = $cfg{TEXPATH}; # to strip (latex2)html
+   #$testpath =~ s/[$dd$dd][^$dd$dd]*$//;
+   #if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) {
diff --git a/dev-tex/latex2html/files/latex2html-extract-major-version-2.patch b/dev-tex/latex2html/files/latex2html-extract-major-version-2.patch
new file mode 100644
index 000000000000..11b6685385ec
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-extract-major-version-2.patch
@@ -0,0 +1,12 @@
+diff -urN latex2html-2002-2-1.orig/config/config.pl latex2html-2002-2-1/config/config.pl
+--- latex2html-2002-2-1.orig/config/config.pl	2006-06-02 20:41:18.000000000 +0200
++++ latex2html-2002-2-1/config/config.pl	2006-06-02 20:42:07.000000000 +0200
+@@ -1275,7 +1275,7 @@
+     ($stat,$msg,$err) = &get_out_err("$pnmcrop -version");
+     my $vers = '';
+     $msg = $msg || $err;
+-    if ($msg =~ /(^|\s*)Version.*\s([\d\.]+)\s*([\n\r]|$)/is) { $vers = $2; }
++    if ($msg =~ /(^|\s*)Version: Netpbm (\d+)\..*\s*([\n\r]|$)/is) { $vers = $2; }
+     if ($vers =~ /^199/) {
+ 	# try left crop
+ 	&checking('if pnmcrop can crop from one direction');
diff --git a/dev-tex/latex2html/files/latex2html-extract-major-version.patch b/dev-tex/latex2html/files/latex2html-extract-major-version.patch
new file mode 100644
index 000000000000..7340754e5b41
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-extract-major-version.patch
@@ -0,0 +1,12 @@
+diff -urN latex2html-2002-2-1.orig/config/config.pl latex2html-2002-2-1/config/config.pl
+--- latex2html-2002-2-1.orig/config/config.pl	2006-06-02 20:41:18.000000000 +0200
++++ latex2html-2002-2-1/config/config.pl	2006-06-02 20:42:07.000000000 +0200
+@@ -1275,7 +1275,7 @@
+     ($stat,$msg,$err) = &get_out_err("$pnmcrop -version");
+     my $vers = '';
+     $msg = $msg || $err;
+-    if ($msg =~ /(^|\s*)Version.*\s([\d\.]+)\s*([\n\r]|$)/is) { $vers = $2; }
++    if ($msg =~ /(^|\s*)Version.*\s(\d+)\..*\s*([\n\r]|$)/is) { $vers = $2; }
+     if ($vers =~ /^199/) {
+ 	# try left crop
+ 	&checking('if pnmcrop can crop from one direction');
diff --git a/dev-tex/latex2html/files/latex2html-perl_name.patch b/dev-tex/latex2html/files/latex2html-perl_name.patch
new file mode 100644
index 000000000000..cc56f91437fa
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-perl_name.patch
@@ -0,0 +1,11 @@
+--- latex2html-2002-2-1/config/config.pl	2002-11-29 12:49:01.000000000 +0100
++++ latex2html-2002-2-1/config/config.pl.new	2006-05-23 11:29:10.000000000 +0200
+@@ -617,7 +617,7 @@
+ 
+ # only perl gets an absolute pathname
+ my $abs_path_names = 1;
+-$newcfg{'PERL'} = &find_prog($^X); # take the perl internal executable name
++$newcfg{'PERL'} = &find_prog("perl"); # take the perl internal executable name
+ &checking('perl version');
+ &result($]);
+ 
diff --git a/dev-tex/latex2html/files/latex2html-tests.patch b/dev-tex/latex2html/files/latex2html-tests.patch
new file mode 100644
index 000000000000..1ada1a32bf00
--- /dev/null
+++ b/dev-tex/latex2html/files/latex2html-tests.patch
@@ -0,0 +1,26 @@
+Index: latex2html-2017.2/styles/frames.perl
+===================================================================
+--- latex2html-2017.2.orig/styles/frames.perl
++++ latex2html-2017.2/styles/frames.perl
+@@ -295,7 +295,7 @@ sub check_frame_colorset {
+     elsif ($reverse == 1) {$colorset="${which}_colorset_star"}
+     elsif ($reverse == 2) {$colorset="${which}_colorset_star_star"}
+     else {$colorset="${which}_colorset"}
+-    if (!(defined  @$colorset))
++    if (!(@$colorset))
+ 	{ print STDERR "\nframes for $which are not supported\n"; return($rest);}	
+     local($frame_tmp)=$frame_data;
+     local($key, @values);
+Index: latex2html-2017.2/styles/natbib.perl
+===================================================================
+--- latex2html-2017.2.orig/styles/natbib.perl
++++ latex2html-2017.2/styles/natbib.perl
+@@ -1451,7 +1451,7 @@ sub do_cmd_citestyle {
+     local($_) = @_;
+     s/$next_pair_pr_rx//o;
+     local($style)="citestyle_$2";
+-    if (defined @$style) {
++    if (@$style) {
+ 	($CITE_OPEN_DELIM,
+ 	 $CITE_CLOSE_DELIM,
+ 	 $CITE_ENUM,
diff --git a/dev-tex/latex2html/latex2html-2008-r1.ebuild b/dev-tex/latex2html/latex2html-2008-r1.ebuild
new file mode 100644
index 000000000000..c8f39eed7f52
--- /dev/null
+++ b/dev-tex/latex2html/latex2html-2008-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit base eutils multilib
+
+DESCRIPTION="convertor written in Perl that converts LATEX documents to HTML"
+SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${P}.tar.gz
+	https://dev.gentoo.org/~dilfridge/distfiles/${PN}-match-multiline.patch.bz2"
+HOMEPAGE="http://www.latex2html.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="gif png"
+
+DEPEND="app-text/ghostscript-gpl
+	virtual/latex-base
+	media-libs/netpbm
+	dev-lang/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}"-{convert-length,perl_name,extract-major-version-2,destdir}.patch
+	"${DISTDIR}/${PN}"-match-multiline.patch.bz2 )
+
+src_prepare() {
+	base_src_prepare
+
+	# Dont install old url.sty and other files
+	# Bug #240980
+	rm -f texinputs/url.sty texinputs/latin9.def || die "failed to remove duplicate latex files"
+
+	sed -ie 's%@PERL@%'"${EPREFIX}"'/usr/bin/perl%g' wrapper/unix.pin || die
+}
+
+src_configure() {
+	local myconf
+
+	use gif || use png || myconf="${myconf} --disable-images"
+
+	econf --libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--enable-pk \
+		--enable-eps \
+		--enable-reverse \
+		--enable-pipes \
+		--enable-paths \
+		--enable-wrapper \
+		--with-texpath="${EPREFIX}"/usr/share/texmf-site/tex/latex/html \
+		--without-mktexlsr \
+		$(use_enable gif) \
+		$(use_enable png) \
+		${myconf} || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc BUGS Changes FAQ LICENSE.orig MANIFEST README* TODO
+
+	# make /usr/share/latex2html sticky
+	keepdir /usr/share/latex2html
+
+	# clean the perl scripts up to remove references to the sandbox
+	einfo "fixing sandbox references"
+	# pstoimg isn't built unless gif or png useflags are enabled
+	{ use png || use gif ; } && sed -i -e "s:${T}:/tmp:g" "${ED}/usr/$(get_libdir)/latex2html/pstoimg.pl"
+	sed -i -e "s:${S}::g" "${ED}/usr/$(get_libdir)/latex2html/latex2html.pl" || die
+	sed -i -e "s:${T}:/tmp:g" "${ED}/usr/$(get_libdir)/latex2html/cfgcache.pm" || die
+	sed -i -e "s:${T}:/tmp:g" "${ED}/usr/$(get_libdir)/latex2html/l2hconf.pm" || die
+}
+
+pkg_postinst() {
+	einfo "Running ${EROOT}usr/bin/mktexlsr to rebuild ls-R database...."
+	"${EROOT}"usr/bin/mktexlsr
+}
+
+pkg_postrm() {
+	einfo "Running ${EROOT}usr/bin/mktexlsr to rebuild ls-R database...."
+	"${EROOT}"usr/bin/mktexlsr
+}
diff --git a/dev-tex/latex2html/latex2html-2008.ebuild b/dev-tex/latex2html/latex2html-2008.ebuild
new file mode 100644
index 000000000000..0dff1b0e4144
--- /dev/null
+++ b/dev-tex/latex2html/latex2html-2008.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils multilib
+
+DESCRIPTION="convertor written in Perl that converts LATEX documents to HTML"
+SRC_URI="http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/${P}.tar.gz"
+HOMEPAGE="http://www.latex2html.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="gif png"
+
+DEPEND="app-text/ghostscript-gpl
+	virtual/latex-base
+	media-libs/netpbm
+	dev-lang/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-convert-length.patch"
+	epatch "${FILESDIR}/${PN}-perl_name.patch"
+	epatch "${FILESDIR}/${PN}-extract-major-version.patch"
+	epatch "${FILESDIR}/${PN}-destdir.patch"
+	# Dont install old url.sty and other files
+	# Bug #240980
+	rm -f texinputs/url.sty texinputs/latin9.def || die "failed to remove duplicate latex files"
+}
+
+src_compile() {
+	local myconf
+
+	use gif || use png || myconf="${myconf} --disable-images"
+
+	econf --libdir=/usr/$(get_libdir)/latex2html \
+		--shlibdir=/usr/$(get_libdir)/latex2html \
+		--enable-pk \
+		--enable-eps \
+		--enable-reverse \
+		--enable-pipes \
+		--enable-paths \
+		--enable-wrapper \
+		--with-texpath=/usr/share/texmf-site/tex/latex/html \
+		--without-mktexlsr \
+		$(use_enable gif) \
+		$(use_enable png) \
+		${myconf} || die "econf failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc BUGS Changes FAQ LICENSE.orig MANIFEST README* TODO
+
+	# make /usr/share/latex2html sticky
+	keepdir /usr/share/latex2html
+
+	# clean the perl scripts up to remove references to the sandbox
+	einfo "fixing sandbox references"
+	# pstoimg isn't built unless gif or png useflags are enabled
+	{ use png || use gif ; } && dosed "s:${T}:/tmp:g" /usr/$(get_libdir)/latex2html/pstoimg.pl
+	dosed "s:${S}::g" /usr/$(get_libdir)/latex2html/latex2html.pl
+	dosed "s:${T}:/tmp:g" /usr/$(get_libdir)/latex2html/cfgcache.pm
+	dosed "s:${T}:/tmp:g" /usr/$(get_libdir)/latex2html/l2hconf.pm
+}
+
+pkg_postinst() {
+	einfo "Running ${ROOT}usr/bin/mktexlsr to rebuild ls-R database...."
+	"${ROOT}"usr/bin/mktexlsr
+}
+
+pkg_postrm() {
+	einfo "Running ${ROOT}usr/bin/mktexlsr to rebuild ls-R database...."
+	"${ROOT}"usr/bin/mktexlsr
+}
diff --git a/dev-tex/latex2html/latex2html-2015.ebuild b/dev-tex/latex2html/latex2html-2015.ebuild
new file mode 100644
index 000000000000..3afdc49f077c
--- /dev/null
+++ b/dev-tex/latex2html/latex2html-2015.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
+HOMEPAGE="http://www.latex2html.org/"
+SRC_URI="http://mirrors.ctan.org/support/latex2html/latex2html-2015.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="gif png"
+
+DEPEND="app-text/ghostscript-gpl
+	virtual/latex-base
+	media-libs/netpbm
+	dev-lang/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng:0 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}"-{convert-length,perl_name,extract-major-version-2,destdir}.patch )
+
+src_prepare() {
+	default
+
+	# Dont install old url.sty and other files
+	# Bug #240980
+	rm texinputs/url.sty texinputs/latin9.def \
+		|| die "failed to remove duplicate latex files"
+
+	sed -i -e 's%@PERL@%'"${EPREFIX}"'/usr/bin/perl%g' wrapper/unix.pin || die
+}
+
+src_configure() {
+	local myconf
+
+	use gif || use png || myconf="${myconf} --disable-images"
+
+	econf --libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--enable-pk \
+		--enable-eps \
+		--enable-reverse \
+		--enable-pipes \
+		--enable-paths \
+		--enable-wrapper \
+		--with-texpath="${EPREFIX}"/usr/share/texmf-site/tex/latex/html \
+		--without-mktexlsr \
+		$(use_enable gif) \
+		$(use_enable png) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# make /usr/share/latex2html sticky
+	keepdir /usr/share/latex2html
+
+	# clean the perl scripts up to remove references to the sandbox
+	local dir="${ED}/usr/$(get_libdir)/latex2html"
+	if use png || use gif; then
+		# pstoimg isn't built unless gif or png useflags are enabled
+		sed -i -e "s:${T}:/tmp:g" "${dir}"/pstoimg.pl || die
+	fi
+	sed -i -e "s:${S}::g" "${dir}"/latex2html.pl || die
+	sed -i -e "s:${T}:/tmp:g" "${dir}"/cfgcache.pm || die
+	sed -i -e "s:${T}:/tmp:g" "${dir}"/l2hconf.pm || die
+
+	dodoc BUGS Changes FAQ MANIFEST README TODO
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/mktexlsr
+}
+
+pkg_postrm() {
+	"${EROOT}"/usr/bin/mktexlsr
+}
diff --git a/dev-tex/latex2html/latex2html-2017.2-r1.ebuild b/dev-tex/latex2html/latex2html-2017.2-r1.ebuild
new file mode 100644
index 000000000000..ff150f6a652d
--- /dev/null
+++ b/dev-tex/latex2html/latex2html-2017.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
+HOMEPAGE="http://www.latex2html.org/"
+SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="gif png"
+
+DEPEND="app-text/ghostscript-gpl
+	virtual/latex-base
+	media-libs/netpbm
+	dev-lang/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng:0 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-{destdir,tests}.patch
+	"${FILESDIR}/${P}"-dotinc.patch
+	"${FILESDIR}/${P}"-dotinc-2.patch
+	"${FILESDIR}/${P}"-brace.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's%@PERL@%'"${EPREFIX}"'/usr/bin/perl%g' wrapper/unix.pin || die
+}
+
+src_configure() {
+	local myconf
+
+	use gif || use png || myconf="${myconf} --disable-images"
+
+	econf --libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--enable-pk \
+		--enable-eps \
+		--enable-reverse \
+		--enable-pipes \
+		--enable-paths \
+		--enable-wrapper \
+		--with-texpath="${EPREFIX}"/usr/share/texmf-site/tex/latex/html \
+		--without-mktexlsr \
+		$(use_enable gif) \
+		$(use_enable png) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# make /usr/share/latex2html sticky
+	keepdir /usr/share/latex2html
+
+	# clean the perl scripts up to remove references to the sandbox
+	local dir="${ED}/usr/$(get_libdir)/latex2html"
+	if use png || use gif; then
+		# pstoimg isn't built unless gif or png useflags are enabled
+		sed -i -e "s:${T}:/tmp:g" "${dir}"/pstoimg.pl || die
+	fi
+	sed -i -e "s:${S}::g" "${dir}"/latex2html.pl || die
+	sed -i -e "s:${T}:/tmp:g" "${dir}"/cfgcache.pm || die
+	sed -i -e "s:${T}:/tmp:g" "${dir}"/l2hconf.pm || die
+
+	dodoc BUGS Changes FAQ MANIFEST README.md TODO
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/mktexlsr
+}
+
+pkg_postrm() {
+	"${EROOT}"/usr/bin/mktexlsr
+}
diff --git a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
new file mode 100644
index 000000000000..68f635740cb5
--- /dev/null
+++ b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML"
+HOMEPAGE="http://www.latex2html.org/"
+SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="gif png"
+
+DEPEND="app-text/ghostscript-gpl
+	virtual/latex-base
+	media-libs/netpbm
+	dev-lang/perl
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng:0 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-{destdir,tests}.patch
+	"${FILESDIR}/${P}"-dotinc.patch
+	"${FILESDIR}/${P}"-dotinc-2.patch
+	"${FILESDIR}/${P}"-brace.patch
+	"${FILESDIR}/${P}"-brace-2.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's%@PERL@%'"${EPREFIX}"'/usr/bin/perl%g' wrapper/unix.pin || die
+}
+
+src_configure() {
+	local myconf
+
+	use gif || use png || myconf="${myconf} --disable-images"
+
+	econf --libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \
+		--enable-pk \
+		--enable-eps \
+		--enable-reverse \
+		--enable-pipes \
+		--enable-paths \
+		--enable-wrapper \
+		--with-texpath="${EPREFIX}"/usr/share/texmf-site/tex/latex/html \
+		--without-mktexlsr \
+		$(use_enable gif) \
+		$(use_enable png) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# make /usr/share/latex2html sticky
+	keepdir /usr/share/latex2html
+
+	# clean the perl scripts up to remove references to the sandbox
+	local dir="${ED}/usr/$(get_libdir)/latex2html"
+	if use png || use gif; then
+		# pstoimg isn't built unless gif or png useflags are enabled
+		sed -i -e "s:${T}:/tmp:g" "${dir}"/pstoimg.pl || die
+	fi
+	sed -i -e "s:${S}::g" "${dir}"/latex2html.pl || die
+	sed -i -e "s:${T}:/tmp:g" "${dir}"/cfgcache.pm || die
+	sed -i -e "s:${T}:/tmp:g" "${dir}"/l2hconf.pm || die
+
+	dodoc BUGS Changes FAQ MANIFEST README.md TODO
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/mktexlsr
+}
+
+pkg_postrm() {
+	"${EROOT}"/usr/bin/mktexlsr
+}
diff --git a/dev-tex/latex2html/metadata.xml b/dev-tex/latex2html/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/dev-tex/latex2html/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>