gentoo resync : 15.01.2020

49 files changed, 121 insertions, 121 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 8bb7c75b2dfc..58dcb3fa00a5 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 0508c01123df..b970a7465931 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -2,7 +2,7 @@ AUX 1056.patch 8628 BLAKE2B 435bd4f01c44142f91978603de0f276f6c16819325e48bda9a23
 AUX 2277.patch 645 BLAKE2B 0314dce1d9ec6b95e3ebfecb6253494e52b732fb27446f146b73bcc8a14ecdc767f434069563b6c6275dc25c591ac4ed422ff693669a28b3ddada29f88efffbc SHA512 f8502c83f05d6328e669e9e0d7d05e1216f59667829432ef4c558398ec39d0ee888479fc8e6387934604ca53477829a9f709565fa10a7aaadd4d455ca35b12c7
 DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
 DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
-EBUILD espresso-4.0.0-r1.ebuild 2802 BLAKE2B 7cd662c3f3674243ff797abbd96e60d57d1c7afde70f0966d1487e89ed7bfcb673aeaeee6f805531e5f15b393fc6c3cfb272125c11a1790019c2af870955ab35 SHA512 53748fc45fbf511330d07b7d99325152c721efa330b1aac14f60c42bc362812406ba6a4e27d3af1a6c008c5e50f7629dbdc1a29424ae787998ccc28b3533817c
-EBUILD espresso-4.0_pre20170228.ebuild 2866 BLAKE2B 477c649aa5a987a1c30981124db4736d42324b0cec86b83df4f5271672d425ad302dc76c74dcee08812aa24425e4f8cdbf9b256d8e9ddfe12c859aa9e1611309 SHA512 ef646b2fb4cc808019ac22c44ea57501244a9e3e4015fbd4467aa6bbd1f9879a6b8191d60c3d759d845361f16471a76666eb4904100af26e2b15396748eea839
-EBUILD espresso-9999.ebuild 2764 BLAKE2B 76f7b3ab9c059c53baea5c748f0125659205c2199aa42863ba31edb43a3b1fa18fabc9382c1e7223d9fc882e287d8f23d115574cc33ae53341c7a36fbce2c7e3 SHA512 d3775cdf64579c3ad16d6a16288544788769a14e57c03e5dc95da709d627feecb9a937add74ce294238c97b4916d1a9c4486e8e8913d483e85445967bd579612
+EBUILD espresso-4.0.0-r1.ebuild 2798 BLAKE2B f83fc3db16e7258d840c23c9382c39c4a6920d18d986d710a3eed415b68af85a3ca7eceaeebb5413c7b5c97a2c8cb4544a8db004383b354d42c4dc1262ae6d5c SHA512 246d1e811a8d8c01cdd8440294e55b9edcf9ba195a3c4e917b17121c44473a235b5624af90de6720e430c567fd772b5fd18123bd86a2597b9cda0205964f829f
+EBUILD espresso-4.0_pre20170228.ebuild 2862 BLAKE2B 49103a9d37bc1e07b2cdd0df253c6dd06ae2a231f4e6f040cb4a73ebb5a7766f353e72a5e96aae9f96072baa8510b76302a4bc8cbfa10251bcabddf5f46de6cd SHA512 0b3005103ea5c39ff249165f15589cb224800386519e20560c1408bfb4e06d8095d0aba663791b78fba524311178a7e98f3d01eff106dc3c6c2b49a69d6f1546
+EBUILD espresso-9999.ebuild 2760 BLAKE2B 1d29e586b90427286af27ede2106bb29563f03cb8bcadd90bc5cd47d5136d8f0382b3b56f3702208749264ab0228ced9cda3d855e2bd32db050b1064b6c6c375 SHA512 a15de69403497c597826bfff592d9172d53d574e1e4d03ed8dfade4e3e20a4c73fc81804506659441440ba05d6e00314f922b12627c5258604b929ebafa07482
 MISC metadata.xml 596 BLAKE2B e0c4b7e3c44d88c1487f6c88f68f696e3edd174427f525e3ef769c26b4a2333c9c1c128e00e786a12cf671b821d633a73537fe667543dbdfcad5f7fe0bfef2da SHA512 c87e4c2401fd1600e80b5a493d68a222bdaabca448bb81940273e23a2607b5631ab24d05e1b265dcdaacc6e4e4756f713165a45ab072e9880551e5d2b034a4a5
diff --git a/sci-physics/espresso/espresso-4.0.0-r1.ebuild b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
index 06b50f8c47eb..b969b400a5e5 100644
--- a/sci-physics/espresso/espresso-4.0.0-r1.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 1b693f4cca4d..4d969a356a2a 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 49d7e8f749e1..51c609793c31 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig
diff --git a/sci-physics/fastjet/Manifest b/sci-physics/fastjet/Manifest
index cab1cb351279..119346df244f 100644
--- a/sci-physics/fastjet/Manifest
+++ b/sci-physics/fastjet/Manifest
@@ -2,6 +2,6 @@ AUX fastjet-3.0.3-system-siscone.patch 4191 BLAKE2B 0de9757d64c735f49eabd836cd1e
 AUX fastjet-3.0.6-system-siscone.patch 3726 BLAKE2B b8fcd8b93631892b68b7d4584c3e456118fd66f80e12e39be3fc82f2f6dac3c52a3d2218c7e8f342166047aee385c9f12192777454be333b2a01b307bc67cdac SHA512 7522e3fd0fe789bc5b3172c2c26566136004b828a46a81fb0ec39bb6bedbf358efc0b51acab8cb19a40dd5b4138190f87655ddd2679cc91c819f5c7c9e9f4c57
 DIST fastjet-3.0.3.tar.gz 2240610 BLAKE2B 61c1957d3dc85f1d0e4b82ee899b8767997c79d56f29d1ce3b5af76c9e633db81dadb75bf2a6730f181b7791ee74f3be87f9b81844c3bd280a5d749584969576 SHA512 1fcdd0998d222ae089f10676ae1048fdce3e90f6aef3cd51463719b7ab26f8bcdd599d9521c6f9ef18e3989dbffd7f06da717ce845ab7e486a99433129b56f41
 DIST fastjet-3.0.6.tar.gz 2216501 BLAKE2B 1aacab5c91cb70d66035deddc4929d60c51444f6f23396f947d704f607d5f2267ccc5e09ec633d6e0ec1255b3a6bc7e51e4ea49c4cb06d0e3b6953b601ab76ee SHA512 1f01b7ed0e07bd94c88faa123f72c2e3bcd81ad32ab4d03dc0a18dd18635f3b18ba8d339176b0ef1d6e58cecd9f37aaea30b4ad909d2782ce5be7c11e205c3a5
-EBUILD fastjet-3.0.3-r1.ebuild 1236 BLAKE2B 681f11e14e5c10c68ccf28cd5289b2b3afae2ea6c877c02775d690dea14b247e7751a8afa0d1072fd7af66d6a3c7cb6a266decb892ef2fb0c7cf273ace195a69 SHA512 525a1a10764428f12d3fc6a0f89251f9d5396e5a1cd3252c15373d80466e605c59faedb8a20a0d280a4f2bc11e3d53cc58ebc11b7667089263efefd8e52c64b1
-EBUILD fastjet-3.0.6-r1.ebuild 1240 BLAKE2B 20cab9f7a8162d7f97c6a98a874919499c86cd4121f99ff9e6fd3e7fe52499712cd6a5fb9112d9de32ab2bb62173d0e33a5caec50880660c2e4f62d0a3cad69d SHA512 36b884732b7fcc2467cb383decdc285b8cc23802da1a000f6e7942a5faad5c32e36f9886847e4baabbc39c540042ebcdb7dbdc4fa916af9a68dd670974e7b33a
+EBUILD fastjet-3.0.3-r1.ebuild 1246 BLAKE2B b37b2c9f429560835aeb001f413eee042a378910eb9046a6e8803e16be5a8c414defe0a2452fe827dfe9b7fb15f0c96d4cb5c4df73f4a951a5e4d6dc2954f263 SHA512 53b06d48340068a58691d414fd2d05ea18f4db08a38c8e1407e5d27016320320be738bceac62028d7ee3f7fc80ed7026dfab9cdea771a28821468e65a56585dd
+EBUILD fastjet-3.0.6-r1.ebuild 1250 BLAKE2B 6a0e2442a88c70695191e59914629ed96b68019eda82fc7e44b0c6b49945cacb594c726e7d9dee656b96fa11dab9ae424242191875d4811732ae0637d1151d70 SHA512 6fc3a21f09f083be89ee0595361a691b6509ac0760b29b85e8b41a25eb58d49b916fc702baf6033e9ec6cd7835d9fc3fd74b8477e713f8dc8ebdc54173fe366c
 MISC metadata.xml 846 BLAKE2B 011aac1c331a66bf050ec977961ea2091f54dad9b15611c02c84210a460b791ff1862a9b210c4acc2ba7e8877e0fb8db735dbdb16d71b2e3aee0b918d6286e4a SHA512 7a785ebae9232cef55c62ada47e4ec87507b6e4c7115f928fa3260474e67f56db336f7698833fe995d4f046b7013c88f62faf71758a881a86c982fe60a92c40a
