gentoo resync 04.02.2018

4 files changed, 12 insertions, 98 deletions

diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 57a649e2efe5..951ff7631b50 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -4,14 +4,12 @@ AUX freeipmi-1.1.1-strictaliasing.patch 587 BLAKE2B 4d18219bf51c0673d730a719e8ad
 AUX freeipmi.icinga 117 BLAKE2B 12409a509d0b06d54196961f703fbe91034e1f68cfc19e5cb90c00a3481e29e8bca45fcaca2cc1d780ba5ca6deee58a06b24a2b928ce4a73067efb83d34201f8 SHA512 813aeebe5e663073f3bce7917b35c6ec493f5222bb759d47238aa2b382459661a90165b0bd3a74c2e6e1940d373eccb43ab03a4270d2d2c91a03be361ce46032
 AUX ipmidetectd.confd 185 BLAKE2B ea7164e6b126cc684482557cafae3ac0c39611484243e95a3e8946488cc234f4d3100f931549f08c917d454768845e276d83fa3f9e2d7a57c4454a55090bfa38 SHA512 f10e908a451c646b2c61338d79e69663c05216a54093745bd2b659041e0b91adb9be4077c92d63f6f3d62cb5510168b6a57e5e86375533e235fd3abb2b72a49c
 AUX ipmiseld.confd 192 BLAKE2B 52b125e63ca3e13fcb24f5b304f73c78269fc58b2c3e40cb185b28697c409ccf5ecd4b95599c38119bfe8c97977c3cc87e3633989e2b9d4095cded4b2b248dc4 SHA512 0a031f29a4692085054d5fc2dfe6d0ad7fb762f7ee96849ce2d562a90d6e3b0f3ae8328ab852dc22bee6221bc5cd8b588bd02075222038fa0f0e2f64ac185799
-DIST freeipmi-1.2.2.tar.gz 3031730 BLAKE2B ff821d56a15cbd8fdcb64d2d790feba873d063e71f42ed718a5ed0df4fa9b27d65c2b05aaeef4030a5d94a8bf0ef4c87a05e90a363f337a8530b43b0f0f65b83 SHA512 86ea9a073ec275b3594e93c7e7fdef2b7214dcd3e696fdec4a017841d4bb7e2179a407d91aa11b26c952cf5b06262801b41293642ed38220d57112a37878a5f4
-DIST freeipmi-1.4.3.tar.gz 3089282 BLAKE2B af8d731cb6887bf4985d343c1f2f73f807516eec04d521601096a015f7fab158a98525070775ff3adfe5c8ce6a41a75668728f561b9ce5362c6add4a192b2715 SHA512 88a2dec70696017407aac313628407200ee2c6600547fbff73c6880ae8d65cda166c8e00e0f4b7eaddc35f4376143b8fdb0b4ac284aba401c2592a95804e6cec
 DIST freeipmi-1.4.8.tar.gz 3185068 BLAKE2B 4133a7cdb5f66a28c07e965e6842c9d5931edaab7c19a4d4e89f5907ffa5c3f9e753b7738141206835346d06ecb7045780fe2913682ce70153822895c4da4425 SHA512 3cd4acde402bbc945b007e31e7f8dad3ad4539d2cf00310e9168d7cec8024203a280c8ad91e3f08b86dfa9be536779969c5393c4523df2fe8eb904f765fcfc56
 DIST freeipmi-1.5.6.tar.gz 3321440 BLAKE2B 4e40379e06b7e1b45aa4720c674a99f1ce54b167e597e0cc1aae82329e703eee95f9783086a2fec901585637c9209837f764e0b8028b78d6feaaa85e515e561b SHA512 2a33c4068af03be5d99a9a0098ded3177bedbc1b71df14c2ba67d40012bee6791388947b0dc552433feb9098753182d62a84f43af6036fbfbd06a7f277ef8b6a
 DIST freeipmi-1.5.7.tar.gz 3321187 BLAKE2B c6f7e9c4e0a03ce1d50972fee99741ec00a8f5beb0323d61d9217b3773eed33cb04e7bb92e1f293cb39c8012872babdc4774e6d81cf808615b8b283510e1e67c SHA512 a4d39d11d4e4b9635c272ee3a197729ac61c3e1c909c202498fb480c41289116eb933cd716fe2e0b5aa6dc258751ee204892bfb009398b6d5c2c65ee1cc58544
