gentoo resync : 16.04.2018

3 files changed, 2 insertions, 61 deletions

diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index c2c1c40d84c4..f7e1591140ee 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -3,16 +3,14 @@ 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.3.0.tar.gz 683458 BLAKE2B 7beaead5bde2b5cae370c89d3217b6388024dee4bcc4cf495b34befece9df9191799d8b8b2f11a0d7da878022dfa63b407810efc759b6a958c118c339f4ad7df SHA512 30c8b6f3f8b82101e2cf65f2ecd2dd43f6dd2ab79585e713f23786be7732707395c161d1a57c7401dd05f4751ccc051ccaab81461be9bc964ef0543ef4699114
 DIST corosync-1.3.5.tar.gz 698897 BLAKE2B 48507120a51de812f2f4dd4607eb86e5f4df05f9928480b08575788f17e39c2998912571fb7e2f4761f108b138683325ae358dae77ffa142348b3ddfb2b639f5 SHA512 74920fed67af72517076d5a85688f59f3ef81b4aa773147a96f58cbd57b3b150365b7eea4ef14c4e43c0961d9d9939d734526318b1af462e22329077a0cdbc3e
 DIST corosync-1.4.7.tar.gz 420596 BLAKE2B 7818b1d58f2ce743b990fd275908d0b72a63dc8f243df2fdb1b369ace635cd4602b19eda96d59fedb980c46b38f12a5c5f3592d2915a559c5b89e4390751cccc SHA512 275a4372cac13789d93e224e4a7853953d6111afc534f9e897deaf064d5d96bb0db932a02a9212b5a0d2ca53d3f56133073f519460a9ca3573f5403642db34e1
 DIST corosync-2.3.3.tar.gz 411784 BLAKE2B a709fe7889fbbddc37f2915d49740fe0061e3d3ad330998c83a5375cbf596fe0b2ecc9f3f074631ef733227e3a64335f6e65e2c457d68f1f4b431fc2c3f35f7c SHA512 66b479b2114641f02cd910f1bc3458948d5634b82e2019d7b1ea919f5bbb4817e91dddc33de061ff01dc4f12a3622b3418b7787e81a6f340d23043857cc9442f
 DIST corosync-2.3.4.tar.gz 420184 BLAKE2B 3d83a7990ba98a8a026c8e50e7b972de5e5cdf7154658c5dd914537bcf9c2016ef6f7e5fa3b18bb025b24c2eb6c64185ea9627ba1d607135562d55d930758ead SHA512 30914552b8af69ce37a5ea98f17a41f30fa01204ca8beee8218d94b8421769504b90c8e62f1e7222afb6429ead8a2d09ca36e71461c767a2b9bf662637f78bb0
 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.3.0.ebuild 1213 BLAKE2B 9968bd752f049d70c73db512eb8d80d32fe15e7b53e58c4a80d64a14383a48ceb49d918b9691147130ebfb9c6bb5160ce549019c3ee76c972ed4d5e5eb0ecaa6 SHA512 2929f6fdb7100a034039c4737ada596bf7ff5fc078dacfde4b8f2a7987ad88e1e819debe943aac324c71dd7f95ecf6f105952bdc23dfe869c01371b4e26321ec
 EBUILD corosync-1.3.5.ebuild 1288 BLAKE2B c1adb94e02e97a1a97943aa6966f41e3ce5ce19faeb33dee59b22bba183ccb0b24a958391d6c326fd928fa7e76a3ef6c3e590410362fe14e30912ccaa295a6be SHA512 dc6b07ff7d254e4985b7ae7611e5f820f3ba687b684a8c92703ad2ded562beed2e1ab81e7e1bfdca755ee95e7870b6f9e8f960921a129383082790fb35b4b902