diff --git a/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild b/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild
index a17324679e4d..7d7adc653af9 100644
--- a/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild
+++ b/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit autotools-utils fortran-2 flag-o-matic
 
 DESCRIPTION="Fast implementation of several recombination jet algorithms"
 HOMEPAGE="http://www.fastjet.fr/"
-SRC_URI="${HOMEPAGE}/repo/${P}.tar.gz"
+SRC_URI="http://www.fastjet.fr/repo/${P}.tar.gz"
 
 LICENSE="GPL-2 QPL"
 SLOT="0"
diff --git a/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild b/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild
index 43aa5d3d01d9..8b71ec78e38f 100644
--- a/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild
+++ b/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild
@@ -10,7 +10,7 @@ inherit autotools-utils fortran-2 flag-o-matic
 
 DESCRIPTION="Fast implementation of several recombination jet algorithms"
 HOMEPAGE="http://www.fastjet.fr/"
-SRC_URI="${HOMEPAGE}/repo/${P}.tar.gz"
+SRC_URI="http://www.fastjet.fr/repo/${P}.tar.gz"
 
 LICENSE="GPL-2 QPL"
 SLOT="0"
diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 6b780d8ddae6..2b73ab3fcf24 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,8 +1,8 @@
 AUX geant-vmc-4.4.0-fix-cflags.patch 661 BLAKE2B 121054bdcf8dfae328334221cc85c7d117a8dd9b0b096499ea07938bb05f303759c6478c2187f36e7b4ba22f4e1f0935d980802ce5195c1d2d9b5202d240b683 SHA512 7c6b7c253088a780101c51ac9a055fe79f65d78996206fce77d9e70a558e2b5b222eee4ccba689e68effc429cb8b2d41c6021fe4bead7d44f52daa1820a308a2
 DIST geant4_vmc.3.6.tar.gz 1017407 BLAKE2B f386ea49843abedbed16ba1d12a10ae4165123fb0f7842482c416becf4141bc15360be1038626ce40f96a9dbb15d27116cd2fbd46d74b856d5a9391d073784a5 SHA512 eaf8626a3702149a1c5be4adff7843ef828da8024aafb8de489dd6b55b4ee05850581318d01032a4008767ad4e2fc0fde23e1aa5c751693e902d51ce9ad3d1df
 DIST geant4_vmc.4.0.tar.gz 7118838 BLAKE2B 5edbd13adeeb560188deb54c1f5d52fda371dd5f3dc04d676bcaf7edad0bbf8eb573d6345e5c3626b5b64c229d49b7f02aafec77a2587e525cf3f407444391b5 SHA512 faf5fed17b317399b97f77ff1c2a1bf1cead8f0b02a3a89244f01f8ae04ce621763e52b40000e481b3826796bb4d94216368d2e3c98a62f02048c5979f4ee648
-EBUILD geant-vmc-4.3.6-r1.ebuild 2075 BLAKE2B 1decdfb155c65f5317abb59e2d46b175973aedb0b33398eb3c39e71ce997e78a4629a53685880f5d9c7e06a4f03f3c35e5fa8c0677ce735147ca43b00ff65a4d SHA512 d08b40f5f13c8cb498eec3991e71446ae8051145b63a3366d0f5cb0c1360bf8ed8dcef9292f8bae8e4066bdc14b93ee385cf4db501dcd14f7e9957e64ead2d93
+EBUILD geant-vmc-4.3.6-r1.ebuild 2051 BLAKE2B 85a7f104bc6b532ea7d7b970e7c035aa1b8c80cbe037177b77260cabb4ed384f5d9d523f673f116fec1dd9e3042995843cc06a07fb22ca19f0accff84a23016d SHA512 b7c4313c6086640d029fb94afbd4a94de4e581798100ede02fae3f90e5f3fc9146f4769e2a331da0e84f0d1afb0f0e820974f5268769e72db252e6ea7628e697
 EBUILD geant-vmc-4.3.6.ebuild 2114 BLAKE2B 5de01adb2ca2011254dcdc0ce7037503ec84b8b36d423993f37785d3a34fb8bcc8bec12ab6924f676564cac208d040d26f56c5bac076f159b89e87dc4164c28c SHA512 457b3d38eb961826d35b5a5849bdf2cbaddcc3708ab5f90420e6e1108912230d335eba32db851bddd9d5b0feb97e9d04ee97d80a301726f4a8d9d37b5dfac3df
-EBUILD geant-vmc-4.4.0.ebuild 2466 BLAKE2B 2b4be636cbbd9431026ef6e81dc7d639ba2b5351c542cf0a0a121a8f87915e4564e25fb820c639a227eaa88b621519b19ed43344b08e6d1273fd8bea5ab830d5 SHA512 d897e2a35bd35ec79597c2fd1ef178cdb054fe3d8818c37752ccc0375503f23faa676040475e5c2b39dbe450a6e5a18b80b7a3a183d52ac26decb2a30e8bb9fa
-EBUILD geant-vmc-9999.ebuild 2111 BLAKE2B be011b3c4a43174045c99051982a88c3efefd954edeb30f15e7baf2152c9300cfb9d86caab1495886dd46ecaeef0a10b7e360c3d10e16c83b078f2523b862d54 SHA512 48a3504c92aed063b64e82e6547e27d2f961ebae57d1bd2934e96b50f79af50413c601d8990a8b02ca54070f6418bf7ff6f030524c6042987fa0e90d9b7a58d6
+EBUILD geant-vmc-4.4.0.ebuild 2442 BLAKE2B 60d7a84b777d2f87fde249a31b05a9a0e6fd90f1f9e5c7b74d0770e9dd6f2f40663316b39e68f56e9ccf9b4edf9d9a1aec2ae83f13435529992eb7fb88ca59ec SHA512 c533ceccfdeed7ecaa4596056a11f6fcec9828a7f3f82556dd24686d59313318b4982ac87f57ef20d44393cd9c7308904dd2f3dc4a0d155f7e304f280fe97d1c
+EBUILD geant-vmc-9999.ebuild 2087 BLAKE2B 2c922fce9990e941b90bbc13d90e6938cfcbe9eb4b75bb67847e6b194530ec2c7441733d7d5a2cc128d90c30a57210c500cc17be30206e2a6a57e336e22cae4e SHA512 8db090fb5919def57b56f34bd0dba1d8dd461b16a664e2586e6b0f82d95030384450e395d606281c1f26363d89198d5127862af0f838fd42b53cc3c2943af08f
 MISC metadata.xml 859 BLAKE2B 4bec2c6236dfc1bdb9ba9f1caff6c9b545861c6e51c58d90bfa652d2d5aaa323437473173912f1840ba3c690f92798929980e5bcb3cacb5fe4cdd8a0edb014d9 SHA512 15a0f421563051a8553e2bdf9a8f82dc5077e336513cc18ef7e9bea49e084ea4dc1aa32800fbc928743d8c09036d136518a5a6a74c2f57c61215da2f44dc9727
diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
index b92483ba721f..585f02e1660a 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -52,11 +52,11 @@ src_configure() {
 		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
 		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc ; then
 		local dirs=(
 			source
@@ -83,7 +83,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=(doc/.)
 	einstalldocs
 }
diff --git a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
index 0f091fe6412e..fb2e982ebfd8 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -55,11 +55,11 @@ src_configure() {
 		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
 		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc ; then
 		local dirs=(
 			source
@@ -90,7 +90,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=(doc/.)
 	einstalldocs
 }
diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index ffc8e7dc8743..9c27c2d98efa 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -52,11 +52,11 @@ src_configure() {
 		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
 		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc ; then
 		local dirs=(
 			source
@@ -83,7 +83,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=(doc/.)
 	einstalldocs
 }
diff --git a/sci-physics/heppdt/Manifest b/sci-physics/heppdt/Manifest
index 392737f7807c..95ca49f47fc6 100644
--- a/sci-physics/heppdt/Manifest
+++ b/sci-physics/heppdt/Manifest
@@ -1,3 +1,3 @@
 DIST HepPDT-3.04.01.tar.gz 1851879 BLAKE2B 7fbd73818a04cce4e5911dfdeb03c59878f75baf1d416bd2814d9d820179ee31e6f7938017d628f22994e71930746a4a485d0bc4316c23c2c82ba513e19e6fa0 SHA512 33a93b7d18c0cc64ab13923eb5edca89ed753a7f888a31c1d6a5f84f735e4042e2eaaf04e221d487976603a40fbd84cede4b4dd2bcd2e7479d97cc637dda637b
-EBUILD heppdt-3.04.01-r1.ebuild 1177 BLAKE2B 7f14a03c391c9c5e01d5f130960d8d6947d23ee3a76155cea05c56fa8dbf9288db7118054b0718ada76617a1ab05cc41e7ac0d1af544360c7ffb73c6cb3f040f SHA512 f273e3e200b4f44711947ef943c91badc1da00662c19bf7e55adafe1e1648c934c9a80547179fbd0da8c8f2fb925c9782614ddcd4f1a58ca3c2dc85ca2d9269b
+EBUILD heppdt-3.04.01-r1.ebuild 1207 BLAKE2B a8d35fb0d5c41b38ff5ec9762eb686baa308191091899adda9ef4bd25f2452264aa9b88810b320eff14aa8db68f7a4cf2add70f45e968f63fa83d0d125ceb55b SHA512 6b185cd36730d19a204523e817ee252d186cf3815520b3fbf99a7a2e41aa569f5f7bf9a55ce02b66533643466384780abb843dd0024500afab34f1cfa5fc5e38
 MISC metadata.xml 728 BLAKE2B 81e1109af3a5fcc4de18cd7817614c14afcd5769b3442bc407cb2f6cf38ddbab21fe2029e6c0f100f6d61f5e18d23ec5ea02b1ee6805ee335884d5f66d62edd2 SHA512 e8320768ae636fdb2b3b963f1887a91b5122e6b3a9a6fdbc79ef880ff6ea6a98449c9dcddd6a0300ff30cc34acd186a50fce192e591a9f5a2a62faf898f7b344
diff --git a/sci-physics/heppdt/heppdt-3.04.01-r1.ebuild b/sci-physics/heppdt/heppdt-3.04.01-r1.ebuild
index e5ec556641c7..af9234ac081a 100644
--- a/sci-physics/heppdt/heppdt-3.04.01-r1.ebuild
+++ b/sci-physics/heppdt/heppdt-3.04.01-r1.ebuild
@@ -9,7 +9,7 @@ MY_P=HepPDT-${PV}
 
 DESCRIPTION="Data about each particle from the Review of Particle Properties"
 HOMEPAGE="http://lcgapp.cern.ch/project/simu/HepPDT/"
-SRC_URI="${HOMEPAGE}/download/${MY_P}.tar.gz"
+SRC_URI="http://lcgapp.cern.ch/project/simu/HepPDT/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sci-physics/herwig/Manifest b/sci-physics/herwig/Manifest
index 5d64541e3897..43af091cc879 100644
--- a/sci-physics/herwig/Manifest
+++ b/sci-physics/herwig/Manifest
@@ -2,5 +2,5 @@ DIST HERWIG65.INC 32 BLAKE2B 89056a5d5bca2bfe1493ba32c73501c2a0b46c0b27e3ff0ebdf
 DIST herwig6521.f 2513511 BLAKE2B 5172e07e8dfd5c731d0a8dffe061980a2629ffac5581d2df3cc619e9de166d4ecc1e66da0a07ee8527c62d45665f3740c22a92b89b88638dddee7fbd41a9a94f SHA512 c13bc74132ddb86ca0fea61bc2da21dc6908b96d14a33c378c0f37be0dce201012fdd11681e11fcfb715b345ccd72fb4d166017eaf4e0cd19762acbe6687809a
 DIST herwig6521.inc 15224 BLAKE2B 176f3b329f0eabdf5befdbc0cd372e57a3027e6d7faf447356e72b0a5c396e21f44dd594e18f37e4139e2ecc507749175441644513de4b10e055a95731ab3046 SHA512 8254dc7a99445a7f4a61760fd8bd4ede5f8b7613e25a9c51155ae614c9cb888c7a66043b3b2ec96b8f515351dab0f697dc14738bcde58fdb345f3aebdac6f1fa
 DIST hw65_manual.pdf 934022 BLAKE2B ab6d000f236246779450a239e7b7d18ed3487189b33ec27407edcf40ae7f19134a2bdc7689c55eb44ab5637efa8aa32d678eb71b782e386e6ea340f936c6cb79 SHA512 68c4407e27abe2d34e239455bd94324d919b712cc8b031faa4635caf4e3eb6ff30d35b4e7f8dc9146c8f54886ff77cc690b296b15805dcd9302ef93e707915ff
-EBUILD herwig-6.5.21-r1.ebuild 1479 BLAKE2B 40d05ff9c4f06f87a6b1fad501b5e005dd7fb04f77e84d0ceeb91baa6851b4d09e049b08a3ee86d4becba3a7a210ef9af95b15ed065a3ec05371c1d685de983c SHA512 6b4560ade3463dc1ffa2edf6ec1b4be8f357efa6c5b2ae247ce1154d7195a242252e6de9c6da6ebc34e53dde6b2a9e25f2df0774ba4285b3ab535d3442c9442b
+EBUILD herwig-6.5.21-r1.ebuild 1635 BLAKE2B e8633bc696300bda1e55fd1b3cba874bbd6a0eefad1903076189728a5d5a1676f64de2053fe10dfaf46337f35509a1b10e517b2b2893dcf9ccfeeee30afb5fea SHA512 d356f16a473fe52dd9a690735772d6a22363b20496ae4d8a52e1181e77e486f49e4ddec10115a552b9bfa80b1925dab2b1523e588bb9c27a7db2d649ac8a2f56
 MISC metadata.xml 418 BLAKE2B 0a86dad4109bdfebfb027bdae542779f9f0cc9a1fe300a4047f4e614de788bf5f8c06dcc7111d6e7777ac3faf0c7a2447bc24fecbd533e51711d051a08572fae SHA512 c2b4efe94ff3a63d31898075af8404727ac739aa29e511bbd527ed416e2cad165c765acaab48d8e777c57a5dbbeb9d98cb5a3fb8ba2c86e342089ade0aa62b48
diff --git a/sci-physics/herwig/herwig-6.5.21-r1.ebuild b/sci-physics/herwig/herwig-6.5.21-r1.ebuild
index 8348c8f2d55b..f7caad218264 100644
--- a/sci-physics/herwig/herwig-6.5.21-r1.ebuild
+++ b/sci-physics/herwig/herwig-6.5.21-r1.ebuild
@@ -14,10 +14,10 @@ MY_PINC="${PN^^}${PV1}${PV2}.INC"
 DESCRIPTION="High Energy Physics Event Generator"
 HOMEPAGE="https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/"
 SRC_URI="
-	${HOMEPAGE}/${MY_P}.f
-	${HOMEPAGE}/${MY_P}.inc
-	${HOMEPAGE}/${MY_PINC}
-	doc? ( ${HOMEPAGE}/hw65_manual.pdf )"
+	https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/${MY_P}.f
+	https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/${MY_P}.inc
+	https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/${MY_PINC}
+	doc? ( https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/hw65_manual.pdf )"
 
 LICENSE="all-rights-reserved"
 RESTRICT="mirror bindist"
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 5824d21252f8..dbc93eeacb83 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -56,16 +56,16 @@ EBUILD lammps-20160314.ebuild 6082 BLAKE2B 6fd9ea63a4dd57d01588f3789c65ef3016bc8
 EBUILD lammps-20160321.ebuild 6082 BLAKE2B 6fd9ea63a4dd57d01588f3789c65ef3016bc839c2757f2a9897b0d20eca5b7cd815a93c56edc922ed41893c0c07e1ba21006c768b282e9b2f55c262ff61f6d4e SHA512 58690c7f3f9cd590a09aada6cfbe54a52de7304deaac1de17900ddb1f60357b3f650671cb1775737ace2388fb703f81e3d553e8ca3f2f034a989b91badc3b921
 EBUILD lammps-20160407.ebuild 6114 BLAKE2B 60f4208a6d09151d384c02833ae9f4860d5fb96c7d552ad65d468f2f90cf110b434b3979c92e2dbcee5d967ac188e0ef8e0b3fea4034ae981692acaa2e05091d SHA512 38d19ea44396f6036c4b4155c1805b3bad1472ff9868565ea98fd70f0eede59478bcde1f6d7e8dd6a0ebaf0e793a140efd23849aeb5189d4b3e998a389e1dbce
 EBUILD lammps-20160730.ebuild 6052 BLAKE2B 628ecf1c809781565d0c2c2544ebd79d839a7ebeca9be096ade88cc60b96543d00f0ce52f2a65bf717a9abacadd1f5b29bd5b85c69183a95a9da099cde29fa8d SHA512 00ca7236325e9dc4a375730cfb83243f445fb30105eb72d512cbf421d213f03c3d4d0fa2edbf1174da17a32935bab0a1a4a7bade390d751d003cbaa539645eb4
-EBUILD lammps-20170109.ebuild 6060 BLAKE2B ee413f1585e5b31ee79facf2b4c51d9b58c315ff8bafb077f2ad17dfadcce65cde84d524a90ef091fe9bfa5259f6e5b820370c40812b09e05f9bd335a77204fa SHA512 66bda5c61e40a26c8c3c4b69bf861a9427e94a000f938337acc555a9979fa3a074d449ac4918de50c17e0f1c6003d433b5f67279a56b609980b0b0b7ab4de64d
-EBUILD lammps-20170706.ebuild 6024 BLAKE2B ec2e07f20a88b5b67d7cbac383498c19faf94137a577b603e471d37de1050f056778c11854b07db42ac0e0617ee669b90aabd8483d7afc30e53e6f1781294518 SHA512 e8292a3113d2eb695f4f0b6377a668b864eb41522cbb813aef44ec6c4d19b3ac7bdc307061e76c311bbea37615c56064aefc484f43f1ebf1efc578afd274c111
-EBUILD lammps-20170901-r1.ebuild 3061 BLAKE2B 043c6d5ea0ecda7f958cd92868ff48cc6517bb9f88db01bffb941ebaedf470bb6991640d40db6de7f0b4af70a5772dd4f69a6b5e79d7d38df84e5d56e62219ae SHA512 c4aa09b6d6899cde7b99238bc852404e865b99a575b97634f4757c87a8c0fbcfc8c4f61df34b45d6395a976f514ec59ada8b689000e77897b121cc1207b85fc1
-EBUILD lammps-20170901.ebuild 3029 BLAKE2B a8aea0055f02727809dcf189477a8ce234a01b488725d48df5c1870de7b9d1ff539021f6c218622d114d1c754e6b46ddc16447993eb19e4c75fa396460a6272c SHA512 995dce4297b8e816f00ed48c7c77553abde2ac91e8b6e37fe26c35d5160077fa8f0628382bda08f324cb7a6461d74e6a2d98ad9082852060e47d375379f895e0
-EBUILD lammps-20180117.ebuild 3061 BLAKE2B 043c6d5ea0ecda7f958cd92868ff48cc6517bb9f88db01bffb941ebaedf470bb6991640d40db6de7f0b4af70a5772dd4f69a6b5e79d7d38df84e5d56e62219ae SHA512 c4aa09b6d6899cde7b99238bc852404e865b99a575b97634f4757c87a8c0fbcfc8c4f61df34b45d6395a976f514ec59ada8b689000e77897b121cc1207b85fc1
-EBUILD lammps-20180222.ebuild 3061 BLAKE2B 043c6d5ea0ecda7f958cd92868ff48cc6517bb9f88db01bffb941ebaedf470bb6991640d40db6de7f0b4af70a5772dd4f69a6b5e79d7d38df84e5d56e62219ae SHA512 c4aa09b6d6899cde7b99238bc852404e865b99a575b97634f4757c87a8c0fbcfc8c4f61df34b45d6395a976f514ec59ada8b689000e77897b121cc1207b85fc1
-EBUILD lammps-20180308.ebuild 3061 BLAKE2B 043c6d5ea0ecda7f958cd92868ff48cc6517bb9f88db01bffb941ebaedf470bb6991640d40db6de7f0b4af70a5772dd4f69a6b5e79d7d38df84e5d56e62219ae SHA512 c4aa09b6d6899cde7b99238bc852404e865b99a575b97634f4757c87a8c0fbcfc8c4f61df34b45d6395a976f514ec59ada8b689000e77897b121cc1207b85fc1
-EBUILD lammps-20180316.ebuild 3059 BLAKE2B d44e61d6a9b481ad898975730a25e6d4d7a9b67c6426a5250d27579f0a722ad7894b5c8e2a63aaabd4dfc09e10a16dc8b779da5d65629140dd8046e4302e73cd SHA512 cc396469d379f3a134c531c7f7e8621f3faae1fb1fb01692fa657c092138c79d5c892d62d340d8995234b42a289f57a13a261ceae2e757bf5228964ef4fe6785
-EBUILD lammps-20180822.ebuild 2846 BLAKE2B 27e6409c3ee89806f66ace75356319c26657e6fb0979cb4b47980ef1ecb880ac614f6ddca27ae878e2d47bd63532022bb7ab764bdcae39649b643ffe10aa0ddb SHA512 b5df9a782e92e2c69f00693702202e44a98814705f5cc66da1fa3e8dd96923671d89a4d0efd3309733cc134801253453e5e3a56d3937db2fdb116bbe3249936f
-EBUILD lammps-20181212.ebuild 2987 BLAKE2B 7db6f742db3f9cfaca29649bd685c96ce42c480316d847231832c8246e8cd7bdaf58e5808604f943c2573664d92df935e8ba7d57f97968f329660430795c0f14 SHA512 54fc9dfa20a3f4f48667bd5a848367acd23c5e9bb68ef60113e5d86492a830f3e922ecacb4fe37032bd26f8c8a67a99f428fde9e27dac98b1bc6e9baa90d3fd9
-EBUILD lammps-20190605.ebuild 2987 BLAKE2B 6f03de6d6143a1175ee8c9c3c9c898b0a4108e5fe56ce3aeb9c4fda04157cb999dc0e9b99fbab130f966426a51c4d50f574e09e193c86fa7363ded9bc7928cf5 SHA512 96826fa8194843949411596da23335f9b75dc04b02ff3fcdc96a11b96a7252412a80fc4176bc4851547d78c55047d94b056d958d798bd53344a9be88279fe96e
-EBUILD lammps-20190807.ebuild 2987 BLAKE2B e2f59d7b6389faf407c3f94eaa552b7310364dcce4d0b850c2de7cf61eacdad92256fed3e22034f256c50b4e67ae0324fa13766bd954293d248621ec9ddcfd56 SHA512 c7a44dec146434afe5108b04b37059f14dfac4bb914240a67bd54c0c95e81bc5b6095b67086a2e966a3c46ddc14057083cad3fb0684d0f345614dd4f851254b7
+EBUILD lammps-20170109.ebuild 6056 BLAKE2B a0681ae27df08479c4a3e23358c2027153e6e60c646d478004c91b5ce8e082a3964453bb30515da083af47ce934fab1416b43565e5eedfe2f4ab8f354ae81460 SHA512 702dc243f967a3bae9a3c0347a812c374403981f976dfe7c3efe89224042dd3ac171b4358985732a273e332903755a9199b1654e68c9a16ea61d76de96984eb6
+EBUILD lammps-20170706.ebuild 6020 BLAKE2B 1afe869a63b78f2940b6725aa938a42384a51f4865ff15c084b043b9fe9cf911879d54b47475528ad698dabaa3d687c5f670ec9d75254e2ab7d42b686aad4e9f SHA512 e10f87bd5d6e74290cd4448629e7156753084d99c0b3ab577dc97a3c81c3473fa8030bba37353265689d6143d080fcb53ccfdc405e8d745bb4e2db95ec0c6ce1
+EBUILD lammps-20170901-r1.ebuild 3057 BLAKE2B 7be21a634644d3202dfe7bb90dfb3a8d1e5f77e7d40aed32eaf519b4fc2bd31538e86b18d2986123c3fa3446a505594963fa61ee28ff7a6737c366f2eeace2f5 SHA512 b91322804f33e06ae7762ca2a52eb901c599b8ae24eec2d2fbbb0b5cb510757d3a77a7adc4d63ad5dd070f5a0d4530de772bda438142b88adc00595b264c24d9
+EBUILD lammps-20170901.ebuild 3025 BLAKE2B f9b765f934a7198d53bdf9a71216d4b49a6fbb06c201917f32ee2e86b03170302f06fc670b8de5aa408c2d6cf1da273a3740677c84ee27677e3cd9038ad8c425 SHA512 c2f48852df86981f4407bd6d58efb1d6cefe65390de03bbf5ef3e6e142627321a4823da1d49f333ee88bce8ec62558c804288cf54f47ae2da0b7fadba2222823
+EBUILD lammps-20180117.ebuild 3057 BLAKE2B 7be21a634644d3202dfe7bb90dfb3a8d1e5f77e7d40aed32eaf519b4fc2bd31538e86b18d2986123c3fa3446a505594963fa61ee28ff7a6737c366f2eeace2f5 SHA512 b91322804f33e06ae7762ca2a52eb901c599b8ae24eec2d2fbbb0b5cb510757d3a77a7adc4d63ad5dd070f5a0d4530de772bda438142b88adc00595b264c24d9
+EBUILD lammps-20180222.ebuild 3057 BLAKE2B 7be21a634644d3202dfe7bb90dfb3a8d1e5f77e7d40aed32eaf519b4fc2bd31538e86b18d2986123c3fa3446a505594963fa61ee28ff7a6737c366f2eeace2f5 SHA512 b91322804f33e06ae7762ca2a52eb901c599b8ae24eec2d2fbbb0b5cb510757d3a77a7adc4d63ad5dd070f5a0d4530de772bda438142b88adc00595b264c24d9
+EBUILD lammps-20180308.ebuild 3057 BLAKE2B 7be21a634644d3202dfe7bb90dfb3a8d1e5f77e7d40aed32eaf519b4fc2bd31538e86b18d2986123c3fa3446a505594963fa61ee28ff7a6737c366f2eeace2f5 SHA512 b91322804f33e06ae7762ca2a52eb901c599b8ae24eec2d2fbbb0b5cb510757d3a77a7adc4d63ad5dd070f5a0d4530de772bda438142b88adc00595b264c24d9
+EBUILD lammps-20180316.ebuild 3055 BLAKE2B bdf29a5d17049b35eadc3a302fac392092380961033a42bd9c2e2aeacafbd987ed6f268ed3231a0174ff635371590a2f50b214116a3581afba36cb13343f1ef1 SHA512 db43519bf38482cb5954da5892728b7d02544c2b3d841c570704b38fc143b2394fa6461772505e099dea432cf9c97db482c85aa4fd306c33c335f6005304b278
+EBUILD lammps-20180822.ebuild 2842 BLAKE2B 5dba10be26f75f5500ff00b9103bb845adb85b381d6ff347e15ffe6b1e05dfac66a7dfb172d703558eb89aad493ee3e09b82c245e42aeeec3e057c6aea84bfdd SHA512 63d04d70e7a14fc8d1c4d9774b354348603674cd3ccf1ef5587b4fa1bd03d20de38c9410a099494322815f873d4a7c49545cb194dfa886a14271b6b2b4733dfa
+EBUILD lammps-20181212.ebuild 2983 BLAKE2B 9a1c3616dc7b93c41a934e45f9cbdf642aa96aa36792eee7fd50fd2190a2fe648f4a2bd3c09aa2c70acec3567081557a4f424b2a9cc83182875f302932619798 SHA512 85e427dc75a79474156951352b7f54a44974d4e4d848065af82b529587c3d67952cc84f95ab1769e49a883710f1a8b59cd8619006cd31d430c05260c0f6fc460
+EBUILD lammps-20190605.ebuild 2983 BLAKE2B b1b61fea5f10e4161cd141c15ad5d39852469160c2647b88918fb7fc93d93ee085b1ae7df0de95be45e63d6689056a4065f4b1c272fc8dd6a758f2c624441291 SHA512 01510f78fec52d3799fc70397956da697ffe71bd67e49daa4cccfb68f62a371ccedf61257d58c026df0780dec3cf7cf5f180fcb6ebf956ee9234949341cd921e
+EBUILD lammps-20190807.ebuild 2983 BLAKE2B dec7fed84824ca9ee695e25d54abeb6b767cfbf7e8889f0ea5f035817bd6b94cee61b1cf8c75d4ad39497f2b8fc81f2c538ee329ac4aafba6c829291ecd4c245 SHA512 57814b446487f1a9c35ff28549ad70af2c6628e2324048b84544ed10b578294bc870e22e481aeab91c4545d5d74ea45f0768d98f98c623175236b104f3bc41fd
 MISC metadata.xml 1338 BLAKE2B 553629a0b3221db88a37cd6b0bfa806da9265caf2df038736211351a87ac34af5a98f0e7f3e34246d814a378cd64b1ed82d69f4c26e18c3a7700441f8be6fa2d SHA512 b3556e8444b4cb42d1fa80cc8735e11e07cd2928af67104d4518b874e167d5755840c3585e3ffefa88057f84d711cafe0a60405323b4ad6a9546c19d4a5d94bd
diff --git a/sci-physics/lammps/lammps-20170109.ebuild b/sci-physics/lammps/lammps-20170109.ebuild
index 0d0041e93c1f..9cf71b8e0c89 100644
--- a/sci-physics/lammps/lammps-20170109.ebuild
+++ b/sci-physics/lammps/lammps-20170109.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils flag-o-matic fortran-2 multilib python-r1
 
diff --git a/sci-physics/lammps/lammps-20170706.ebuild b/sci-physics/lammps/lammps-20170706.ebuild
index 411bd23afe10..2c030ea6e2e7 100644
--- a/sci-physics/lammps/lammps-20170706.ebuild
+++ b/sci-physics/lammps/lammps-20170706.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils flag-o-matic fortran-2 multilib python-r1
 
diff --git a/sci-physics/lammps/lammps-20170901-r1.ebuild b/sci-physics/lammps/lammps-20170901-r1.ebuild
index 2ba7d813b541..1efe9382d5aa 100644
--- a/sci-physics/lammps/lammps-20170901-r1.ebuild
+++ b/sci-physics/lammps/lammps-20170901-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils fortran-2 python-r1
 
diff --git a/sci-physics/lammps/lammps-20170901.ebuild b/sci-physics/lammps/lammps-20170901.ebuild
index 63840fa10775..3e898dcb6a15 100644
--- a/sci-physics/lammps/lammps-20170901.ebuild
+++ b/sci-physics/lammps/lammps-20170901.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils fortran-2 python-r1
 
diff --git a/sci-physics/lammps/lammps-20180117.ebuild b/sci-physics/lammps/lammps-20180117.ebuild
index 2ba7d813b541..1efe9382d5aa 100644
--- a/sci-physics/lammps/lammps-20180117.ebuild
+++ b/sci-physics/lammps/lammps-20180117.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils fortran-2 python-r1
 
diff --git a/sci-physics/lammps/lammps-20180222.ebuild b/sci-physics/lammps/lammps-20180222.ebuild
index 2ba7d813b541..1efe9382d5aa 100644
--- a/sci-physics/lammps/lammps-20180222.ebuild
+++ b/sci-physics/lammps/lammps-20180222.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils fortran-2 python-r1
 
diff --git a/sci-physics/lammps/lammps-20180308.ebuild b/sci-physics/lammps/lammps-20180308.ebuild
index 2ba7d813b541..1efe9382d5aa 100644
--- a/sci-physics/lammps/lammps-20180308.ebuild
+++ b/sci-physics/lammps/lammps-20180308.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils fortran-2 python-r1
 
diff --git a/sci-physics/lammps/lammps-20180316.ebuild b/sci-physics/lammps/lammps-20180316.ebuild
index dcd714090739..697741932d3b 100644
--- a/sci-physics/lammps/lammps-20180316.ebuild
+++ b/sci-physics/lammps/lammps-20180316.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils fortran-2 python-r1
 
diff --git a/sci-physics/lammps/lammps-20180822.ebuild b/sci-physics/lammps/lammps-20180822.ebuild
index 1435931c2f1e..3fd1530dbe2f 100644
--- a/sci-physics/lammps/lammps-20180822.ebuild
+++ b/sci-physics/lammps/lammps-20180822.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils fortran-2 python-r1
 
diff --git a/sci-physics/lammps/lammps-20181212.ebuild b/sci-physics/lammps/lammps-20181212.ebuild
index 82c4dc4bd956..2e38859a473d 100644
--- a/sci-physics/lammps/lammps-20181212.ebuild
+++ b/sci-physics/lammps/lammps-20181212.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils fortran-2 python-r1
 
diff --git a/sci-physics/lammps/lammps-20190605.ebuild b/sci-physics/lammps/lammps-20190605.ebuild
index 80e4235e70a7..dedd35befb9d 100644
--- a/sci-physics/lammps/lammps-20190605.ebuild
+++ b/sci-physics/lammps/lammps-20190605.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils fortran-2 python-r1
 
diff --git a/sci-physics/lammps/lammps-20190807.ebuild b/sci-physics/lammps/lammps-20190807.ebuild
index f1640a0c820f..3d0378efcb46 100644
--- a/sci-physics/lammps/lammps-20190807.ebuild
+++ b/sci-physics/lammps/lammps-20190807.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils fortran-2 python-r1
 
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 0aeba374d6d1..1800d2b68128 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -6,5 +6,5 @@ DIST cteq61.LHgrid 8946864 BLAKE2B aa7d7d817082a70fb53cf9c9d367af3bca9b5f4d845ee
 DIST cteq61.LHpdf 11860 BLAKE2B cde2c5f6493977f56207d86f0a439a192e32f4debe50b6399b10cf59982bf944950c53c05e97a56daa8eb8e2ebf91a38fe405b1d423be7839c41dab61150b2e2 SHA512 2769bcaed94aa4b47144cd2c3ce76e0b6ab4fa8af278db5cb3b612f2286200352e829eec3971c8da0b78144483f00bbbf1ae2aae8d1e75045d239fab40289bc0
 DIST lhapdf-5.9.1.tar.gz 1236188 BLAKE2B a70b0421f1eefb79e239beed362858f0a47f27eebb0bf30c8f71f0fd49e405370774a932388c56b9193d51be14d7ad8e00efb7ea947e92009f23868b28ced67f SHA512 8e0eafa202d7c486264c06ddac31a2d1fc17c71223cf5b75cd9dae7e434792e8b8f4002bc8a0d00491c0c3fc58513095cbf693dc883c3bf968473a4e6232586a
 EBUILD lhapdf-5.9.1.ebuild 2412 BLAKE2B bdc15e85d250533dbea638a0faaa035f5a6058475e0e82d7e3683e035eaef28e48d2507bdc91601253c8627cb768e3d46b518c01f12ed04c58746807676bf2e2 SHA512 3dbbc9cf14d2764b4e3abee374cc91efb0a3846c14d5a20eb9c6183c7bb66f2cf91a67df1c3395631b2ec3fdcb52b5ed0ea3265b767ef24a0b0194efcc0a0637
-EBUILD lhapdf-6.2.3.ebuild 1456 BLAKE2B 380defe3c3803bc9ee5aa60abb9348b16bfe892fbcd77fd76d4508cb1f4ace7184ebcc3d46ab59cc60715137f880e1403b0ffe7ebc13c6807903570f1f654d1c SHA512 2c2648adaa2985276f2e5163407ef8f583c0634c6a8b8ddbd834b54af0e2ff6258d5acd06cbe2c18f24a4b982a1fde783f8bf18c4ca525f46793124ac9752b31
+EBUILD lhapdf-6.2.3.ebuild 1452 BLAKE2B 34ce7cc0841fab66093bd1828b4c0e8347810789a027a801d9b383108f4397386e5d6b4f0e6222a960a5249333b1237dc429b2ca7a2f516ae73d3553f271f8c6 SHA512 5be91071f73a36063590bd284057f13bd22eef9f5e5f1fecd4d4c97badeb1a803c2cd6737dc260fa60d973136a2493def5334a3c81e0b29b48dbb16e7d0a1060
 MISC metadata.xml 1090 BLAKE2B e7faa55de10391c76cc33d1f66f9a715d163d396c5e74b4d2d55268424abb74dc70687287c900841e4a298ca5bc936b01cec7c570d2b14b86d251c4b3d485d26 SHA512 fe04ac08f3f0b7ed98369d16b2cdf053d980211f3d4bb9a17d3e3feb3cc3dc6e2999fd16cc533ba7250e47b258aa10bed90d7f62007faac064112c5f9b79fe4e
diff --git a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
index f55cef4113b9..4c60a74df5b9 100644
--- a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 AUTOTOOLS_IN_SOURCE_BUILD=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/sci-physics/qmeq/Manifest b/sci-physics/qmeq/Manifest
index 157c8d17b8fd..fb8a68561123 100644
--- a/sci-physics/qmeq/Manifest
+++ b/sci-physics/qmeq/Manifest
@@ -1,4 +1,4 @@
 DIST qmeq-1.0.tar.gz 590715 BLAKE2B 7f091be0651236f2dcb45825df541813e27b43b2b8ec9184a342c962363921e29462726ba23530d0b956bba45793ed2036cec6287696e5fa58f91204d9267933 SHA512 3589fe927740cac5130a5b936e7fb8f73ce20f280878a326cdf91fe6340e8853f5e055c7e07170433c0977130cbb31644b0d9f84d23cd467aaa82557c8541e6f
 DIST qmeq-examples-1.0.tgz 289316 BLAKE2B add7520b579023c8da91aff294dd5a8fd29ba3520c3b496f2a98c8159dab4ad6bcdd1d12070357d868a10bbf224511ab27da069b94951d2c8632064344d2e143 SHA512 4a7b78a200ab4fa407401ea89740cdbcfb82376d97e8146e20a1cdab154269a6b9ce8217fb7ce78af73677b544ab535c5eadd386655dbff9c4ebde6c8eda9e38
-EBUILD qmeq-1.0.ebuild 937 BLAKE2B f7a3e68ff216bb5bd6e4ba69ee52c4d42485da5928d6a9031d825f7e0e6831560660f75422a5930cfa7c043ac7d0a788793c520f0798e38fd97213941702a841 SHA512 e0b316c457ec7b6650aace98f47cc100afe30b516dc3fa6f49e312587ffb8b22a1f1a217534d6ecae8385be080467207a9153e6f1aa600cbb52fee9aa6f32dd9
+EBUILD qmeq-1.0.ebuild 938 BLAKE2B 2dca76b90be8b6786547aadf35e4068d717c672fd6f39cd3af6ba8bdf988f15c2aefc8075a5f690415f40b123e309573324eaceaefd4d1b3bd158554cd237238 SHA512 a269d1b6ea5e256013b7c08728c4c2dd9ae5360501c8037ea8c27f7bc2dc8376ac085213aa5f5e2bfc257348841cbe9e45fe266c980e4c462bc958363e71aff6
 MISC metadata.xml 342 BLAKE2B 8bfc619eb36e81fb749932d8478b86b7ebce4e36378b3caf00b7d76b3a0d876debf3b42b1182fc68f5e1122974430a48b6977e69d9699f4eb04efe34b8be1ed1 SHA512 678efb4d82074368f3d07aa488049a79ccaa214c729b8de358e5f4eaeb3f49728a1019bf0ed5fb5bb6859f667b6d5ae2632a60d9af8b6cbd82c63c68b7624660
diff --git a/sci-physics/qmeq/qmeq-1.0.ebuild b/sci-physics/qmeq/qmeq-1.0.ebuild
index 67ed3e975224..36c97a4c552c 100644
--- a/sci-physics/qmeq/qmeq-1.0.ebuild
+++ b/sci-physics/qmeq/qmeq-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sci-physics/qutip/Manifest b/sci-physics/qutip/Manifest
index e4954d2aab65..bcf4d5280b39 100644
--- a/sci-physics/qutip/Manifest
+++ b/sci-physics/qutip/Manifest
@@ -1,3 +1,3 @@
 DIST qutip-4.2.0.tar.gz 424805 BLAKE2B 8f85e12402681b57bd4a612a2d5d9023f4c27a35aa78b70ad00d238123b2863a9b728e5ed1c24d81faf6892ca2b0a5b70652403fbd7b5dc02629e328e92a7e2b SHA512 888e569b30a1085162ecfa768967526f5ce34b19e1a1b0f76f1331eb3978159ba321e126a1bc57e0936c5819218f07a336a57c80193b33af1009d1cd87fa95de
-EBUILD qutip-4.2.0.ebuild 1175 BLAKE2B d318437b330e0760dbfe7c4844fe781ebe9bd7e554ed840e30b67e0f1c8eaff122ee8200f4bc8b2714daa46a127d0de8368cd0d261c9a0f4ffe1630f233cb63a SHA512 e28ddd91ab2b5ece8997c3f9c5ddb794db52551ed131d7c6ec905b65b4508e557556f54fbd2f96118cf83fb16bbb129ac0db45717b0a9603ec85f2ed8c03a128
+EBUILD qutip-4.2.0.ebuild 1171 BLAKE2B aa1238474b82422c55e8a1c77c7812a19771aa6ee703b18012e32a1d88dd80a8b08e73f4db4ccd17308964ab7df2b766306d75e30a8955712cf1c41588e0ca20 SHA512 efee74c089c6d8393639710c37c22c11c406ee634d40d3f4012c26b071c96732543b2eed58655eda70fa55cd316dca9d5dd9189abb98997d1c4870d261cd8c3b
 MISC metadata.xml 1166 BLAKE2B 6271ec99e6e13f1cd49c94fa84b3235c86de47fae1e54fe44fee51106389840af695102c136e640e5df2823fb8ba205e06941ba52c8e318c504140742527cedb SHA512 eedcc69cefe905b4d0f39a106f5b444c9924ba60e2ecea1bdbca8551a946b1008a5e9ec83ef285f201fefd20b4a7bab76f4280f0f6827a3422257c6500e4c4af
diff --git a/sci-physics/qutip/qutip-4.2.0.ebuild b/sci-physics/qutip/qutip-4.2.0.ebuild
index 3a1c537b0c2f..52d699a8653b 100644
--- a/sci-physics/qutip/qutip-4.2.0.ebuild
+++ b/sci-physics/qutip/qutip-4.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 3b22329fe629..2326b6d8f4b8 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -9,9 +9,9 @@ DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
 DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf
 DIST root_v6.18.04.source.tar.gz 165938450 BLAKE2B d6545dfa95817940f2bb6b5b49252eca1958df518a4bc05c4857df60a015a39d0df09ea077465533e6ebc815d04e1742da19d18b7af02b5446f9e73dc92e3c16 SHA512 cfcbdd2db4edf55845a7cd1e6ec0cdf714a7ceacb039fa6fb627d7300d6f849b3b462bab724e33b1d6b08eb22ba42c43b7d64c0c6c47dc8a3bb652f86979f2c6
-EBUILD root-6.12.06-r11.ebuild 7893 BLAKE2B b5c3b175948f9975958684d06986e23943631f9b4437375fcbea9d1c77813a62cc46eb51eecbe6156d70abc2a0562e21239c34b94a6f55deb1900bea2c2ff614 SHA512 2334e5a26807841d4a042dedd779ba65b16e57bf419426876b63630293d36c74566bed10cf9526f9bdc05f10ef750c4885e4f8ae49e3bc31199d549d06014f7a
-EBUILD root-6.14.08-r4.ebuild 8079 BLAKE2B 42a2522a88e4cb0514810706257e65842bc8b412bd2be19da89ad853c7123e90d706aa9286f92cf52d77ed7f0e5ac76f11e9fd60ffe2c30c6d8928d64bf3fd6a SHA512 9b3d53fe1a5c3b32bf4371c260ced534559766eb02d4b0f63046f7a00e597a656fce78f77f41cc5a637386c0edae39b5b986d7d40c1591a134218f2604239608
-EBUILD root-6.16.00-r4.ebuild 8055 BLAKE2B 48d912396fe8ccf402bf7ebb3c14a8dea099fd1528323ad0f552e71fa625dcf1a250a2b1bceb0c9be9ff697e36908d04e1ed1c5e0198db3cd84facf8e4f088cb SHA512 388eb5bfb0f78eba7eb921a25e4deab6f021d6688323ee5d727acd336a2d4b2d9d6599cd2a051cc243726e1a12d5badfff20c1263ecddcbb9ca274107565ac04
-EBUILD root-6.18.04.ebuild 7473 BLAKE2B a17d4d4b2889efbb30cb0241f96b4d6816da9c6cea2b681080422eae59a0d89fb52459dd6e42e6e1f7a899d04f8381d1e3a3dfecc60e082674cf840877c817e0 SHA512 dd47d1022514c7250250a7e2d0821f2ce2538042802f6621f77651b1afe2529eccb70b7615aa39bebf210f6fc7fe2cb9e233ef8aa437aa0ce5fdbbb7512379e0
-EBUILD root-9999.ebuild 7449 BLAKE2B e12f8d2aba8e40cbbe363e093da117f5e864d588c98a0731a881853f2014ed8939c74b5e65d7894a14d4948c73ac0052b4bbf742fd9c08ba632658eafbb288a7 SHA512 c0863b63fa8164a1a13489adcb6587547f861423af0d9cbe3b7d22e45940b30c500c6814d3b76deef5ead6d4e1d74f7a62c84b0b97cf52972b186fdd2fe2a8b1
+EBUILD root-6.12.06-r11.ebuild 7902 BLAKE2B e565b7faa90db1fdedd4a7a92d172a41fd58589d1c573c8dfa904af57be8d4f10ca373d043e04bf2dd54ed49fa8d4c05ce85252f6ce922dcacd1a16d278d257a SHA512 22d29350968a6ecd0b46dec881de811684e81af3519dc48933fccb5bfacf4adfc2ee9b905a9867a25a249a633390199b2ec3d21078ddb59d2ce9d0f39d5ce3c4
+EBUILD root-6.14.08-r4.ebuild 8090 BLAKE2B 0f5f521582dae74a6bf4c519b98e4a8d09e64659a4b958b18447fc9dd7bf199fb5167a78d9591feb73a63e15e7bbeece25040685c34feb1e112fd56a1f24fbed SHA512 00e4be4afacbb431055b6402a5801867370886b2381a5ebdfa73e4d419fc46946d5a28f5d6243648bd4d6ea1ee89de1352e4d334f20411567e36f1cf646e3b9b
+EBUILD root-6.16.00-r4.ebuild 8066 BLAKE2B c118a7fca58c8b3f4d054eaf37d3cdd866ee8fb12e36e05c2c567024a738c33366c448580af7e9350e4f71a3ee80a08490cddbcd0091347e08f8ce5b6e14e411 SHA512 003049600a0553a1af972fcbfe2b9115c87b60b8ab3cf749602b2adbf01b503682279665fb19a345df06dda4068be21e0bc9dcd69740a565186bd06a00b5f159
+EBUILD root-6.18.04.ebuild 7484 BLAKE2B f15aea59f307fea05ebfa23c0e95e4dd0ff96b646cb1453a6a7081a05d1e42218877627a844d4c76c69956a4922246816d45a753fce5e8ed16227549d08e9e24 SHA512 e8e66252d984e80e094d9c2f9830d1a37e5b637048704c28363b423b117b20b98d602fbbd9bbe52fc0153216fc45367fc1478cf36e1593b3b9d602c30b333170
+EBUILD root-9999.ebuild 7460 BLAKE2B 111149045d816ef927b1e662e7d4e76daec172b2e25360087c62cfc137bd2d8bf8495e50a13c17c0306d2777403874f8d8ea90335630f52145fd03a3cf1b953b SHA512 c13e9df7cc2953a82a050fc6fa8e83fd65e239dc37d930e81226e5a7dc5bb54b2333a8c5e2986171232cbb7fa33fc51a9ab6a9813b716cedccd365357f1433b0
 MISC metadata.xml 3218 BLAKE2B f23175b1a5998bbecdcdb6e5f42d08bd8e16aaeee79f43d30e0906977f389e18a19ddceeba24009360c2f717c29162c8e30b807bda993492f27429802dc62883 SHA512 d3bdc5bce1d1ac904e5a7a9f21bca65deb480ecbd1362a3251c93e09ab07fdcdd6dfd8900e62df3853b7e200880850d9010122500a081fdedb6b43adae25a6bd
diff --git a/sci-physics/root/root-6.12.06-r11.ebuild b/sci-physics/root/root-6.12.06-r11.ebuild
index 757633340138..2cf1a95ecc94 100644
--- a/sci-physics/root/root-6.12.06-r11.ebuild
+++ b/sci-physics/root/root-6.12.06-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit cmake-utils eapi7-ver elisp-common eutils fortran-2 \
 	prefix python-single-r1 toolchain-funcs
@@ -66,7 +66,7 @@ CDEPEND="
 	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	davix? ( net-libs/davix )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:0= )
 	graphviz? ( media-gfx/graphviz:0= )
diff --git a/sci-physics/root/root-6.14.08-r4.ebuild b/sci-physics/root/root-6.14.08-r4.ebuild
index e49344b7ac00..5bbe2ef19769 100644
--- a/sci-physics/root/root-6.14.08-r4.ebuild
+++ b/sci-physics/root/root-6.14.08-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
 	prefix python-single-r1 toolchain-funcs
@@ -71,7 +71,7 @@ CDEPEND="
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:0= )
 	graphviz? ( media-gfx/graphviz )
diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r4.ebuild
index e7826c4120ea..a5cb23b4a646 100644
--- a/sci-physics/root/root-6.16.00-r4.ebuild
+++ b/sci-physics/root/root-6.16.00-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
 	prefix python-single-r1 toolchain-funcs
@@ -71,7 +71,7 @@ CDEPEND="
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:0= )
 	graphviz? ( media-gfx/graphviz )
