gentoo resync : 03.03.2021

3 files changed, 3 insertions, 72 deletions

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index 3e5d58a46c3b..e7d7ee3d3f9d 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -12,9 +12,7 @@ DIST lutp0613man2.pdf 2902047 BLAKE2B c2f8e8f9031c843933cd927b32921813b580a18117
 DIST pythia-6.4.18-examples.tar.bz2 36366 BLAKE2B ec655014d3904b66da4a1e748a37c366c2adf9e914b9abf8c38968dcbc09129badcccd2705bc9437c05e73ee4489807835383546f55fbc9cd65399fb507e704e SHA512 ba921379a6df4ca417b60ea5b78af506f13135cdf896fa6beeca9713428ad6f298c94c0fe65fca3e583f8f268dcf84ebe4f1f81b46fd865d5f641f7c1e9fa7e1
 DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b980554046a57979cc72c80067be96f00b5056dee29fc7f0039ddae074560823427c3a0e24e59f69662f08524fbdcd4 SHA512 f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
-DIST pythia6.tar.gz 567451 BLAKE2B c32a67d87fc6f22027d3d9551256af5a0151e494fbae02c5d14ccf08595f1ebf49b638a1c33f7a52214e8bbb510756a72ef0f68f5dc8037e2a6acd3fbf290cfd SHA512 baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1
 DIST pythia8226.tgz 17639842 BLAKE2B b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad SHA512 85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0
-EBUILD pythia-6.4.28-r2.ebuild 2020 BLAKE2B b97090e1474f9a260aa9d5ce0502e8640f9ea723bdceb31feb153dc50e74e7f27267e17e7fd396768f8abe9a2b5ad8243599c5acddb0a08f93fb882bba6d5139 SHA512 c856e72b4a243f88dbc2cdffc87d03e5675bbc871a4b67988bb2f33e5d9b39412e5c862fec6a431bbea93ab8d39e68cb878c29a93090f6b5eb9d6ca1f6d16df7
-EBUILD pythia-6.4.28.ebuild 1864 BLAKE2B c89b5effbe414331507c920841617698affb57152a721be748a336cdd26e1cb492d273e9f43e60e485d4ad7407fbda88c2578b72f2c56789026c7e0bccf76999 SHA512 9e3fa32d791672b3aec15f779700fd33a6a83488ca315e365e3fdc7eb88ee3a8405dffcc6eda705d3334c79e8a726c1130ba97b2baf0d91004c881b1e922a2af
+EBUILD pythia-6.4.28-r2.ebuild 2015 BLAKE2B 8e26f38ac4ed140dbd49d9149a9bf56388d9809a26beb27bcd87f2f09503f9bdac7e28ea96413f0f849bfb1cf32c71f32efc2d8c1ca68a8d287168fb35ec5ddc SHA512 9d8527a168976ec0da2aff8ff220a294df566d9581913cb4561ef738eb33a6ec28b77e162fc5b6977cb06359d2264e198821833f5801293ab56a50d20431aaa8
 EBUILD pythia-8.2.26-r1.ebuild 5732 BLAKE2B e93959f6db754f19d410abf4b4c4b25723857a768106cea744374d7195a6fcad6534f683414fbbe3c1512732e4a1353a1f5f136d672aa9e98d1fa6e29ddd0644 SHA512 ff3805db1893b4204f2d6de709b48bb6105ef23c535ecd7c53018a754b56d2f1a319b6ffec7cfca1ba3c10752a6deeb84272f50d00a62e3cd4a85a69f784b571
 MISC metadata.xml 1298 BLAKE2B 3a8448cffc50ab81baf30e783a7d30387f4cd61be3f1a35ccdc9277dbb33d7178bbe9e103d189dd78a6775fcfa563480363448308a583ab2d9b513eb6e6f2b46 SHA512 b991381193c62d05d01ea82c74a2fabe3968683b4a1e0914027768dbbc3d2b52a85584b77b1b7274e77222e10da0aaa1a55d3982b423bc7c2b5deb4d775e6389
diff --git a/sci-physics/pythia/pythia-6.4.28-r2.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
index 86fbe7d4358e..f5761743a612 100644
--- a/sci-physics/pythia/pythia-6.4.28-r2.ebuild
+++ b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ SRC_URI="
 
 SLOT="6"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
diff --git a/sci-physics/pythia/pythia-6.4.28.ebuild b/sci-physics/pythia/pythia-6.4.28.ebuild
deleted file mode 100644
index af2b9cbbb1be..000000000000
--- a/sci-physics/pythia/pythia-6.4.28.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools fortran-2 versionator
-
-MV=$(get_major_version)
-MY_PN=${PN}${MV}
-DOC_PV=0613
-EX_PV=6.4.18
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia6.hepforge.org/"
-
-# pythia6 from root is needed for some files to interface pythia6 with root.
-# To produce a split version, replace the 6.4.x by the current version:
-# svn export http://svn.hepforge.org/pythia6/tags/v_6_4_x/ pythia-6.4.x
-# tar cJf pythia-6.4.x.tar.xz
-SRC_URI="
-	https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.xz
-	https://root.cern.ch/download/pythia6.tar.gz
-	doc? ( http://home.thep.lu.se/~torbjorn/pythia/lutp${DOC_PV}man2.pdf )
-	examples? ( mirror://gentoo/${PN}-${EX_PV}-examples.tar.bz2 )"
-
-SLOT="6"
-LICENSE="public-domain"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-src_prepare() {
-	cp ../pythia6/tpythia6_called_from_cc.F .
-	cp ../pythia6/pythia6_common_address.c .
-	cat > configure.ac <<-EOF
-		AC_INIT(${PN},${PV})
-		AM_INIT_AUTOMAKE
-		AC_PROG_F77
-		LT_INIT
-		AC_CHECK_LIB(m,sqrt)
-		AC_CONFIG_FILES(Makefile)
-		AC_OUTPUT
-	EOF
-	echo >> Makefile.am "lib_LTLIBRARIES = libpythia6.la"
-	echo >> Makefile.am "libpythia6_la_SOURCES = \ "
-	# replace wildcard from makefile to ls in shell
-	local f
-	for f in py*.f struct*.f up*.f fh*.f; do
-		echo  >> Makefile.am "  ${f} \\"
-	done
-	echo  >> Makefile.am "  ssmssm.f sugra.f visaje.f pdfset.f \\"
-	echo  >> Makefile.am "  tpythia6_called_from_cc.F pythia6_common_address.c"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc update_notes.txt
-	use doc && dodoc "${DISTDIR}"/lutp${DOC_PV}man2.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/examples
-	fi
-}