gentoo resync : 24.12.2018

4 files changed, 2 insertions, 72 deletions

diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 24f85d5f404f..6ebece963162 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,11 +1,8 @@
-AUX hdparm-9.48-sysmacros.patch 474 BLAKE2B 846b0ff44445fc50dcc9f0de00ee936cda848e87c18ce9c05b33fbf1bc09593cf3270ea7f7b2f9f5a34c82bbff3c40a5d39c430fae39a29e5367fa052d303a8a SHA512 cd12a544f6149076c48657f572d71dbc400fa80fa26e6604325d3812159f2a3cd3ab79d8f248b64aac3db7c9913c6f406e427cab62103c927274ff6439a4151a
 AUX hdparm-9.51-build.patch 1210 BLAKE2B cb35c2fa451a0746ffc2f431ef3857b313f1e8c1e0cac7297deb5113944cb642a38734f1ba7d8538c1c1b4b0ec322827f87eb8e91520623712f3db67379c8aae SHA512 d8efe50cc8ab963be2ace3e52e077e3be8d266b2c5c293febe344fc53760d53c1b52f7bbd1c7813f7a7979a6e4ebc52cb808dc3797f6e1ac7949ac5f9696239a
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
-DIST hdparm-9.52.tar.gz 140737 BLAKE2B 0614bfb0844f088b533951c4636bf92879c4ff7e9bb4d150965e936eaa2a4e0ffd350689fc359757a2f9e80a6c93cd111a25b8e2824737e01b4deb6e543b2868 SHA512 7c37d1381c1dd2d46762a8cdcaba2015b0b051ee7bd135dbcf6346def51b085cc2f9ecd7e1ebdc67e12ab4b765df548d4757b3700ed6e7514c2b13ed40661c59
 DIST hdparm-9.56.tar.gz 137213 BLAKE2B ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd SHA512 5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
 DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
-EBUILD hdparm-9.52.ebuild 1057 BLAKE2B 6a29ec1c584e1be1d7cab0831303d07a4622f9bf3f58b0bd68ed2a7b4a64f91ede06d3b967afe0b8427c98e071d2149b1887ea35ad4e48ab2a3ea1f807b3400a SHA512 98961f82c74bf33fa2deb324605f4485687e81de8cb3ffd8dc2f2591d12d9a06421ce670ef10e28f71844786c24709d503d7fdebca890c5645eac78034d9bbc4
-EBUILD hdparm-9.56.ebuild 984 BLAKE2B db15fe1aa53350b5ff3b447b72fd4a0e3126fa601257cb0b87755af60efb086db94ad97f78fb141b40fc63529e2e6fc7066236b9d6ff5eac486d1790615c2a06 SHA512 af826745c4f21e2500dae758b888643810384825cb2b8e6f629d24c8532f9a7e4a01feebb779eca4e58134d6fd7b2d9541b3da976b3759f4bdbc9029f7df8085
+EBUILD hdparm-9.56.ebuild 982 BLAKE2B d1afc3860c0e374a4a09dfacb40be2ce28fe3b51c6dd6898c2fbd9fea4a6ebd966f671f3e098ccf9d2a5635127bf2d1d337ee0d8190cabff0fbd33fffef44868 SHA512 8460def7a83585bfbcd8b857c59506752cb4af46b7f3676a28f02e3b37f082222867d890e118c1ede99f1d86f4ff63edacb878b536269d23c05d0895bbe00ec3
 EBUILD hdparm-9.58.ebuild 992 BLAKE2B 8447286f9f0b65a89e091a37d4b875c9153965c72a6727db1d330b3fbeea6269d759b69f49b3e26413011e7874e62e0eddca60f74ca4a907d042d2557a4c3bf7 SHA512 b808f3d1685042b2663e5e73cd2eba2b7a920cb2fa7eface0f48740a998ffa0a90b75b24e72e0038b51bcce5140d21b16c97cabec618586a3fe6a58a6234721c
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch b/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch
deleted file mode 100644
index 98a08c7d36d0..000000000000
--- a/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/580052
-https://sourceforge.net/p/hdparm/patches/44/
-
---- a/geom.c
-+++ b/geom.c
-@@ -15,6 +15,7 @@
- #include <errno.h>
- #include <dirent.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <linux/types.h>
- #include <linux/fs.h>
---- a/sysfs.c
-+++ b/sysfs.c
-@@ -15,6 +15,7 @@
- #include <dirent.h>
- #include <limits.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <linux/types.h>
- 
- #include "hdparm.h"
diff --git a/sys-apps/hdparm/hdparm-9.52.ebuild b/sys-apps/hdparm/hdparm-9.52.ebuild
deleted file mode 100644
index 6bcd2b516c07..000000000000
--- a/sys-apps/hdparm/hdparm-9.52.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.48-sysmacros.patch #580052
-	"${FILESDIR}"/${PN}-9.51-build.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	use static && append-ldflags -static
-}
-
-src_configure() {
-	tc-export CC
-	export STRIP=:
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl
-
-	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
-	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
-	doman hdparm.8
-	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
-	docinto wiper
-	dodoc wiper/{README.txt,wiper.sh}
-	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
-}
diff --git a/sys-apps/hdparm/hdparm-9.56.ebuild b/sys-apps/hdparm/hdparm-9.56.ebuild
index cc9b435bfe9d..510ec4052e06 100644
--- a/sys-apps/hdparm/hdparm-9.56.ebuild
+++ b/sys-apps/hdparm/hdparm-9.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(