7 files changed, 22 insertions, 19 deletions
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 75a2e5e53520..41560dd8cac8 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/csindex/Manifest b/dev-tex/csindex/Manifest
index 74b85a8e0763..73e9b814b944 100644
--- a/dev-tex/csindex/Manifest
+++ b/dev-tex/csindex/Manifest
@@ -1,5 +1,5 @@
 AUX csindex-2.11c-decl.patch 711 BLAKE2B 77fd9a81fe88ce1d219cf9759f5371ddba5a7c5347c8877a37e21b828b98ed170c513216498555c0738128a24b7e9311994055e8c2504c301aa07e6a8460f83a SHA512 f17aae7a3b22c230671bec969349b2e610eee69d521167f705eabf78bd242b50afe128d1da355d6f22ae8ad096980c6b1cbb942ce56afc9556f9c645701cd1a7
 AUX csindex-2.11c-flags.patch 432 BLAKE2B 53cadff28ba66eacea704898788f9310ec062d0a398e0ef33182483cfbe860abd4bc42ea70505de0820c11efc46e88da0d200e8a74057fdbefde388976c31619 SHA512 af1be473ead18034b221d8eb3aa05067e1f8f8cb12d10ee4c3434b2a2fbe1f85bbb9268b938b3541ae66e44e12ea7c1aabd8518a91ee0100097013957e906067
 DIST csindex-19980713.tar.gz 31778 BLAKE2B 0ad638dc79a4a5bdba43803572fdc049bbf4bc519d682cd73f0d007fd5063f1c2e476f6afd7a75d0fa7cec3c0a66c4c8759001101ea14470bb79e3023d6ea621 SHA512 ab4d35c84272aa64f9613023412cf8fb8d0b565ffd1fe61b397f82911b6ff7c230c4f54ff44aa0ea5a512229e7ee9410a9257c3fc7ee1d0ba267151ab1704130
-EBUILD csindex-2.11c-r1.ebuild 671 BLAKE2B 8180ac6242288907fd2af717a99c1ab263df5f06c6cebe2b14242f489c62178dd25947f9531e4ab0a048044ebe11284b1fd86329607a2c26790507d880a184e8 SHA512 380e067ec106dcc60c09e122ad08a33abf877e860e7ab91121fd53ce311c71f5bc064ec51f4da0189f7d9dd8cd5c1035feabaeb5dd274dc075a97b2d7490c6d5
+EBUILD csindex-2.11c-r2.ebuild 620 BLAKE2B 3e8f2a210bf1c37b50d2c7c40327851677cc3b8b2353db634426610c3f6178b2e109391b59912b72a7fe426b052f2c59f817057308918fe178a601be2cd20204 SHA512 0ce146dd978ed4da6e0efbc6c5a8b61aab802e35d4b9c17fbf8fbfc5c6ddfd8c86163277019942f4ba2d7b3dcbca86aedb10d92447337abd67c5a418fcebbc00
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/csindex/csindex-2.11c-r1.ebuild b/dev-tex/csindex/csindex-2.11c-r2.ebuild
index 7f4f09bbeba0..5c8b4110b8ac 100644
--- a/dev-tex/csindex/csindex-2.11c-r1.ebuild
+++ b/dev-tex/csindex/csindex-2.11c-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 MY_P="${PN}-19980713"
 
@@ -21,16 +21,16 @@ RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-flags.patch" \
-		"${FILESDIR}/${P}-decl.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}/${P}-decl.patch"
+)
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "make failed"
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	dobin csindex || die
+	dobin csindex
 	dodoc README
 }
diff --git a/dev-tex/feynmf/Manifest b/dev-tex/feynmf/Manifest
index d6adfc4b80ce..91ab97b4a321 100644
--- a/dev-tex/feynmf/Manifest
+++ b/dev-tex/feynmf/Manifest
@@ -2,5 +2,5 @@ AUX feynmf-1.08-tempfile.patch 1138 BLAKE2B e74751683497aad6d485d0df43c570006961
 AUX feynmf-1.08.patch 305 BLAKE2B e4de6f6ec120f57232eed6b8034436e15198893645c03235d3e13d0d4fe995cf50d5a8e9038841e87b186e1d0d8e41103bef1776b1440f6a817d95e458645fd7 SHA512 3a85fb8a132be9d7c465953345d4d4374192f2341a90dd9f89ab65a3999c7de76fe92019af533edacc4353b85805a0af2749687d304c06080a1a5ff7ce5613a3
 DIST feynmf-1.08.tar.gz 286208 BLAKE2B a6de553a9624d3e4a1c5aa3f0759bdfbbf449d45477929fee4cbca6ad43dae0d3e835368dac9d9aab80145fedaa78fa9cedabcb5258c956af8daa31f05fe78c3 SHA512 968853ef09ab140fa0844068e564995b44bd79bbe5376a7b866d6db80278b2099aab47920213c7f744d5558e10e69a6de8e056f4d35c8d0fe51055a17981cad2
 DIST feynmf-cnl.tar.gz 49920 BLAKE2B 61624bbfb51edbd28fce3fdadaa56023d540804e3cd314f7aad857803399013921e0c766f7976e79c9989200cc30449197254d180b4e34e5d6ad37822c53c616 SHA512 ba84d284a6157bd1fce6fd1752a006472631bd8628d9c7b0cd9f429e7d3f5c79a7489c43d9db76232987cbe8de01a794d060095dbcbffbd003189ff002493201
