gentoo resync : 03.11.2019

4 files changed, 2 insertions, 144 deletions

diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index a06e46d8a7b2..d373aeebfb47 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -3,12 +3,7 @@ AUX gimps-25.6-conf.d 254 BLAKE2B 44cbf88e3bba505846396c87a68c879d03f76f7f0d0334
 AUX gimps-28.9-init.d 722 BLAKE2B 8d55dfbb4166da76e2621097c85165ef49ade916d4ac76576b2abb249d79e0dcd7e37e060a0996576993e6510c051099d6bb7bed6da4ec8800f51b964803c3a8 SHA512 8a7501d8347aa0974268c910890550a2ce5a3d11606670dd69d5e5ccb1046e2994bc5b1f04f9e9dae89174a5a69f9158757079b835fbff50fd25f983190521e9
 AUX gimps.service 283 BLAKE2B db6c0c777d514aa0216c1af087418ead25561ffa950752e237e1633a6b6414b56732b84aabd11533ea3dab34f8657358370d21c4730f551d0ff5cf03006b7ad3 SHA512 710c7d075d5542364746b837f2b62257011abb8f45862bf0a1fabd53adb182b5fd969256c7f3221506fef38e81ab1b0f4698efafc1ca7908d9e2d42dee386d8b
 AUX gimps.tmpfiles 38 BLAKE2B c306d739ed0a0cc8bb4c80c7051ad93326cf0054d3f7fd61c4ed8a7d518356d521f7d3c3202d0b8b69723b8e7178457a34c65e92732eb15e8e64c3dff468ae2a SHA512 61c5eda13289175cdf55704442ceab4d5391d24cfa49f04155799fc2798e5ad5f1e624802e1c04b99685b1560f9898d1b0fc0c15c82251d1a765dd5de93024d8
-DIST p95v294b7.linux32.tar.gz 5455201 BLAKE2B 2d542c06fb490f6619884be3cd510fb77e130184d2b7d3bb44fd375fcd7c95e38ef4cf80ed01079c9f395d6e8a526930a07357f20e14277beba4e232f4e2ca27 SHA512 21ee6a8f0a4482bdb22d80093b24a8b9d7e091577628dc797ad01d3a0ab98e946814c70a6313e2624fffa6658454707f88d24608e107048fc6361d15aa5a7fbe
-DIST p95v294b7.linux64.tar.gz 6244730 BLAKE2B ca5d0aad96e9bd5fb1bcb232435a26b7d8c2b9d869a6dc638d883fb892013df7a823abb0dae4545c2191b5f39b9cd29ee83400f452fbe63255f2dca899ad6bce SHA512 0579ea9ca1977884c8c50f8c8655b0fef1d5e2b456adca23d6d93542734727f265dc8f784c27fc9510c89afeec7386d4a9a9e9b5d691a97fed8189bef5577b3d
-DIST p95v294b8.linux64.tar.gz 6244091 BLAKE2B ec02f582296f8959765f97526646f2f4a679a2b61d3c8e8efc971bf765c7f3b5cd4a9e2667661bcc6b0a3a088d095671af9b1f371f0e671de495935d582bf8e7 SHA512 bec8ce2081e9e349317441bbaa724e5d21ddfa1e328ccb6a17af796d41b201d96b2835fc2afcd68e350b22213225812cafdfca7973a7cd2071c1460188b3245d
 DIST p95v298b6.linux32.tar.gz 5696871 BLAKE2B e2c68c4dac1e4cfbc2e44542665326d33a7929585928ca720569b918f5286c97b93acc45c03d0514cadb29e87e5c6ca103e69953417df8405e36998c5768896b SHA512 6f82973237c59cd548fe7bfc08c51a62cc7ac4e98a8539e5dfbc23eec21fb6f46e1534dc834852557af61fa1a6fc9b634d9117d85fce37f8f6f9189fb724518b
 DIST p95v298b6.linux64.tar.gz 7032597 BLAKE2B de4de01d68caba4530d5adca165bfaa28cdb7e276b44355b200245cac6bab80bc05885a994c06331c2f66bdcd236c8bdb6cc8206ca40fb583bce6dc98eced7b1 SHA512 cb0ea195f4167e22bfdeef02872205a40ccd4d110abc9c354a413284db9aef1dbf9888ecdc3f09262e0d1033c0e4bed1f23d4d966fb58c437673a81095252bd1