diff --git a/sci-physics/root/root-6.18.04.ebuild b/sci-physics/root/root-6.18.04.ebuild
index 15388d192284..ff963889945d 100644
--- a/sci-physics/root/root-6.18.04.ebuild
+++ b/sci-physics/root/root-6.18.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
 	prefix python-single-r1 toolchain-funcs
@@ -69,7 +69,7 @@ CDEPEND="
 	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:0= )
 	graphviz? ( media-gfx/graphviz )
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 76552a477130..2ced39aaf198 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
 	prefix python-single-r1 toolchain-funcs
@@ -82,7 +82,7 @@ CDEPEND="
 	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:0= )
 	graphviz? ( media-gfx/graphviz )
diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 483e2998a657..bc6091542f66 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -7,7 +7,7 @@ DIST ThePEG-2.0.0.tar.bz2 1938251 BLAKE2B 8f9403a7f442da6b3bf753f3b45fbddfe339eb
 DIST ThePEG-2.0.4.tar.bz2 1921082 BLAKE2B f27dd81b51c28eac547351a7c732969d79abd6c1885a2e52319b6e5807bb4c1824e35e303e3d23b80b7da07a3c7c9e9f5470d538728362a4398bb66e42a00325 SHA512 5c037033daa89748267691df644209f62f46ccdff6865cfeceeda6909cff3de0c474c5ced067db6c5659ba6ebe5a51fc9b8fee46a36886278f8d29e13de2a81c
 DIST cteq5l.LHgrid 134797 BLAKE2B 1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32 SHA512 1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
 DIST cteq6ll.LHpdf 1461 BLAKE2B 66a8ebd404849a14c1240ff1c7b06e758a78ae47cc4e7818b8b7fcb6faecbb17fd8810279e54c70623a048f78e6f89706bcecca4d4b8174468ff52481da37640 SHA512 b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728