-EBUILD corosync-1.4.7.ebuild 1399 BLAKE2B 32d47e633d7ec234320c6edca386eecf857baa4eccc34657354a1218d34a5d2276ff7ecf325ea62d7a2c5cf767ca9fa1fb02c35c07441315aca65894f8aa7411 SHA512 d8a6146addb87f65ac2ff34b1d3e7fadaf5302ae6ce328d9553c684d0a227bdd44dcd5586499545b8f2e0c9cfd69f61496f837a58baad20286af1c9d6f6aff26
+EBUILD corosync-1.4.7.ebuild 1398 BLAKE2B 8be3182e56e8120910b0d3850310537918b3e8885ec2f16fe7eb476febbd633e9a9c9767164ebd83630a543d9a9001d1581e439017b8359b6445d5629778b2c6 SHA512 5c2ff4b91c6b2a444fbc77422a7f3e1c71e43b9eee9d51d491186988a4831ca13e96494353ce94ad2fbc60aa9b3c2605489310fc9b061f0409f591310c66456d
 EBUILD corosync-2.3.3.ebuild 1926 BLAKE2B 5171b894ebabbb3c14e786985851a1d1b83833cbc470825e4dcc8d54bd0eb645a7ea26a8b377b8198532c5b437c889431d6a3f81ef9ca433db2871b9a10b2755 SHA512 4717b0c7c6a8be4d849d528fd0819b8d43b4e16770ffc9022d0ebe837e2c2845a955276912b32a9796faa3d274f6a076dd3cd320503519f76bb2f31f95c42f51
 EBUILD corosync-2.3.4-r1.ebuild 1926 BLAKE2B 7357e0385bad23ad81cf6bc5a48590cba619e18fa759e0d63c7e676be84664f90596c50908daca7531bc7da06c309fa6c34aab8f690958bde87609a1844c6f4a SHA512 115d63649487c591284afbccdac27f6297bb8df7874062098a232a0bd516ede0163151f8be6b420ee8de11e84fe4f5d315cdb7dbb3e603d57b7489947d63e17b
 EBUILD corosync-2.3.5.ebuild 2052 BLAKE2B 884a7252bfa4d6295957bfb9d23e40a545f82e4c749f6905b1cf9dac97c215e3c84eeb3d185e6ab2cbc4c082052a9a18f2d95fc2d97fb8cf29cdcfa0077ffa72 SHA512 8415aec44086036714b824be3285cbee49a5c3987771ac04c971b3f9f0f0b09a045775c2095d6044357d76b7c44d9c75205f27a109596dd6586cc5f4fb67984c
diff --git a/sys-cluster/corosync/corosync-1.3.0.ebuild b/sys-cluster/corosync/corosync-1.3.0.ebuild
deleted file mode 100644
index 61ddf86a3279..000000000000
--- a/sys-cluster/corosync/corosync-1.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit base autotools
-
-DESCRIPTION="OSI Certified implementation of a complete cluster engine"
-HOMEPAGE="http://www.corosync.org/"
-SRC_URI="ftp://ftp:${PN}.org@${PN}.org/downloads/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE="doc infiniband ssl"
-
-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" )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# appends lib to localstatedir automatically
-	# FIXME: install both static and shared libs
-	econf \
-		--localstatedir=/var \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable doc) \
-		$(use_enable ssl nss) \
-		$(use_enable infiniband rdma)
-}
-
-src_install() {
-	base_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN} || die
-
-	keepdir /var/lib/corosync
-}
diff --git a/sys-cluster/corosync/corosync-1.4.7.ebuild b/sys-cluster/corosync/corosync-1.4.7.ebuild
index 0244e2a6b03f..7c1866699e7a 100644
--- a/sys-cluster/corosync/corosync-1.4.7.ebuild
+++ b/sys-cluster/corosync/corosync-1.4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://build.clusterlabs.org/corosync/releases/${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 hppa x86 ~x86-fbsd"
 IUSE="doc infiniband ssl static-libs"
 
 RDEPEND="!sys-cluster/heartbeat