-EBUILD feynmf-1.08-r5.ebuild 1772 BLAKE2B 9a9f31b33bb30c956c76d0492a49292938ea05f67017893c50a4320abd551e1f62c2369e57557b1f497f26a64bf91e8272ca7128e89cbee38e5af58bf797eab3 SHA512 65256b8bcb54d0bb7e9ffb4cb77452bcde790c319cd74b0ad07e2b177a3907ee84b4047da843d63ac47846b3fb7f1d114bdee0b45f2f3afe576f225e895e563d
+EBUILD feynmf-1.08-r6.ebuild 1772 BLAKE2B cfa96bd3c39911069ee12e671b1a7a46f73841b2c00a0a83541ed494db33e01262d275685938479057477d2199e4886da1d6548753cf57415c9770adfe0b505b SHA512 e0e0b9e47db9746909188be3e7bdf7abd0d4eef558080a281bb79fdcaf1e71a4deda267d88d9ea4caa693c5a2720c5a28d859dfe6b7c515f9928f847a2452e02
 MISC metadata.xml 663 BLAKE2B 57db427b339c6c905c8b0df11126f49a3f791c299d37bc8c45526d7f79aa072cdfdaa97cee40f95fa636d37817081854f400c4d797fcbee3feee3eab64804ed1 SHA512 f9e4fd6f162e659326146eb4768a97940b0fd444de2883efa9f00d28f14ba88023f7e3bca7b42c98b6442fa6622a6a8fec6112215253e3f6ab982041603c9cba
diff --git a/dev-tex/feynmf/feynmf-1.08-r5.ebuild b/dev-tex/feynmf/feynmf-1.08-r6.ebuild
index 5656bfc5a5c9..a88c7c445f47 100644
--- a/dev-tex/feynmf/feynmf-1.08-r5.ebuild
+++ b/dev-tex/feynmf/feynmf-1.08-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils latex-package
+inherit latex-package
 
 DESCRIPTION="Combined LaTeX/Metafont package for drawing of Feynman diagrams"
 HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/feynmf/"
@@ -22,11 +22,14 @@ DEPEND="${RDEPEND}
 	doc? ( dev-texlive/texlive-bibtexextra )"
 
 S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${P}.patch
+	"${FILESDIR}"/${P}-tempfile.patch
+)
 
 src_prepare() {
 	rm -f phaip.bst				# use style from bibtexextra
-	epatch "${FILESDIR}/${P}.patch"
-	epatch "${FILESDIR}/${P}-tempfile.patch"
+	default
 }
 
 src_compile() {
diff --git a/dev-tex/floatflt/Manifest b/dev-tex/floatflt/Manifest
index 7deaeba1d912..97cb63888b82 100644
--- a/dev-tex/floatflt/Manifest
+++ b/dev-tex/floatflt/Manifest
@@ -1,3 +1,3 @@
 DIST floatflt-1.31a.zip 304735 BLAKE2B 60fe58f4e333adb175686eb58510408f50b0ce81b53618efc5c7b395cb0e61f4250c938f592b1cebaf48f9d4905c25bace344983ded1bb7841b4b401f2ff3b08 SHA512 f4e7b960daba37a06dbec47ab0432afa6738416ddea652f8f301609af950bd4f842671bd769de3f246f1cbb88df16299199e24e5965d7f76e160736787f7e9ce
-EBUILD floatflt-1.31a.ebuild 543 BLAKE2B 0ba2e9c81893aa95ce9f6187d6627ae79f71ac7af2483493dd243b5d0ee085f88e1e7bed626ac3379a7f93ab24b4c07b14aeac8b699f7bdf2ed0bc0ac9c64e60 SHA512 17ce50ca889ee161ed2b578b64fcae22febbc629582cbf080f54aad018f182d24c06de3305858dfee677c044ab69f8195f577f5bfecc55f1df507617d13e29a6
+EBUILD floatflt-1.31a-r1.ebuild 543 BLAKE2B 262f8a54fbb59645c5c09814592e11b14b6d5e764643fa7694421eb40852cd197ecd08e77ad3d3a530464e4b1f142ac932a64adadc31662f79fbc7a131fbfe81 SHA512 5c1bd4a27b265fafa7399430c11bcd242c8115e6e22a8bc4e75984b80b2368105d7de9a093532eec391d048b5985672a7d86833408f57fde9f1090afbe082ed2
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/floatflt/floatflt-1.31a.ebuild b/dev-tex/floatflt/floatflt-1.31a-r1.ebuild
index 337ba60b6396..e918c233a000 100644
--- a/dev-tex/floatflt/floatflt-1.31a.ebuild
+++ b/dev-tex/floatflt/floatflt-1.31a-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
 inherit latex-package