gentoo resync : 10.04.2018

13 files changed, 18 insertions, 41 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 0daeee3070ab..4aacc85fb677 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/elisp-manual/Manifest b/app-doc/elisp-manual/Manifest
index 0b52a8ebc565..b224546077dd 100644
--- a/app-doc/elisp-manual/Manifest
+++ b/app-doc/elisp-manual/Manifest
@@ -21,5 +21,5 @@ EBUILD elisp-manual-21.2.8-r2.ebuild 705 BLAKE2B e1b2edfa5ff611dddac3f597f45518f
 EBUILD elisp-manual-22.2.9.ebuild 632 BLAKE2B 486878c6e41d64774a184f9b7d43c205472239672b72316f422923cc84f643839a4042fd8d1a79675cc4a9e236fae0fb1138d0d13da632dfc7c9a3c8e6a33e76 SHA512 3fd5bc800c02308953ec8e61b8ae849bac320782bd084ab381c5105c156eee1b9cbf9e340cbb1608c08587c70c3ec80f057c6b2435e407b3f429c24f8c21ee64
 EBUILD elisp-manual-23.4.ebuild 670 BLAKE2B 35f9fff50ddf9bb6b1cb8f64625e251429da22ffbf5f2d3296bdf187b87c0eee9bfa72fe9400c5647a497812ea80ed8638920c9aa811baad8b3179220d47d531 SHA512 3a9c5d2328d57c5f1a902a71e26d95bebef0614ce4075f6cf9066fad517055a20631f9ae357d15a4d0f346e7c7382c6672cabb2d10f47ab46c2e22e3f5120eb3
 EBUILD elisp-manual-24.5.ebuild 677 BLAKE2B 1a66c98cdbc64424360013263b4d292c1910d836322043e4edbc3e8361e8638513c2f0772e15067109062214a9f5ab463041d438c83c5be633d6c8c201290b56 SHA512 c8baf1b57f363eff805bf1b2e16fb26f6d4f873336ab5a257db5033bf46a3e2bd7f60a4e72db25faa9f4e39ddca4ed443522207c847eac8432f1ff6abd255549
-EBUILD elisp-manual-25.3.ebuild 642 BLAKE2B 9566d254450c61143e68424be2992b2dae89c78e362553f09bb66d184bddf46c71d0d3da27b8cf6b6edb0dc208d2def3d26d75ffd12b5a9495a1c560c5446665 SHA512 90a0fe18f8c01c2df80f70a1866ec8a12fb84c9e77887c9fdb67bf5fa3b0d0bee3cc195a04fb80d713000f049b9029cd4db901fee50c519a3c2d6802801972ef
+EBUILD elisp-manual-25.3.ebuild 639 BLAKE2B c59a535490e5388afe75ede1f3cc2daa4e0e74dad9ccfe2bead749d85bd960b88eca76f7bf366875c03d466c61758bcd93050afdfe4ff324715f5330e1b9b762 SHA512 ec9898aa21ee08d854bc2a41a464c9eca0cdd95067970e008ee6e514137b6673b1ad88ad0107d75e5901931ae9e33b80f4de94532a727fe2ade50100ef6af784
 MISC metadata.xml 1449 BLAKE2B 11f3b34d702faf8a9e9fca1d1538cbc3b79460da8611aa304bb15fff5f30c0de336cbe3d5abe9b1b8477b9fad29c182021de50427d2f8a31ceb1af23ff9de5a2 SHA512 25d8f591e4cfc53cd164d9e9af9a8866abf3b4a7bbbc6d6d102dd506469ea0b6bbde02ed9f8ce34a8aaa3f32de7dc614fb9c82f49224406952c31e6f96db8baa