-EBUILD thepeg-1.9.2.ebuild 2369 BLAKE2B d56c497ac138877470ef02ea5272517082a840f4a88bbb8f9676838cc5b9b8e6a5c67fc8210d5631f2ac1e579760fce97f5bb0709c3be209fb43e2263a141d52 SHA512 2cbe372d39d4b66d5919f4478c5f018717bfc950ebd499dde92481c4a93040977206281c85d355902d7925c856bffad5e2cc6f603ee6db59f81f71ea56bc9cd1
-EBUILD thepeg-2.0.0.ebuild 2369 BLAKE2B 0a5216f1bc1f7ebf1ddea92983e92854de44cf375bc4613e9980e0170c0cb06fd9c62d6612c13d1f61a6f3f1bcfe3cbadcfede49d16ee5209502906bc6391239 SHA512 47ed3001a090bf9c4599ceddd150428cdf4c223b52f4753189c130c58e2aae422e620caf6d40d3e1ed6411e4a91b178599e71a9e5305daa3235aa8e7592710ac
-EBUILD thepeg-2.0.4.ebuild 2290 BLAKE2B 0fcf376a8d91d9f2ae2489c421300e6b55a4b12676a032226dab9a22a01c421311a58ca51f874902043ba55c5c0c7f2417f39ae5262496c932629268b42754b4 SHA512 0e1490ac4ebd7378005a664b3e7c9af70a9c7f84556c4207c31cab84fd6e67ae6b93caf1bc1394a7e57e1eecbf1af1959393fcd08dd26f0023b4ec74db819dac
+EBUILD thepeg-1.9.2.ebuild 2382 BLAKE2B 84b5f2cd6ef51c7b3072027d1cc209af8723ef45be25f63464c24d0add45c9c38e1aada9aafdfca0b13b82abd5adf9da1211e11b1f5c649307918e5a5094ef0c SHA512 4c6cd6830cb66941a605faea7b9d3bce57a43256407835070987270c682e1e17813c9860ef312c127b219d26ef21f9dbb2118dabc765fecaf3a53c749750c166
+EBUILD thepeg-2.0.0.ebuild 2382 BLAKE2B 9ccc67ba13977a9d9e866f22bbaec8e63f7667253a4e86afca248be858d1d30ed8f8926487a18b83a2aa3af885a3e47e7536feec9a1f9e5bf16e4b278378ee11 SHA512 d2f1dd486adcd7841632d1ce7fa66d29e9257a0a08b43849252cbd1fde9f150d2c7382ce28e9fc2680a8dca49879d52e3d01f397e1a043c8a8c6a5e49f513e30
+EBUILD thepeg-2.0.4.ebuild 2303 BLAKE2B 044efd53dce100f361875fec18456644a1989a4ac0499bc18fde3f8e9db85773d47972a1f7c2ab76ff425caaeb7a39b5d042d599b40ee0c04f6b3771a31b238e SHA512 1c679c9030091fa3fa0dd877cc508e41743095552748633f0320360ccb89dcc297e7307c768c408feee6906b0ab2773d25a649cfac6640cb3f4cc66a1f0be3f1
 MISC metadata.xml 1066 BLAKE2B 26afbd997fe3ec808f19c1d0acbb39f4992501ec15a3bb6595f1ff7219016072d6cf3a64636df943f9b5478fb98952f7f998eab7073bb411ebe9d7274ab76686 SHA512 f42af9eb2e0cb212ed9c374b9da6775f4857435c5cb418ebef15f39b061b0a2ddb85269aff102e40cc499a9834cb16d24e44d3b3de9de3a26078edfc7162eac5
diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild b/sci-physics/thepeg/thepeg-1.9.2.ebuild
index eacacaa48085..1f333ed8402a 100644
--- a/sci-physics/thepeg/thepeg-1.9.2.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.2.ebuild
@@ -29,7 +29,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/gsl:0=
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fastjet? ( sci-physics/fastjet:0= )
 	hepmc? ( sci-physics/hepmc:0= )
 	java? ( >=virtual/jre-1.5:* )
diff --git a/sci-physics/thepeg/thepeg-2.0.0.ebuild b/sci-physics/thepeg/thepeg-2.0.0.ebuild
index 677e29bea9b9..6d4e9927f49d 100644
--- a/sci-physics/thepeg/thepeg-2.0.0.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.0.ebuild
@@ -29,7 +29,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/gsl:0=
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fastjet? ( sci-physics/fastjet:0= )
 	hepmc? ( sci-physics/hepmc:0= )
 	java? ( >=virtual/jre-1.5:* )
diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild b/sci-physics/thepeg/thepeg-2.0.4.ebuild
index 1591dd59d177..93ed41abb780 100644
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/gsl:0=
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fastjet? ( sci-physics/fastjet:0= )
 	hepmc? ( sci-physics/hepmc:0= )
 	java? ( >=virtual/jre-1.5:* )
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index c3d459400e57..b0bef55f0999 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,8 +1,8 @@
 AUX vgm-fix-FindCLHEP.patch 2191 BLAKE2B 465bd6dfca5aaedaa85759092d4d66a65f5df8a3be9a78bfd5edf0630e5ea733f23d14a4d892e272d5062927ff2622560987f566d130324cbdb96c097d083800 SHA512 24d6cd832e496ebe573ee6b8a95ac7a777c16919626f9b7019d260295d12766f89f5832bb3d5ca794eb28dbd293828935a92627f11ca55381c6f7645f61893ac
 DIST vgm.4.4.tar.gz 3064087 BLAKE2B 845d04fa3ebaaa07f90ef7f216cac10e5ca4129ebbd6161e3fecce39663379b2575026186fe2b88ae8bf08f71bed6d8afcbbd5d7aa9922d37b3f9ed900d35a33 SHA512 500ae0e2ac66b580bbc26b6cd1a8bd6d6e3127c99e6fe6babe5825406e576d72da5cd76d22d0d1b82d7df9eb74ddddf084ee9a96b544c97af5b12cbf948d3406
 DIST vgm.4.5.tar.gz 9602541 BLAKE2B 183c8ed91546e5421c4f1a873a48285e9d2ab6bf4bb6a7bb7b46ab2c3c80a5dfc50cd5f97890c3994ada67014067349726e9f4d65cda1e1e4f1ae9484a4249ef SHA512 a873e24ed2c6cfc09d1828b60af9059a0bee341410e5cb77c9312aa72f1650a913779a0ff929d98910f01fcc5a3e6a04b352dd1a780a8bf60b1fa925b1985491
