gentoo resync : 04.01.2018

6 files changed, 53 insertions, 148 deletions

diff --git a/sys-apps/microcode-ctl/Manifest b/sys-apps/microcode-ctl/Manifest
index d5282921cdca..3c49d9daa4a5 100644
--- a/sys-apps/microcode-ctl/Manifest
+++ b/sys-apps/microcode-ctl/Manifest
@@ -2,11 +2,9 @@ AUX microcode_ctl.conf.d 210 BLAKE2B b90844f3ec85a308d56ce230dcc948faf797564036d
 AUX microcode_ctl.rc 590 BLAKE2B 09dd568f72522a4a95c1c036f4032d7bb45754c0f46b6a5ac9573eb00e5a3d81c97caad5b47ed742df3d91ea5b8863d2ac69c570975ed96957e8313a6e723fda SHA512 a81eaf5628b62472520b59773e58ffa99938e70d9efd0f1c25cfe8a953f7a8632879657347147323c7299cc022c89bc82a7409fdf2d2aa59afa7173ef9d13438
 AUX microcode_ctl.rc-r1 621 BLAKE2B a4166842f8b8496a8b8b1cdac930b960a8c510d59a40def39552d5280aa66e381d9807bece1f07f9ed2d0b237950f187cc4c4080dde6b86a6cc3da11e747a406 SHA512 543e389ce415df3beac1a84f0d2b4dbdd7ad4a5f9bf33a51e4cbe34fc29249a5d0e044aeaefcaa17fcf38be1f53a5a75f04bd6116d7d5d9e91851bceb3329564
 DIST microcode_ctl-1.23.tar.xz 755448 BLAKE2B ad7811536584343254fee8ee77a192834ef3aedac49615d8a4d6dd46f8ad68f01d1a01ee8e54988ade5f6878dc903da0c9f08a93f5efed041cc7bd43c864969c SHA512 f33b4fd43c39b3d4e9b6eb9a12285c7ea26ee43e6c4aa1e45f9aa92a0d2b7d55d1a950ee82d8aea5c86faa15dd1e85e829719b6c772a2c09f262bea630bc7edb
-DIST microcode_ctl-1.27.tar.xz 856240 BLAKE2B c9811226e0ad4d26d3ca82b90d8fc34486bb88e7d4e811e543fbd88da8ca2f5cd4b8f9a535f804f2690b0c02e2ac8ab686837a0bf14facd3e792ac1e7502ce1a SHA512 ac4bce583f756b777488605687fe1bef0038763ed4a0afc51b454140f00caf04ef8a6d790d95684aa82c857f9cefd59b2413b96ad3d0c349da4b88166c5aa556
 DIST microcode_ctl-1.28.tar.xz 876760 BLAKE2B 8523bdc59ab21a6ec2e1110116bfb4c7a18e859e7f1da65d9e765274b47d5c1909d61eb18017ecc9369b7eedb43cf11cbdc495439aaf1c525bc8d8f7c63ca3a0 SHA512 ed5deb0f96c895b7783c23a1c91d2e03f713a793a21140b049e1b5f08f553dce103b4a11016ebd5076424b1032342d009d952e0089badfea2e91ad486d2cf7f8
+DIST microcode_ctl-1.36.tar.xz 3553884 BLAKE2B 0667971e546a135aba6c49f7eb04908595540ab3ecaebbb175cabda0aeb3396fdb145245a7fab44ec095f447f88e3b78990b22cd4f07568ac4b80ef321109fa1 SHA512 be35b670eba65747aef8bc7a78e989d3481fa0cbfb1635332821da75decef2540f3249ab6ecbe5b95f4d52e9a982cda2c7df31d2f406c0ba27c0354b6b70c2bc
 EBUILD microcode-ctl-1.23.ebuild 1271 BLAKE2B 8a7adc9b789dfdadf4a44ee4301040c0047f4e68bc71d46b04acbfe2b1d9978415d6e184d328d05c39b65a37b59db34d5b274cc1168cf52e93775413862a0a0c SHA512 b5ef619c8b5821e4a52282f34e7e4880962e2d9d6f8f279f3ae7553ca5a72e28c69f4ac921b1370ea199635c63d705e89e78968ff3fe5520556c4732fbf68355