diff --git a/app-doc/elisp-manual/elisp-manual-25.3.ebuild b/app-doc/elisp-manual/elisp-manual-25.3.ebuild
index 348832c80cfb..10e056f739c7 100644
--- a/app-doc/elisp-manual/elisp-manual-25.3.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-25.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="FDL-1.3+"
 SLOT="25"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index fa039c39f11a..b45a8d75ad98 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -13,5 +13,5 @@ DIST gimp-help-2.6.1-html-sv.tar.bz2 29462846 BLAKE2B d09f9a682dc787dc50300304dd
 DIST gimp-help-2.6.1-html-zh_CN.tar.bz2 28735285 BLAKE2B 7101fd5e627b7a145ec5e798ccda3928e179b8bf9f3c7dcdaa6f6d09a463d98fedf148ad6ef8ee8fcab2622f73977cd0d282b149a7e6f66fb260b1dac898bea2 SHA512 daa6fd365c04c3dc78c1955301f0544ec67e17ff156e6e10d6cad959b9a1121a976feff29e30008809bc1beb1b4868474c40e36a76ea45410e3b7f5aed719055
 DIST gimp-help-2.8.2.tar.bz2 158504580 BLAKE2B d0023a4290879f97e3365f1208427997d1facc09a7ed4ac0a274615e9eff378c9a4da0d7c5190bc24ad27c2b03d6c513003297d835562b0fa3e02685443d15e9 SHA512 3afdaa8b2f005d939d039d2e22c8306145e7b7acaca5ef89279998e87931e99d1fe607f1337f7796d667d5c6be456ba976b3c8a937c9dd6b1888d7158cfbed67
 EBUILD gimp-help-2.6.1.ebuild 1124 BLAKE2B 81416c800dcb51aba671c4147705f556f684e1d2c9e7749998bea03f4180c3e28276f6f56a10df3e841dd98cf1988d87326aa2bdac43d7bfd7ebcd95c13f4ba1 SHA512 03c462159902e32f21ae5cb0ab335a1cccf993918954dafe4d96cdb87487915b7e18946bdad816f1fc984e8d5859a874bbea84d7f40a2f46c0c4b01d664cd3ce
-EBUILD gimp-help-2.8.2.ebuild 514 BLAKE2B 1ab73341f4a049a2be9bae439935fd1f8fc941d327f7896ade2deb25b3993956677944e4d3d29061faea1b23b1f186a01533455fd6e7e71a5f49e69f68535374 SHA512 bb9f2fa7e0bb3b20168789e5b840432809acbe6c6a30980b8ac82fae774f8488ce4e35d10ba0419d2d7d2baf371f0c59df7063b6f838dec9e6647be039b7a232
+EBUILD gimp-help-2.8.2.ebuild 579 BLAKE2B 2f6b8e7ac63cf7cdc5365a7407750da90d07aca990fcb78383f3cf7b5973ce27fded2721de5f0d745b781c9e43783a9965f56a983acde08685aba852c1c2514f SHA512 bc290200654692905c1fd83451c27fbddf497c58c9c59a6a44eef237cf3d696710638beb9bdedbdbad7496af7534b90e06d1d083d713e9709fc0d1925c4d37b0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-doc/gimp-help/gimp-help-2.8.2.ebuild b/app-doc/gimp-help/gimp-help-2.8.2.ebuild
index 1a1cf12f05f8..f1d6c10a7645 100644
--- a/app-doc/gimp-help/gimp-help-2.8.2.ebuild
+++ b/app-doc/gimp-help/gimp-help-2.8.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1
@@ -16,6 +16,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
 	dev-libs/libxslt
 	sys-devel/gettext
 "
