gentoo resync : 25.11.2020

5 files changed, 10 insertions, 14 deletions

diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index bc6091542f66..08b71bd4391c 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 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
+EBUILD thepeg-1.9.2.ebuild 2318 BLAKE2B ff23549389bfbec09217448d6a3d802965291e25a3251d4316049d0b19e8070434dcd5935ec5bb85fca44ffa8ae2dee6b542ffe44700e2ec7ddb7020a18b7edb SHA512 3e82f3c7cac0ba6e84883ae909ab37fc10db688ee842ece8b7a7125b25c43c1234f45710a843e8fd61db92090d0fd2872608a48a6c9e991c47db571de270e53b
+EBUILD thepeg-2.0.0.ebuild 2318 BLAKE2B 6a3c5df9bb82afcd0ee0beb063a5e37aae6f1ab50e923fb4cfc3befc87f2ee71105db578e90d81ad350bc25b3c25407e7536821364c7e71b7dd6a14d8be781cb SHA512 5950b51024e40b4b0a3908792b5fddd2cad4ddfbc7347f38faaeb21a159b63429137f8c4cb8a481addc0ee81df17a161fcaae6832549491bb2de45ba516c992a
+EBUILD thepeg-2.0.4.ebuild 2239 BLAKE2B e52748a673196c5b1415a0fe1d0ea05a89c11e13a867f5ff01004d6e9fd5350e27a8af77a628d8c0ffa4c00605b48053d15e87ad0f75f5e282495b451a6449fe SHA512 a52226c1d7a4c2170048f783470fb9bc1c8107eb21816540a52ec9a581ce3179e209828cf53243c8dd1e4b69f6fa9713ebf5f9d5c8f520498136a90db82dfe48
+MISC metadata.xml 992 BLAKE2B 2c3d61f64d4f24d1cf68d1663ac9ab75fd711de6f851d462226aed95551a6daa4b19287dc4ccef303178a085e756dd9ce5cf2555d965260d8b7b86a4d771ddb5 SHA512 c6412d6cc97da21ba7774d03f4bbc69d53d9bc82fab4d45940f61a318fb67bb58dc4e4668e831b4e2b18efac5d19898229a4e5ce515cd7722372e5aa18685e01
diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index b98a9450c6f2..4f8dcee86a89 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -19,6 +19,5 @@
 		<flag name="hepmc">Adds support for High Energy Physics Monte Carlo
 		Generators <pkg>sci-physics/hepmc</pkg></flag>
 		<flag name="lhapdf">Adds support for <pkg>sci-physics/lhapdf</pkg></flag>
-		<flag name="rivet">Adds support for <pkg>sci-physics/rivet</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild b/sci-physics/thepeg/thepeg-1.9.2.ebuild
index 1f333ed8402a..dfe097cf8ca0 100644
--- a/sci-physics/thepeg/thepeg-1.9.2.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.2.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2"
 
 SLOT="0/18"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,7 +34,6 @@ RDEPEND="
 	hepmc? ( sci-physics/hepmc:0= )
 	java? ( >=virtual/jre-1.5:* )
 	lhapdf? ( sci-physics/lhapdf:0= )
-	rivet? ( sci-physics/rivet:0= )
 	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
 	test? ( sys-process/time )"
@@ -62,7 +61,7 @@ src_configure() {
 		$(use_with hepmc hepmc "${EPREFIX}"/usr)
 		$(use_with java javagui)
 		$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
-		$(use_with rivet rivet "${EPREFIX}"/usr)
+		--without-rivet
 		$(use_with zlib zlib "${EPREFIX}"/usr)
 	)
 	autotools-utils_src_configure
diff --git a/sci-physics/thepeg/thepeg-2.0.0.ebuild b/sci-physics/thepeg/thepeg-2.0.0.ebuild
index 6d4e9927f49d..22c553e8f5dd 100644
--- a/sci-physics/thepeg/thepeg-2.0.0.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.0.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2"
 
 SLOT="0/20"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,7 +34,6 @@ RDEPEND="
 	hepmc? ( sci-physics/hepmc:0= )
 	java? ( >=virtual/jre-1.5:* )
 	lhapdf? ( sci-physics/lhapdf:0= )
-	rivet? ( sci-physics/rivet:0= )
 	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
 	test? ( sys-process/time )"
@@ -62,7 +61,7 @@ src_configure() {
 		$(use_with hepmc hepmc "${EPREFIX}"/usr)
 		$(use_with java javagui)
 		$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
-		$(use_with rivet rivet "${EPREFIX}"/usr)
+		--without-rivet
 		$(use_with zlib zlib "${EPREFIX}"/usr)
 	)
 	autotools-utils_src_configure
diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild b/sci-physics/thepeg/thepeg-2.0.4.ebuild
index 93ed41abb780..69fd55af01e8 100644
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 
 SLOT="0/20"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -31,7 +31,6 @@ RDEPEND="
 	hepmc? ( sci-physics/hepmc:0= )
 	java? ( >=virtual/jre-1.5:* )
 	lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
-	rivet? ( sci-physics/rivet:0= )
 	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
 	test? ( sys-process/time )"
@@ -64,7 +63,7 @@ src_configure() {
 		$(use_with hepmc hepmc "${EPREFIX}"/usr) \
 		$(use_with java javagui) \
 		$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
-		$(use_with rivet rivet "${EPREFIX}"/usr) \
+		--without-rivet \
 		$(use_with zlib zlib "${EPREFIX}"/usr)
 }