gentoo resync : 14.05.2020

4 files changed, 2 insertions, 89 deletions

diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index 4823d1c91fab..da4bf427f97d 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -2,10 +2,8 @@ AUX corosync-2.3.4-docs.patch 842 BLAKE2B 363e26872497c2724ba54dee2e6458e5b101bb
 AUX corosync-docs.patch 1022 BLAKE2B 5a211263e466d934cfb591cbca4a8e1f2c7dd5895e6dd7397ae78f1fc1b1fc88fb9f7194df10b2a7a777cb6a9a2cec7c2a7a89d57d0ba1135040f7fb378c1586 SHA512 49f8b19cbfd5f0b1f0f927a7aa8cd2f0ad24ff958cf2baf06e8a9d87858fa01cf3656ba05189a085e265a2d8b1b320ca7f18b3a4d405d73ff05f1876ebe14960
 AUX corosync.initd 668 BLAKE2B 52a838b1cc64103a69a3f67573b0b752ec9eef434c9fd2183478d32a6dfda825e96e41333e16f0aa7431937323ad3d5329c04037baec83717624a884d2480bcb SHA512 a514ac91e4b691c7e7e65a45dbb49c1da408690012d750ff3e4cb1c45e629df070019382f9b7c1dbcf8342b1edc15b296433d1f589334effde843434005f0969
 AUX corosync.logrotate 93 BLAKE2B cc8f22c668dfde3fe4dac13fb295be81ff1ca13c8081557f87570952117109b68c7101045990dfd8aea5f56c8a8078d12383f8cb040b098591678c8294dd52bc SHA512 3c65eb01a33a6fa51befa8ce466cc8a35a06a19816b77610b83c18f9372dccdbd33354fc8568e63fe165f2c2aa598b6a5d15615939f12e3385b4c3e1b91a6ec3
-DIST corosync-1.4.7.tar.gz 420596 BLAKE2B 7818b1d58f2ce743b990fd275908d0b72a63dc8f243df2fdb1b369ace635cd4602b19eda96d59fedb980c46b38f12a5c5f3592d2915a559c5b89e4390751cccc SHA512 275a4372cac13789d93e224e4a7853953d6111afc534f9e897deaf064d5d96bb0db932a02a9212b5a0d2ca53d3f56133073f519460a9ca3573f5403642db34e1
 DIST corosync-2.3.5.tar.gz 428253 BLAKE2B be9fc2b27b60357acee6dee013bc95c08045c114acafc62eaa82a1821f07ff76b8821b9d06f31246b9978f8aef46e3a9e1a2d61ca74465bc74d4140c0ad0d0fa SHA512 212a95d8a68a2941f27c9ec22750a88598744d6fd4db6b46abe0b4cdfa988d3906f760bdf67c403d8c6d0a04da64f29ec744fb68ca51c7269ba58e306553cee9
 DIST corosync-2.4.2.tar.gz 547204 BLAKE2B 1b440e84b25263ea866bd66f9837a3bdbbc790d26a38d10a033d67bb0ba48dd58d6b515879dd0ece75ffe78c8a150c1e5ab8d0eb312e701abdc36eb5cb4dc520 SHA512 45a4d2570d5d096e6f42070f701fdb2aaed26812b6a75f73ea415cf409b33343f8bc090b4fcf851ab971ca4b17925f239c31a3d9eafe4841dfbeb56537b2c78c
