gentoo resync : 07.10.2018

8 files changed, 103 insertions, 5 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3cb9d952a63b..01b204193b34 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 9790bb75b0b1..6077bb02338c 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,6 +1,6 @@
-DIST charliecloud-0.2.4.tar.gz 178589 BLAKE2B 45330f67e4b116150219a2753f341248878e8fa540583a97c5cd55e42498825e749c5ca9133580c180438898e25dd22bbcec37c31c31258ccf1fa0ffb5814375 SHA512 456b45d071a18562d914e70b141de55950fcf4a5e2aa882b85bdd8c4abab3a62ab1e413c0524a31be2e278328aab67a898f319bd640e9d9a84163efe24e5a872
 DIST charliecloud-0.9.1.tar.gz 194937 BLAKE2B 2ef2ee70cee3293ec4f7f589c9a034afa82835981132ea433d720b2a2750df68adb261540c98bc04e7f8904375dd8804819fb3015dc6e65bbe097fa55d558976 SHA512 6a54912ceb3ea99e9d3d1fa8469d7288df0b71872c6cb1d5a4d324f6f84754b7e4804ec1a3c2a30e7dd6377a3b474fea849eb42014f3599ad27a3f6214642a2b
-EBUILD charliecloud-0.2.4.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
+DIST charliecloud-0.9.3.tar.gz 200507 BLAKE2B debd06bd6158a473d07618bc8fd9ae8c431212eef87699cdd412cf29390e25f6f9e596ac93eb0d663c47ca0b8243cfbcbfc634066f6de03bb673488471e7ef01 SHA512 d312a583438d579ef4ddd6b1d78cc2c6b32e352dad99dcff93f7e0a346aa11fa534091ad6446217bc6fe0dc6d7299d99ffb2c7bb1a441353fd9b2f118ead2c80
 EBUILD charliecloud-0.9.1.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
+EBUILD charliecloud-0.9.3.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
 EBUILD charliecloud-9999.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
 MISC metadata.xml 699 BLAKE2B 778ae447db939c0593dd147ad669e07fe8de217079988f82bd21ca545f1afe8056347173028056a9f0407a72b435dfc021dccbed1d860491712351ae727906b3 SHA512 2b19c7878b104128f537b3b5ab2070a3f643ae536af3f91ab52284aa13ae5752e4e8c012a51fa4261e140154f0c2c49f1aa480b22ace552fdab5067174247515
diff --git a/sys-cluster/charliecloud/charliecloud-0.2.4.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.3.ebuild
index f7d1882d07be..f7d1882d07be 100644
--- a/sys-cluster/charliecloud/charliecloud-0.2.4.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.9.3.ebuild
diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 82bcd3e7f6e6..3d94e3c73119 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -2,5 +2,6 @@ AUX heartbeat-logd.init 954 BLAKE2B b00280f93cb0a3f3f8f19d3170472e87d705f91113fc
 DIST glue-1.0.11.tar.bz2 466057 BLAKE2B 929c9f803814fb1162d4058e0fb78deb96b6be9b4064dae96ea5653521f5dfb862850ab2c9010530ac652264c5e8e379cb397fc173f720d126540405b264ca5b SHA512 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
 DIST glue-1.0.12.tar.bz2 451569 BLAKE2B c074507563e797f105318bfcfab3e73eb1b62eb3037689c2b68f1b98f02b4a2c1da2e0b2931cd28ccc194d9f3b486733f642c6ff071c4f7629062d40c8d39427 SHA512 d5d2f6c426d2bed0d39269338fedfffe840a90ff56b05dff395243d0d8b803593bf35bbce5f7dce376120cd7ddef78400914cb7515b5451c287a1e9e74233122
 EBUILD cluster-glue-1.0.11.ebuild 2191 BLAKE2B b5498424f8ea748d3e3b0e6a36091fccb181ef8a9f04e0173ac8172440a66101958f516f51df822a32f54a7148126d584790ac1ecda9f866c6704d36a9615034 SHA512 f8af50aa16f76e992bde0e57660e5f7de171b3a80de86827a5b70c6406e86e8b52c1ed89f4963e7f1e583a3845bc9fe4fab44224fcf050f22233064506ba4238