-EBUILD vgm-4.4-r1.ebuild 1721 BLAKE2B 366fad0e67d17463a4fec93397b4971c5503ee9f078e5e0c6211f611d131dd608e87ee1ef9166504679762833c7b588b02b58c0c3a0f5edf3d9df2a4a57a8419 SHA512 d29bb3066d2d791516c1cdf2b2ac9c6ca2808d5a823d93c6b1eb134242c227167368d01f39ef1f089b8ac5b5b87e5adc5a6e611db8ccd216e207216a84f1355c
+EBUILD vgm-4.4-r1.ebuild 1697 BLAKE2B 75b9591434bb99e5bea85f662326394930193e56ec62d9398ef345f16f4c760b9e9f832c0e3f70afbd81f471677c2d451a88c5fe6dc3707bd3d6ff1b98675aa1 SHA512 25a49d0867722fde3af879934b1f3a7622be8409ce8682f86d4b90eca9d9eac6c6c090f2d93cda62886ab84220eaa790ad0ca2aaa600eac626ddfe60eedd1e09
 EBUILD vgm-4.4.ebuild 1687 BLAKE2B 465f91a5943a39258201724d093dc5cefdf20fe5179c3215945f97bd8fea6b5b4c059daf9a8b652c604463bf3cdfce47c575814ad0db0112dc0e7588b1e807c6 SHA512 01dadc26e284d521c00cbeaa46ab1a3de612435c5e667e57d21f82b87bb9bb099a238c07a9b67bfb368edaa27447c265e666fd2330ebab867a8c15f496567be7