diff --git a/app-doc/jargon/Manifest b/app-doc/jargon/Manifest
index 59a7f94944bb..6f0b6329488c 100644
--- a/app-doc/jargon/Manifest
+++ b/app-doc/jargon/Manifest
@@ -1,4 +1,3 @@
 DIST jargon-4.4.7.tar.gz 9061260 BLAKE2B f2e29464d0ed946a5a2f0529eba3110f55ae068796522c05402ff2addc626501a43cbc633aecee15d6289e7a5236ce196f065ab782e4686142c51ba21658b517 SHA512 afc8c44994f22de3fbae325e315fa101c04a5db2ef6af7c5592b4c072cc0e94a2bc523042ab9c894977c34f8321aea77c8208ae57040a4e3419cd240ce169803
 EBUILD jargon-4.4.7-r1.ebuild 597 BLAKE2B 95c8e31e573e5a7f590f153b160e16b2bfb26c61e6bd16fbf12532a3ee1a86dffa4b576023ba13ae2ea805e4da3624c36c8b5cd92178f409c9a5ce5e9a1c3387 SHA512 ab2ce7706e6c8917e34eb89c1dd8d33fc17d8f9bc61e0ad002afc9d894782e2494dee40c42e5468eff531458b81c0d5f40f682958f9eee630220d4788f875683