+EBUILD cluster-glue-1.0.12-r1.ebuild 2362 BLAKE2B ce64dedf7a8918914df5bd993702b319889ed58eff6d830ad1450ed62f22917ba97dde30a05c58339ea81e0a432b9ba7a9e951feca339f5c97b00b9a20d1ca2b SHA512 25626908d67a837d84cec46d1b9626e9425c38800886e9c7b90b109fabf9a046b29b33815e9077278c68abe4c503dfa6636c227f4cac2002d1b966b54422b386
 EBUILD cluster-glue-1.0.12.ebuild 2209 BLAKE2B acce4fe14e0bec15ab36318002404d9fca7c6eefe7214525409f29aab497cf6c9126dbea8f01c21148caa44c2dc7445ed2196229418e9142bb638a199b685e93 SHA512 ab138ae57b746200dbbf53744389d58c82fe43405fca01dd661a5d64f565e00ce35d3189a5557cec3b79580a9f1df19cbf8e25a78d001a6656a451e580020bc4
-MISC metadata.xml 485 BLAKE2B 0e23a9a25bd6a826ec5f3adfed6b2ce58f8ce240ce13492ef9b64621e2153b8c7fea82e9b8f11926ae9aa02d77b2d9dbdfa26eba125c5d3a28ae15702fce0cee SHA512 b7a28d9474e30b96337ed2222d86e1811e7f0e4eef31ab6dd2d3bd10d3afc18f4b091ad7d49185b9c4a7e82d3be31ab80be5e4cee769d642f0a0eb73e27ea2ae
+MISC metadata.xml 582 BLAKE2B 5792be1499f85328ff85ec074189187e014c2eadf29b4ddaf4a64c71977ccf5ce91d86f251fe90f3540a7cfab8d52145cd5c085199c6e1099df5dbe801fc4291 SHA512 a2312279ff8e3e47db3d1a560699d76233dae3963cc094aefbbe965af053fe4299e95133d5f40aa69a565c91c21ce9d358020726d3c8c590255dcac72901d7e3
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
new file mode 100644
index 000000000000..74f9306385af
--- /dev/null
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/cluster-}"
+inherit autotools eutils flag-o-matic multilib user
+
+DESCRIPTION="Library pack for Heartbeat / Pacemaker"
+HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
+SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc ipmilan libnet static-libs"
+
+RDEPEND="
+	!<sys-cluster/heartbeat-3.0
+	app-arch/bzip2
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.4
+	dev-libs/glib:2
+	dev-libs/libaio
+	dev-libs/libxml2
+	ipmilan? ( sys-libs/openipmi )
+	libnet? ( net-libs/libnet:1.1 )
+	net-misc/curl
+	net-misc/iputils
+	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		)"
+
+S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
+
+pkg_setup() {
+	enewgroup haclient
+	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
+}
+
+src_prepare() {
+	default
+	sed -e '/ -ggdb/d;/-fstack-protector-all/d' -i configure.ac || die
+	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
+		-i doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DOPENIPMI_DEFINE_SELECTOR_T
+	local myopts
+
+	use doc && myopts=" --enable-doc"
+	econf \
+		$(use_enable ipmilan) \
+		$(use_enable libnet) \
+		$(use_enable static-libs static) \
+		--disable-fatal-warnings \
+		--disable-dependency-tracking \
+		--docdir=/usr/share/doc/${PF} \
+		--localstatedir=/var \
+		--with-ocf-root=/usr/$(get_libdir)/ocf \
+		${myopts} \
+		--with-group-id=$(id -g hacluster) \
+		--with-ccmuser-id=$(id -u hacluster) \
+		--with-daemon-user=hacluster --with-daemon-group=haclient
+}
+
+src_install() {
+	default
+
+	dodir /var/lib/heartbeat/cores
+	dodir /var/lib/heartbeat/lrm
+
+	keepdir /var/lib/heartbeat/cores
+	keepdir /var/lib/heartbeat/lrm
+
+	# init.d file
+	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
+	sed -i \
+		-e "s:%libdir%:$(get_libdir):" \
+		"${T}/heartbeat-logd.init" || die
+# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die
+	rm "${D}"/etc/init.d/logd
+
+	use static-libs || find "${D}" -type f -name "*.la" -delete
+}
+
+pkg_postinst() {
+	chown -R hacluster:haclient /var/lib/heartbeat/cores
+	chown -R hacluster:haclient /var/lib/heartbeat/lrm
+}
diff --git a/sys-cluster/cluster-glue/metadata.xml b/sys-cluster/cluster-glue/metadata.xml
index c8788d4ba459..a3716ef230b3 100644
--- a/sys-cluster/cluster-glue/metadata.xml
+++ b/sys-cluster/cluster-glue/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<longdescription>Cluster Glue is a set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.</longdescription>
 	<use>