-EBUILD gimps-29.4.7.ebuild 1746 BLAKE2B 5e8cf0ed95e081dff81e1c69a4bc18506fa5a3cd4d242760a69f4d8cbe0b279a5353d2caf11b82b500727b0d024bd1ed95c3d41ce63cdd08d6cb0011b5273c30 SHA512 3ada7b591a505801c538dee5c70234ee354d7053fe12b07543eefd67e25d8d0f8cf7ceaf064ecd5a936e4df8f9d142a87205dad945b7d594d9933a2735580a3d
-EBUILD gimps-29.4.8.ebuild 1675 BLAKE2B 97a5f7873735863b936afffa3a4086b7600c95abcb83527cfd6ec776dae035724681d27c52cc694ee81dc8d28a477daeccca6bc383b46504f303e023adeacb94 SHA512 abac150f784346a2324e60c7b1b107cdf9aebfacf4dc1e102f2212afcc91e0256369c635d4687d3abd95b191d6f1efede52240ed4276a7020e324cedf6725b88
-EBUILD gimps-29.8.6.ebuild 1722 BLAKE2B 9cacd6cbceb16f92812b879ebbf8baaaeddc866dcd4789a1deb9e5e128de502b61a9800ca308b8137f45378a43d4e2d4a55e089782728a580dd738eaae960059 SHA512 79e9deaeead01814daf5a578620a3e4ed93817706c60c54b2890abe0c911ba0061bca0bcd0b07e72281ce50869f9b20beec4aedafe93beed1949a57f8db19caf
+EBUILD gimps-29.8.6.ebuild 1720 BLAKE2B 725dcd29f5e7bbc138659b9ff3a37abd60fd344518726a38756b1cc4c3e8eaccc08a7091b574a301106d7f5ae26abff79c4a3fdcdb29dd44df1d7a7f5798ce23 SHA512 9bc60af87a0e44f6532927bb1465f1b76e0d9c264c75cb9b9beafd33ca0de1655e187572a3e89dfae541c79f3621ab43678a45f2935d74e2897d9edc7c39f5d2
 MISC metadata.xml 529 BLAKE2B a6e3550d128d6c4801029726feb868aa1cd1017b8a2f6f7ebbb3743a7b2190d40db06d22eb4f8ce94e35ab5e6b1f213afdf179fe7777501ad87457be43d9af44 SHA512 a7fb9bd05f987e1d48a04b70e78cbb3906927197793870435fee8b68dd9da623a68fc30ca96d0173952414d9741674ba2cc2c3f821dfd7b302f91f09e887a362
diff --git a/sci-mathematics/gimps/gimps-29.4.7.ebuild b/sci-mathematics/gimps/gimps-29.4.7.ebuild
deleted file mode 100644
index 06d6076c1f46..000000000000
--- a/sci-mathematics/gimps/gimps-29.4.7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils systemd readme.gentoo-r1 versionator
-
-DESCRIPTION="The Great Internet Mersenne Prime Search"
-HOMEPAGE="https://www.mersenne.org/"
-
-# The author has finally caved in to the pressure of putting the build
-# number in the package name. Some dark magic necessary to get to the
-# package name
-
-MY_PV=$(replace_version_separator 2 'b' )
-
-SRC_URI="
-	amd64? ( ftp://mersenne.org/gimps/p95v${MY_PV/./}.linux64.tar.gz )
-	x86? ( ftp://mersenne.org/gimps/p95v${MY_PV/./}.linux32.tar.gz )"
-
-SLOT="0"
-LICENSE="GIMPS"
-KEYWORDS="-* ~amd64 x86"
-
-# Since there are no statically linked binaries for this version of mprime,
-# and no static binaries for amd64 in general, we use the dynamically linked
-# ones and try to cover the .so deps with the packages listed in RDEPEND.
-# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
-
-DEPEND=""
-RDEPEND="net-misc/curl
-	>=dev-libs/gmp-6.1.2"
-
-S="${WORKDIR}"
-I="/opt/gimps"
-
-QA_PREBUILT="opt/gimps/mprime"
-
-DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
-
-src_install() {
-	dodir ${I} /var/lib/gimps
-	pax-mark m mprime
-	cp mprime "${D}/${I}" || die
-	fperms a-w "${I}/mprime"
-	fowners root:0 "${I}"
-	fowners root:0 "${I}/mprime"
-
-	einstalldocs
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
-	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	echo
-	einfo "GIMPS data files were not removed."
-	einfo "Remove them manually from /var/lib/gimps/"
-	echo
-}
diff --git a/sci-mathematics/gimps/gimps-29.4.8.ebuild b/sci-mathematics/gimps/gimps-29.4.8.ebuild
deleted file mode 100644
index 6b8dcbf65197..000000000000
--- a/sci-mathematics/gimps/gimps-29.4.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils systemd readme.gentoo-r1 versionator
-
-DESCRIPTION="The Great Internet Mersenne Prime Search"
-HOMEPAGE="https://www.mersenne.org/"
-
-# The author has finally caved in to the pressure of putting the build
-# number in the package name. Some dark magic necessary to get to the
-# package name
-
-MY_PV=$(replace_version_separator 2 'b' )
-
-SRC_URI="
-	amd64? ( ftp://mersenne.org/gimps/p95v${MY_PV/./}.linux64.tar.gz )"
-
-SLOT="0"
-LICENSE="GIMPS"
-KEYWORDS="-* amd64"
-
-# Since there are no statically linked binaries for this version of mprime,
-# and no static binaries for amd64 in general, we use the dynamically linked
-# ones and try to cover the .so deps with the packages listed in RDEPEND.
-# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
-
-DEPEND=""
-RDEPEND="net-misc/curl
-	>=dev-libs/gmp-6.1.2"
-
-S="${WORKDIR}"
-I="/opt/gimps"
-
-QA_PREBUILT="opt/gimps/mprime"
-
-DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
-
-src_install() {
-	dodir ${I} /var/lib/gimps
-	pax-mark m mprime
-	cp mprime "${D}/${I}" || die
-	fperms a-w "${I}/mprime"
-	fowners root:0 "${I}"
-	fowners root:0 "${I}/mprime"
-
-	einstalldocs
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
-	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	echo
-	einfo "GIMPS data files were not removed."
-	einfo "Remove them manually from /var/lib/gimps/"
-	echo
-}
diff --git a/sci-mathematics/gimps/gimps-29.8.6.ebuild b/sci-mathematics/gimps/gimps-29.8.6.ebuild
index ead2bcedc1c0..262c362cf14f 100644
--- a/sci-mathematics/gimps/gimps-29.8.6.ebuild
+++ b/sci-mathematics/gimps/gimps-29.8.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GIMPS"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 # Since there are no statically linked binaries for this version of mprime,
 # and no static binaries for amd64 in general, we use the dynamically linked