-EBUILD jargon-4.4.7.ebuild 602 BLAKE2B 977b6df3fd38534acc879fcb567d3488a88a3c344eca8b4517636a767b346cba46b64203bcf63d69a18dcee6a159897ee34543bbb2458d6a6f597dddefbdfd8e SHA512 ef9f1e5cee8130882ae2c02bb0af1245c2e2ae1d89c20ac6d726249d254d686e36bf560cf2e99ea5c4e98fbbd25baa45c57c9470c4a9ebdd9200712cf2600204
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-doc/jargon/jargon-4.4.7.ebuild b/app-doc/jargon/jargon-4.4.7.ebuild
deleted file mode 100644
index 0baec49580b1..000000000000
--- a/app-doc/jargon/jargon-4.4.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="A compendium of hacker slang illuminating many aspects of hackish tradition"
-HOMEPAGE="http://www.catb.org/~esr/jargon"
-SRC_URI="http://www.catb.org/~esr/jargon/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	find "${S}" -name .xvpics | xargs rm -rf
-	cd "${S}/html"
-	sed -i -e 's#\.\./\.\.#..#' */* \
-		|| die "sed failed"
-}
-
-src_install() {
-	dohtml -r html/* || die "dohtml failed"
-}
diff --git a/app-doc/mkdoxy/Manifest b/app-doc/mkdoxy/Manifest
index 2380fce8ddc3..eaa7d32370ea 100644
--- a/app-doc/mkdoxy/Manifest
+++ b/app-doc/mkdoxy/Manifest
@@ -1,4 +1,4 @@
 DIST mkdoxy-1.0.0.tar.gz 11109 BLAKE2B 348d62a189d2f79432eafb65824b90bf0a3f82fab3621edcdc9fc04859b1a901cb71fd05773aee57431559bbc7a1055668fe710e719a6a8fa86a987b2c8d64e2 SHA512 0d40282da6b15cdbfe10e41549acc48241e6732519025e93f38d5d76c93ff180b41cc458fc8dbad4ab81bc28a96e4801c15577d39496392a05e743e581d19241
-EBUILD mkdoxy-1.0.0-r1.ebuild 551 BLAKE2B 4576ad556b9c43daacd807ddf07c2738ab8df33fccab363995ffc7e6b78b85726b9b3a97feb9a667e27a7e044f23e1de196bf540216472a1e27e75e3df46933b SHA512 60f2b1eb9b5cda96c93c9dbcf387b66818846a85297bded549a974d4414d701cb20213385e74707bd7757d2990902831c8f7f154e39153a6e682da9cb1806297
+EBUILD mkdoxy-1.0.0-r1.ebuild 550 BLAKE2B 8679eedfb72fb7aa57714342c93b728b02201bfc1123fbcc5c5b97ee25627ad5a35ef43e113916a250513958cddaebf630df1b6d8af25d3ca416ec37ffb5e1b0 SHA512 ca50e1e211449e016b399e7a490f94794254fee2e62306fb121978a4f0c308ae9db5027b8b7a8b64e428595db2e0db304342e2c72b7dd2c589c5fdbf12b21240
 EBUILD mkdoxy-1.0.0.ebuild 517 BLAKE2B b9b87a6bc2188d834715670135e6799cbf2fcfd34c618752b4372b1dbe9bdb421bc8adf7f7877fa1ccc761c1c3e7ac240bf7d0633ec78e24d29533b039788eed SHA512 b16cb09cdaa4d5f49c9791b573bb789674dc003c93796517b2084ae391a3d0eae5a29ebd87fc5e2267da3d45c89cfaa9a7c2e22ec6dc92ce6147232e55cbce81
 MISC metadata.xml 353 BLAKE2B 0433be5fd165f3af420f9f1fe357b7ea3edb785662dfcf3c4a47fbfdf7134ad82b733bd6d54ca5c9bb9640fcdd35e0a0b94634071dfe6ffc50018e0f05477d38 SHA512 aaf9f25dbd03b04756347b66753434800e575c2c9e63ebbbd58602c7a67929498db6b9ff4c3b50ff1031f49438c48cdf88d61169e00bd09b2b6510a68666ae83
diff --git a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild b/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
index da5050b66f12..98ce30fe0328 100644
--- a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
+++ b/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 3e09fe72b1f6..966d7e2f0343 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -2,7 +2,7 @@ DIST pms-5-prebuilt.tar.xz 540244 BLAKE2B 06fbfd4cbf9968fbe19d1960687f226c87b2a1
 DIST pms-5.tar.xz 50284 BLAKE2B ecf3c34d79aa1439e0f0f4bca540b673440db04a7f533f103f5956f6a27e994ee42836ae2871c11fadf9230e2b5973d3d1db9e17167f886a6c929e533ece4d45 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e
 DIST pms-6_p20170429-prebuilt.tar.xz 514544 BLAKE2B 34f5dc9a65c9a0bcc8b6ea7c9c1e65e1fb9480b6b147f17880242aeb11e44641d4b5d59cd1ee179e3c51102af2075e28445dc8ea5cda1211d483c37007a60407 SHA512 92fd048c9e1fdf3d326d906c9d68e08bb9dae5b784117d112f24bb4131aef3f8e843cf096157e0c4eaed0d2d48e7e3bfc060ea205b04c9da0e8cbcc94b74619d
 DIST pms-6_p20170429.tar.xz 53584 BLAKE2B 3c9b7445fdd7c0a0ed2b5b6f29dd645090f0fda63f864b536e88ed5d2e0cf27bfd621da1480a576d999b1ad0b80b19ac011a5a984e8b6d24c8f7db7f68aeaa75 SHA512 b4d5eb85d1823d2c80348aa82686fcbf0ba06b19de046b722d0318e846ba6d9bbd0c810b6fe06e7d4eafd8933a1b1d2d04b041fcc35fd2496feca9c987323a5b
-EBUILD pms-5_p20120920.ebuild 1466 BLAKE2B 700a3bc9defb535677c09a07253699b478621bfa059b7615ee1dd27591e04cc53ac0b1208a07b85cdf898efde3ca931d5590f4819be3f053c6e7a37e13c02518 SHA512 9d33496e8f7329c80d55e024a4cb0408487d2628eae95c2f8769478fc4b1fed465e4b8b30b46c4ca05a93d6a1fd7229620d73f3c4472b30efb383b633172b473
-EBUILD pms-6_p20170429.ebuild 1597 BLAKE2B 53a85166c6b73693c1269206691c1d5894c18852f1cd54c8e79def58c1e576ac9b0bc569f382f6661f2e8cd85d4702595db5462ec080683dbb1da88d0a98bf41 SHA512 f3536cd222e766fcc64910e103006a5b0ad8864108f7f0594ff26e400b37f744eb3f71c61a83e640dee5126478422563f038318ca21535d58ed270f28b76569a
-EBUILD pms-9999.ebuild 1069 BLAKE2B 52eebdd75d9e2ad8b76d9a3eab012366c0937e177e370148eef165b40a8cef3929781f18ff6fea0efc5582412425d5bb2fd6bcf66e1d608d4285ffe6906c53a6 SHA512 0d66fd71be681b73b6e9fb2a96716e1cdc03bc310efc4aadfa317a0bf2801d34bdd870c6a5f371f86c9d14ef7456e5e2fb32d5bbd47beb61083185a19bde2b34
+EBUILD pms-5_p20120920.ebuild 1431 BLAKE2B a8d550d0e1f219e1522b3cf82d0f65a89cc4353bb2527b6f87610e65e4da2fb030af13f8068deb4953f25da313c942c5d0ceb0d20dacb1110dbbfeaacc0a8c84 SHA512 ee55f1d56d587673f61518b30d83d3ba001d96fa7c8e79d9098275fb4775af477584ef4425f11c87b085066831be76ac927fecc61f61b8359fb6b38d0135c40b
+EBUILD pms-6_p20170429.ebuild 1562 BLAKE2B c6594596b0042485d7ce7d28f08b6f51bb1170ea9467a99c7ebe662ccc350cd0aed7da6614811a51565e77c2a5caef4b63f9ee762cf06c32e7e4f72e8ec9e29f SHA512 e25693191ac750ff5fc9d2e1ad05278f76a1fb5d8e0537a944e93500cfd816a5d2f89bc3a3d1d2f34670fa9135f15057d3fdd9cac5830962044aadec6080133f
+EBUILD pms-9999.ebuild 1034 BLAKE2B b2c80b80862162d117cc28d44e3dc4ffcca74d6dd0a6d521da87c4a3e6b7179bb85b372dadd2513975def03bdf859b9bf1dc7c87bf7e2e9ecdcdb80f87f21921 SHA512 6131ade0e7424b9736e7efa12856e47cfbf237b4bc372f31dbbe08a72b9f2eea84ef2db6f72c051ad5f72997dcdf4f5989e600b18d85075aa39b9bef28005b6d
 MISC metadata.xml 495 BLAKE2B 5792a9b2db15b671aba18a6ceb77cda04e4e83ceb5ef3ac130a8180803ebad25d99c3d3bdef32bfa1f0ba9186a3b27f5110e6dc172800f75aaa177b017c738c1 SHA512 11e0668a058130a9d62d28cdd70998b1bdc21722a600d87cc76b34882eae2c82d066955fd30fed77471a7078dc2a9181483ab832549d9be4d9060f63c18820ce
diff --git a/app-doc/pms/pms-5_p20120920.ebuild b/app-doc/pms/pms-5_p20120920.ebuild
index c4359f0fc50b..c0423cf526ca 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ DEPEND="!binary? (
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-latexrecommended
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
+		dev-texlive/texlive-mathscience
 		html? (
 			app-text/recode
 			>=dev-tex/tex4ht-20090115_p0029
diff --git a/app-doc/pms/pms-6_p20170429.ebuild b/app-doc/pms/pms-6_p20170429.ebuild
index 3af573aff2d0..144782bd4117 100644
--- a/app-doc/pms/pms-6_p20170429.ebuild
+++ b/app-doc/pms/pms-6_p20170429.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ DEPEND="!binary? (
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-latexrecommended
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
+		dev-texlive/texlive-mathscience
 		html? (
 			app-text/recode
 			>=dev-tex/tex4ht-20090611_p1038-r5
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index a33e690ba3d5..646fc972ca1d 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ DEPEND="dev-tex/leaflet
 	dev-texlive/texlive-latex
 	dev-texlive/texlive-latexextra
 	dev-texlive/texlive-latexrecommended
-	|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
+	dev-texlive/texlive-mathscience
 	html? (
 		app-text/recode
 		>=dev-tex/tex4ht-20090611_p1038-r5