-EBUILD freeipmi-1.2.2.ebuild 2068 BLAKE2B 7704121a1bb025f3c25d123898afd7d21a3cb455e7d980fbff98e9392def58b4dcd5bdbd61daef02bdc46bcd612ab5bf906a0800fa1e127a3009b1e165d5b3ba SHA512 8a955345f982f78c63142a98f63152a3a0384a4d0bb1cc56cb3cb6f3e699655857c00c73bed98b75cbe7213bdfa74a66bfd1616f983bdc1e5c94cc1963087afb
-EBUILD freeipmi-1.4.3.ebuild 2506 BLAKE2B 9d527f89a8d889ebd16059fff9290ce863f3cb3be3bc95b5dd64094cd8953ca2837727e753cf5105fab207df8b29c6383603bf8e8a036336792dd4e4d4e343ba SHA512 95325284f617bcbdf68e6eae0ef2d873a2e99926f6e9a2ce8c9536fbe27b69e4ea90d3b7b803ae03d71682aa3527a330233f57b049ef8990acdf7882484f86ab
-EBUILD freeipmi-1.4.8.ebuild 2439 BLAKE2B 50c95b91dc409f907ac20d5f5f82e2cbf008b9b92d6295fd85e312ea08a8ca2eea5e4e1dcf7cc03f0a33379e4f7869e907251a38202252171cde8e6415e46859 SHA512 ff88963e435207bdc7b857c82998f7334b46bf2a62ed7396d6f848d449e37c2211f59fc22b0c69cb8a29c196d4e053870afd9c49067820035cac01441a54a5f3
+DIST freeipmi-1.6.1.tar.gz 3398508 BLAKE2B 48c7cd791a635a1d82cc6304c8080aa2f88415c33a8dabf80a844305de5d21ef3bf20fd236c5a56d3a761fdadc1449b8750728465263828b157f93ba6080ad87 SHA512 f8ee5b3b59c0ccffeb52717a134cb8c149e42f3f66ea20420e4efbdbdc79d527e52e6d20b2a75a4406bc8c2190f368f83d8d36cef611eeeabd58ff7bf95380e5
+EBUILD freeipmi-1.4.8.ebuild 2437 BLAKE2B 94a08cc0def79256536a9b912610611b324804aa56b07e74db6dc69c9b96ec4013ed592d5a345b0f1f9016434b54aba80135d3656fa51a582ab1bdde60917ca4 SHA512 f1587c29e63fa8d11e98857a816c22f2e7bed14d6e5fbf65fff3e0fd9f7ae8a391993dfd28883808365f2be9a51994a2903e7905f13f1ec0fa9a309eddf39ad9
 EBUILD freeipmi-1.5.6.ebuild 2376 BLAKE2B 1efb6ad0146bc811a2997e58e85f6d00a8c801e9e3b25e4350d73c5c25b57899c8adbde33914974735ac6c13f885de1c91692b7ee65e8042b66669e1b37331cc SHA512 d9d8700d2a8bb6b438273d02b3ce50540c837fd7436afb776f5691c476a051213491acfdd9671d29b7ba403f3aa9a77920e07ef33e7025c499a823668ef5aebd
 EBUILD freeipmi-1.5.7.ebuild 2375 BLAKE2B 6cf2866bcf7e355bfe9c5e803d7423eb9adce18274b27b4d25be91a3e309d71934e187f0f53418c18eacb329879aeaaa518534620ca1f6d129ae0ffc657bfb19 SHA512 b6e1f15b39894f475a56981a3721e1a2fef14205bf0aa51cd43f837aeeb96cb14c70bcb1f7d3580a5f6d474d1300bab4b7f654511560090c3d70fefbfee3faaf