-EBUILD microcode-ctl-1.27.ebuild 1273 BLAKE2B d3b5ac1888e2abce28f63f5f6d92ca4eca7b6714c1fc93ad0f304a0a790ce4c46c7bc8c73a4142b5533c233599989d6cf34347bc0adf26ab54b130b3cf659f31 SHA512 9d23c1914298105aaaf8937162cf7673a09d12dde1778c4bd99d708b09307527bafb3c45a556b78a02460aac3842001f30cf67bafadd5a64fec596013926434a
-EBUILD microcode-ctl-1.28-r1.ebuild 1035 BLAKE2B e82bd192b0ee75ddeb53a1112ddcb1aa5846fe2e8c84137509fa6b723cdd4b96eb6f0d7176d83d538a86ed032f6b19bef726ac31896a2f0617d44b11c1e91a44 SHA512 a63bb4b08ada1fa9e4c114f4a7c8019201e29260282b75cc58247264602191bfe83a4076f8673bb591443f08c3e9e8723e1952f7bcf7bb0951a457572f527964
-EBUILD microcode-ctl-1.28-r2.ebuild 1147 BLAKE2B 9bb9e2be7a589eaf4ffc30ebf95bb9a6f7f38019c5b598659dc7a037fa3051673c2185df8bfc7007205436246214cb40260ae8204f2ba0876ed33350b838bf95 SHA512 c6782fc6a6919a2eda6f6b229c0498b4ff1907cee8eab2dcfdf43017a6849cc996af39202daaadf2d7093c51752984938e7c77090c4b1529b7c2c7001bbdb4aa
-EBUILD microcode-ctl-1.28.ebuild 1273 BLAKE2B d3b5ac1888e2abce28f63f5f6d92ca4eca7b6714c1fc93ad0f304a0a790ce4c46c7bc8c73a4142b5533c233599989d6cf34347bc0adf26ab54b130b3cf659f31 SHA512 9d23c1914298105aaaf8937162cf7673a09d12dde1778c4bd99d708b09307527bafb3c45a556b78a02460aac3842001f30cf67bafadd5a64fec596013926434a
+EBUILD microcode-ctl-1.28-r2.ebuild 1146 BLAKE2B 3f0c1ec0dad10983e2e239cfd60c095398270fbb22f8e5db97244b28d79b648fc4ca56aca0b22a577076bfc4e80048a75d10e318907fc248a02e32e03f0277d1 SHA512 abd0d5b0ebbbb5be403096b74838ebafb4da62a5a75867f5643996a0088ad68b94a7a68b58d25e22696a35ff01fc1350769c4b65b6b00e05f45fd7fdf89d23b1
+EBUILD microcode-ctl-1.36.ebuild 1147 BLAKE2B 9bb9e2be7a589eaf4ffc30ebf95bb9a6f7f38019c5b598659dc7a037fa3051673c2185df8bfc7007205436246214cb40260ae8204f2ba0876ed33350b838bf95 SHA512 c6782fc6a6919a2eda6f6b229c0498b4ff1907cee8eab2dcfdf43017a6849cc996af39202daaadf2d7093c51752984938e7c77090c4b1529b7c2c7001bbdb4aa
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.27.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.27.ebuild
deleted file mode 100644
index 0943b22c05d7..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.27.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit linux-info toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel processor microcode update utility"
-HOMEPAGE="https://fedorahosted.org/microcode_ctl/"
-SRC_URI="https://fedorahosted.org/released/${PN/-/_}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="selinux"
-
-DEPEND=""
-RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
-	selinux? ( sec-policy/selinux-cpucontrol )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dosbin microcode_ctl
-	doman microcode_ctl.8
-	dodoc Changelog README
-
-	newinitd "${FILESDIR}"/microcode_ctl.rc-r1 microcode_ctl
-	newconfd "${FILESDIR}"/microcode_ctl.conf.d microcode_ctl
-}
-
-pkg_postinst() {
-	# Just a friendly warning
-	if ! linux_config_exists || ! linux_chkconfig_present MICROCODE; then
-		echo
-		ewarn "Your kernel must include microcode update support."
-		ewarn "  Processor type and features --->"
-		ewarn "  <*> /dev/cpu/microcode - microcode support"
-		echo
-	fi
-	elog "Microcode updates will be lost at every reboot."
-	elog "You can use the init.d script to update at boot time."
-}
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.28-r1.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.28-r1.ebuild
deleted file mode 100644
index f7ff8cd2c453..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.28-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel processor microcode update utility"
-HOMEPAGE="https://fedorahosted.org/microcode_ctl/"
-SRC_URI="https://fedorahosted.org/released/${PN/-/_}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="selinux"
-
-DEPEND=""
-RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
-	selinux? ( sec-policy/selinux-cpucontrol )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dosbin microcode_ctl
-	doman microcode_ctl.8
-	dodoc Changelog README
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.28-r1" ; then
-		elog "The init scripts have been removed as they are unsafe.  If you want to update"
-		elog "the microcode in your system, please use an initramfs.  See bug #528712#41 for"
-		elog "details (and bug #557278 for genkernel users)."
-	fi
-}
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
index 4ca58a106615..c6baaaeb0bda 100644
--- a/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
+++ b/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN/-/_}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="selinux"
 
 DEPEND=""
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.28.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.28.ebuild
deleted file mode 100644
index 0943b22c05d7..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.28.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit linux-info toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel processor microcode update utility"
-HOMEPAGE="https://fedorahosted.org/microcode_ctl/"
-SRC_URI="https://fedorahosted.org/released/${PN/-/_}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="selinux"
-
-DEPEND=""
-RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
-	selinux? ( sec-policy/selinux-cpucontrol )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dosbin microcode_ctl
-	doman microcode_ctl.8
-	dodoc Changelog README
-
-	newinitd "${FILESDIR}"/microcode_ctl.rc-r1 microcode_ctl
-	newconfd "${FILESDIR}"/microcode_ctl.conf.d microcode_ctl
-}
-
-pkg_postinst() {
-	# Just a friendly warning
-	if ! linux_config_exists || ! linux_chkconfig_present MICROCODE; then
-		echo
-		ewarn "Your kernel must include microcode update support."
-		ewarn "  Processor type and features --->"
-		ewarn "  <*> /dev/cpu/microcode - microcode support"
-		echo
-	fi
-	elog "Microcode updates will be lost at every reboot."
-	elog "You can use the init.d script to update at boot time."
-}
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.36.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.36.ebuild
new file mode 100644
index 000000000000..4ca58a106615
--- /dev/null
+++ b/sys-apps/microcode-ctl/microcode-ctl-1.36.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs versionator
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Intel processor microcode update utility"
+HOMEPAGE="https://pagure.io/microcode_ctl"
+SRC_URI="https://releases.pagure.org/${PN/-/_}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="selinux"
+
+DEPEND=""
+RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
+	selinux? ( sec-policy/selinux-cpucontrol )"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dosbin microcode_ctl
+	doman microcode_ctl.8
+	dodoc Changelog README
+}
+
+pkg_preinst() {
+	local _v
+	for _v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.28-r1 ${_v}; then
+			# This is an upgrade
+			elog "The init scripts have been removed as they are unsafe.  If you want to update"
+			elog "the microcode in your system, please use an initramfs.  See bug #528712#41 for"
+			elog "details (and bug #557278 for genkernel users)."
+		fi
+
+		# Show this elog only once
+		break
+	done
+}