+		<flag name="ipmilan">Install the ipmilan plugin (requires <pkg>sys-libs/openipmi</pkg>)</flag>
 		<flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 045710a83b9b..7879989e2dbc 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -6,5 +6,5 @@ EBUILD minikube-0.28.0-r1.ebuild 1396 BLAKE2B 385a36de987144b41ab2fc7595d09d247f
 EBUILD minikube-0.28.0.ebuild 1253 BLAKE2B 90c331c2f4a98e774edc39993b849e370376ecc50d644f4f6a56070617eff8bdce141ae4f9131dd92d492b1b101c2f5f699f9da96d5e3cd04c11d0dd2e428a9e SHA512 d43962f11e8f1566f56663a8553e7e2fee45440a568e0d167654b8eb0e8a12128f2b7a26f3063223f7aa2b6df1f49d9b5da2f55369434bb11a9533b856c05dd5
 EBUILD minikube-0.28.1.ebuild 1491 BLAKE2B b3ad1951a44ebbc52fe1456eea11230a7a6944d27aa1f5d053caa0feb8df37234ab1c4eb22774f0516ae3e23c0e56c89772b6e63a44b7a661e731805a55fc5fe SHA512 057df45317b4f4f7c2d170efce625e30a9c4f9397ee0a5aeca05b4bafc5526882b5a795b0924989f2905f6289b36c4784e29a34bf1295088954ff0681522cd7a
 EBUILD minikube-0.28.2.ebuild 1646 BLAKE2B d18bac524a7a719188d1eb47201053aa75efa283db9e23c6109a6751be38b1e3d34be783e64c68c627be4510b0597a2073ce901ea586095c2ad2396ea7a95c84 SHA512 1e7c472fd74e6e5da75f3670d427988ac6d5a8ec7d4673a9eaa24f05dec02e57464a5d572bc51f312d8c4d1f57efe01d7f3215048eb32b6ce8cbb749f2c74821
-EBUILD minikube-0.29.0.ebuild 1628 BLAKE2B d008e0397b7fc979cce84f7fbf3fc9d6bfcbe4a5ce2e83882c44900d99978deabce1068406a9b5c0799e3105f8420ed6725bf226b23908af30a071d5181c2389 SHA512 38fb71ebc6d0b7385a767f73129da999c0a816f3d6db02242a12dbb847b5ed3a4e149285af53b5e22ffe34bf8be45616dd05eb4f89e7867e621b1de81473612d
+EBUILD minikube-0.29.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
 MISC metadata.xml 394 BLAKE2B ca9fbc7af4a84d99a6d22c00cb28c09747675dc66ef21a43b3011bdccd129df698cacad0375f4ef360de2874d1cf6282834c6b901cd86c6c4dd213f67f006f45 SHA512 0690f97963d432904a0f002273d73ac4d998cde1d2f2fafddc2eeb5d841970b634c58ffa534fd5982a8166a40159164422771baa000566561b4f428ebe818bd8
diff --git a/sys-cluster/minikube/minikube-0.29.0.ebuild b/sys-cluster/minikube/minikube-0.29.0.ebuild
index f55d3182b850..4a324bff4ad4 100644
--- a/sys-cluster/minikube/minikube-0.29.0.ebuild
+++ b/sys-cluster/minikube/minikube-0.29.0.ebuild
@@ -39,7 +39,7 @@ src_compile() {
 src_install() {
 	pushd src/${EGO_PN} || die
 	newbin out/minikube-linux-amd64 minikube
-	dobin $(usex libvirt "out/docker-machine-driver-kvm2" "")
+	use libvirt && dobin out/docker-machine-driver-kvm2
 	dodoc -r docs CHANGELOG.md README.md
 	popd || die
 }