+EBUILD freeipmi-1.6.1.ebuild 2375 BLAKE2B 6cf2866bcf7e355bfe9c5e803d7423eb9adce18274b27b4d25be91a3e309d71934e187f0f53418c18eacb329879aeaaa518534620ca1f6d129ae0ffc657bfb19 SHA512 b6e1f15b39894f475a56981a3721e1a2fef14205bf0aa51cd43f837aeeb96cb14c70bcb1f7d3580a5f6d474d1300bab4b7f654511560090c3d70fefbfee3faaf
 MISC metadata.xml 376 BLAKE2B f9bd1d470315ace8e1a7b71b77a2616131dec7530cba329cf10118df75e78b5c26e2891f3f5ff78b5df94f1ff67e93e05721d941a94cef847eabfea90b860abf SHA512 10922a1b392edce6cdb447eb2a06694570a88f765fd49eb7f154deed1cb3a33901c68ff1881f3068ae212ba6182c61e598e7ab7d4d683602f4016adc3ca7d7e8
diff --git a/sys-libs/freeipmi/freeipmi-1.2.2.ebuild b/sys-libs/freeipmi/freeipmi-1.2.2.ebuild
deleted file mode 100644
index 72ea48975c2c..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.2.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
-HOMEPAGE="https://www.gnu.org/software/freeipmi/"
-
-MY_P="${P/_/.}"
-S="${WORKDIR}"/${MY_P}
-[[ ${MY_P} == *.beta* ]] && ALPHA="-alpha"
-SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libgcrypt:0"
-DEPEND="${RDEPEND}
-		virtual/os-headers"
-RDEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1.1-strictaliasing.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-static \
-		--disable-init-scripts \
-		--localstatedir=/var
-}
-
-# There are no tests
-src_test() { :; }
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
-	find "${D}" -name '*.la' -delete
-
-	# freeipmi by defaults install _all_ commands to /usr/sbin, but
-	# quite a few can be run remotely as standard user, so move them
-	# in /usr/bin afterwards.
-	dodir /usr/bin
-	for file in ipmi{detect,ping,power,console}; do
-		mv "${D}"/usr/{s,}bin/${file} || die
-
-		# The default install symlinks these commands to add a dash
-		# after the ipmi prefix; we repeat those after move for
-		# consistency.
-		rm "${D}"/usr/sbin/${file/ipmi/ipmi-}
-		dosym ${file} /usr/bin/${file/ipmi/ipmi-}
-	done
-
-	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
-
-	keepdir \
-		/var/cache/ipmimonitoringsdrcache \
-		/var/lib/freeipmi \
-		/var/log/ipmiconsole
-
-	# starting from version 1.2.0 the two daemons are similar enough
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmidetectd
-	newconfd "${FILESDIR}"/ipmidetectd.confd ipmidetectd
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
-	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
-	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
-}
diff --git a/sys-libs/freeipmi/freeipmi-1.4.8.ebuild b/sys-libs/freeipmi/freeipmi-1.4.8.ebuild
index d74001bcc3cf..58dd6e67e7d7 100644
--- a/sys-libs/freeipmi/freeipmi-1.4.8.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.4.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~x86"
+KEYWORDS="amd64 hppa x86"
 IUSE="debug nagios"
 
 RDEPEND="dev-libs/libgcrypt:0"
diff --git a/sys-libs/freeipmi/freeipmi-1.4.3.ebuild b/sys-libs/freeipmi/freeipmi-1.6.1.ebuild
index 1913c0b81014..44c0af38ab67 100644
--- a/sys-libs/freeipmi/freeipmi-1.4.3.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.6.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils multilib autotools-utils
+AT_M4DIR="config"
+
+inherit eutils multilib
 
 DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
 HOMEPAGE="https://www.gnu.org/software/freeipmi/"
@@ -15,12 +17,12 @@ SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="debug nagios"
 
 RDEPEND="dev-libs/libgcrypt:0"
 DEPEND="${RDEPEND}
-		virtual/os-headers"
+	virtual/os-headers"
 RDEPEND="${RDEPEND}
 	nagios? (
 		|| ( net-analyzer/icinga net-analyzer/nagios )
@@ -28,12 +30,6 @@ RDEPEND="${RDEPEND}
 	)
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.1-strictaliasing.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
@@ -42,14 +38,14 @@ src_configure() {
 		--localstatedir=/var
 	)
 
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }
 
 # There are no tests
 src_test() { :; }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	# freeipmi by defaults install _all_ commands to /usr/sbin, but
 	# quite a few can be run remotely as standard user, so move them