-EBUILD corosync-1.4.7.ebuild 1388 BLAKE2B a831d2b50bef790120138c1125fca8356333d88d249c30e0b4ae4e9dc802a5f5d91e2eceda59568c936c9b400dd9acfbda055db60b1172b7d0ce9683cc3ec61f SHA512 1afed4ea8c3e3d719dceaee3c261151108b852232c4c0b4235b9b65df09b96c545c983e8a7762956535cd66d5b12f275f570a0d51374e02daf70eea9b9ea74c9
-EBUILD corosync-2.3.5.ebuild 2015 BLAKE2B 446cdab62136feed7d66a505c7496b21e669a19f167402e6f8005a633310fd96bcf71953b0cba37c4fabcacd1c77e9eb74b9d460d4452293406a4c51b2602879 SHA512 53567910d981004f1191afccfba9e1c43e4e7ebc0d55f8128b47fa1fce7cabc22148a373937ff9347146a9172ac6df2de2ab7e8d9da3d80b36c4551ca6b0396f
-EBUILD corosync-2.4.2.ebuild 1978 BLAKE2B 1eeb5668e67c1bd8160050a6cb4389e42ec673685f918e716fd95f0b071996172ce2c3d6fac5e9d698d83aad307f3be819c82424a5bd35c83475185485bed34c SHA512 617aba212b7299fe6bb68f87602907a697c316cc80ba95f09460c0103469343fc7f3fcc3b1d598a0532dfd8608ce8eb91ff4db6e18c8dbda486aef0bf35ea18f
+EBUILD corosync-2.3.5.ebuild 1734 BLAKE2B 6357e43ade6d4dd035eb9b8221b0c057a594f8eceb11ea0a5f7245416188e5eab47309f94d5c35a1c3a34a2f89c5d49f55d00626ad4d5b700cbeaa6536f6f90e SHA512 877e3f6103294a8b74cad41f9c044ef18e70e91956c49bf63d0ea80744274b2acc91ac095c43469d3b17c31deef3f3a235b3c237d4884471246f4b592bb71c50
+EBUILD corosync-2.4.2.ebuild 1697 BLAKE2B e7c1a72e2196446528b4f92b726ce52cb6cb9c4a07c3cf08d5d0a699f73c6df087dc99ac94ab9d9a9709ce407e0205b375ade16eff9599c8a2a6aade1f24c940 SHA512 f79e0b72e5a4328f38056c72aaa96a3943ba391e0385beb6e771e6344e88018426b009b50519a4ff49af5c4038a6f6e30615b511dfbf568b14dbd465741b82ee
 MISC metadata.xml 447 BLAKE2B 660930ff9e96851aa0272fafb5547be824e424f9d866e58a13699608eda86c9c45533218d6c1647028bb1c8e5bb6e738087b8ad8f7ddbe7ae94a2ea9eb47ec47 SHA512 9897d127e1d47ee58213ea00d4ebdb536e2316c13633331194ac118ec5a2e782e515a6f1ccb01cd7eafae34bfb032fc2c9ea61a549b9da34bc3e96a988457d03
diff --git a/sys-cluster/corosync/corosync-1.4.7.ebuild b/sys-cluster/corosync/corosync-1.4.7.ebuild
deleted file mode 100644
index 80a190fe8286..000000000000
--- a/sys-cluster/corosync/corosync-1.4.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools base
-
-MY_TREE="bf8ff17"
-
-DESCRIPTION="OSI Certified implementation of a complete cluster engine"
-HOMEPAGE="http://www.corosync.org/"
-SRC_URI="http://build.clusterlabs.org/corosync/releases/${P}.tar.gz"
-
-LICENSE="BSD-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa x86"
-IUSE="doc infiniband ssl static-libs"
-
-RDEPEND="!sys-cluster/heartbeat
-	ssl? ( dev-libs/nss )
-	infiniband? (
-		sys-fabric/libibverbs
-		sys-fabric/librdmacm
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( sys-apps/groff )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-docs.patch"
-)
-
-DOCS=( README.recovery README.devmap SECURITY TODO AUTHORS )
-
-S="${WORKDIR}/${PN}-${PN}-${MY_TREE}"
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# appends lib to localstatedir automatically
-	# FIXME: install just shared libs --disable-static does not work
-	econf \
-		--localstatedir=/var \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable doc) \
-		$(use_enable ssl nss) \
-		$(use_enable infiniband rdma)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	rm "${D}"/etc/init.d/corosync-notifyd || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	keepdir /var/lib/corosync
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.a || die
-}
diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index 3e4bf6a0f565..3485dedb6bb1 100644
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.5.ebuild
@@ -73,14 +73,3 @@ src_install() {
 	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.{,l}a || die
 
 }
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 2.0 ]]; then
-		ewarn "!! IMPORTANT !!"
-		ewarn " "
-		ewarn "Migrating from a previous version of corosync can be dangerous !"
-		ewarn " "
-		ewarn "Make sure you backup your cluster configuration before proceeding"
-		ewarn " "
-	fi
-}
diff --git a/sys-cluster/corosync/corosync-2.4.2.ebuild b/sys-cluster/corosync/corosync-2.4.2.ebuild
index 49840bb0216f..bdea670c8da2 100644
--- a/sys-cluster/corosync/corosync-2.4.2.ebuild
+++ b/sys-cluster/corosync/corosync-2.4.2.ebuild
@@ -69,14 +69,3 @@ src_install() {
 	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.{,l}a || die
 
 }
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 2.0 ]]; then
-		ewarn "!! IMPORTANT !!"
-		ewarn " "
-		ewarn "Migrating from a previous version of corosync can be dangerous !"
-		ewarn " "
-		ewarn "Make sure you backup your cluster configuration before proceeding"
-		ewarn " "
-	fi
-}