-EBUILD vgm-4.5.ebuild 1715 BLAKE2B d1d06fe80c0a5cf39a74f34ac6b29b9acbce34af59be13629992715aaffc670a6c03b1e207bb703b54a64cf6bb150dd72c5f6bd3c9ee891a4ab450ba64e64ad5 SHA512 f02655156a3121ddc548b5458f502ba99f679f7d4848c711604831346e0ec7766b83dcdadaaa1de29bcf4f9dca64fea0f6c7c398f945ca14ca26aff4b08e49da
-EBUILD vgm-9999.ebuild 1666 BLAKE2B 73852a06c377acc0d6ade08307c30ea5ffad324d0ebbdadc68e1fad2c178067194d4b86068a5c001b15805058a5c64f2bb6c5f5812516a443f6a7c53ac22b2ec SHA512 a921ddb66ca298c7f6d54e3942302bef415367f8e75813d00d9dfe332d96ceb2fc6f6d268fd90bd60142881abc8996ed99ff47888a2711fff8a56e0260a430ad
+EBUILD vgm-4.5.ebuild 1691 BLAKE2B 1cb8c51a0177247a5346b4562f08db7fe6f2602e8198b5100d23e0ec444539baffcd5c4ee81249db872eb12aeb803c2f715fa2ab2eacafe7e4c05427c091a99d SHA512 c917101788a8eac679dc02fd5ce65f696cae1f5c40bac7506521706b32fd8a2ae2ad3fbcebc17332e0003bc1369d78b8dc35bb75f3aad0c37500984832a5fa42
+EBUILD vgm-9999.ebuild 1642 BLAKE2B 63346114dcfe38e30e6e552c78c5c4f05c7991bf02d01df29e6ae1e63c1934b5e56d1b149a64cdd37a1ac9fb9fb29c7b491927875596db7229bed77e4e878792 SHA512 37f9b27b5ba784e56d81247684c55e3d2c207020af6e5b89fecf53fe6010a8de10c84e1525b3da596848f123d45d02535f1d346849e270da9d0a1fd2e499ea28
 MISC metadata.xml 887 BLAKE2B 2bed4c9deeb9bbda28704462bf45eaf31d810b115608bd66ccdd8f5e8494556b87962301395d0f0cbf229aaf8d497b1f07b9821600d6c101aad34c5ef49cf643 SHA512 5e52d57dc9cc78020a147c4984aa037b3441f910f6288e75a3919398a0b22d16f312fd910bf0a692bfb039c3540f2854e4f2c660f7d3c4a4c23cbc63f9885dbf
diff --git a/sci-physics/vgm/vgm-4.4-r1.ebuild b/sci-physics/vgm/vgm-4.4-r1.ebuild
index ccda066630dd..1ef3af47246f 100644
--- a/sci-physics/vgm/vgm-4.4-r1.ebuild
+++ b/sci-physics/vgm/vgm-4.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -59,11 +59,11 @@ src_configure() {
 	else
 		mycmakeargs+=( -DWITH_G4ROOT=no )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
 		cd packages
 		doxygen || die
@@ -76,7 +76,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=( doc/html/. )
 	einstalldocs
 }
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild
index 16c08cfb9320..66433421fc47 100644
--- a/sci-physics/vgm/vgm-4.5.ebuild
+++ b/sci-physics/vgm/vgm-4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -59,11 +59,11 @@ src_configure() {
 	else
 		mycmakeargs+=( -DWITH_G4ROOT=no )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
 		cd packages
 		doxygen || die
@@ -76,7 +76,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=( doc/html/. )
 	einstalldocs
 }
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 8443bf3f67a9..675c07b071b1 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -56,11 +56,11 @@ src_configure() {
 	else
 		mycmakeargs+=( -DWITH_G4ROOT=no )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
 		cd packages
 		doxygen || die
@@ -73,7 +73,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && local HTML_DOCS=( doc/html/. )
 	einstalldocs
 }