gentoo resync : 25.11.2020

3 files changed, 38 insertions, 5 deletions

diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 0ef7e5f8e3fd..f393df68f74b 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,8 +1,9 @@
 AUX hdparm-9.51-build.patch 1210 BLAKE2B cb35c2fa451a0746ffc2f431ef3857b313f1e8c1e0cac7297deb5113944cb642a38734f1ba7d8538c1c1b4b0ec322827f87eb8e91520623712f3db67379c8aae SHA512 d8efe50cc8ab963be2ace3e52e077e3be8d266b2c5c293febe344fc53760d53c1b52f7bbd1c7813f7a7979a6e4ebc52cb808dc3797f6e1ac7949ac5f9696239a
+AUX hdparm-9.60-build.patch 1153 BLAKE2B c3eb037e0576a066fe2a2c6e00406dcfd3e99e23b468a4fbc0f5ac545d8a1b214168769da94271242b2119d480e34dbcaa734b636231021c03e2a57f585426cc SHA512 d3f76575074806c7981aacdf7a5a4e1e97a2afbcd09e8821cf1c064f8960b397e2ccdd534fb95b91f43f35c481f94463fb1fe485189436bd5de8178823d7c9eb
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
-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.56.ebuild 980 BLAKE2B 9810a7181ee3c0a55dd77ff5816f1c4b268692c006159a878cc9536a152dee8b5be5392376fe2e4d4ccb17064bffa9cc13c05d89c878057316777e0ce5f77371 SHA512 0456e15903ecf41f4e141e6f151cb798ecd7a58386fed4cc474608033743564f3b30cb044aaa6b90d7d0d7cbff6ca4dceeba115292b306e28ea78f2c45fbd498
+DIST hdparm-9.60.tar.gz 155220 BLAKE2B c09a2bd7a61a77d87f7bbd45881d5956392dbedf1f329be59049de68ee8491857b1958f8e5e85086ed53deaad37fc476cfb87f45bf27084719c07d25608ffdc0 SHA512 e40b3b48b409014acd0ec0bd7ff821e850b127627b1f5114c442eeaf0b93f02c6933f93a221037255499b741071c0a5cb4d9cf7f9a06ff92a416caf82673a0ed
 EBUILD hdparm-9.58.ebuild 980 BLAKE2B 9810a7181ee3c0a55dd77ff5816f1c4b268692c006159a878cc9536a152dee8b5be5392376fe2e4d4ccb17064bffa9cc13c05d89c878057316777e0ce5f77371 SHA512 0456e15903ecf41f4e141e6f151cb798ecd7a58386fed4cc474608033743564f3b30cb044aaa6b90d7d0d7cbff6ca4dceeba115292b306e28ea78f2c45fbd498
+EBUILD hdparm-9.60.ebuild 988 BLAKE2B ea610b08465de0b0788d96ac5f7271a2d01fbd8b845245401ccc38168184a42ddc65c1e206f006961dcd9ecb4b395ce92ccd92bee27b0f09f53e90c806559195 SHA512 bf97a9e3a65131058c88aec29d6675666eb68fb2c9fb1aa6343364d4536706aaa39eaed4da6dca47ea23835eb910ac9104acbf55b37879d268f9117fb8d788b6
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/files/hdparm-9.60-build.patch b/sys-apps/hdparm/files/hdparm-9.60-build.patch
new file mode 100644
index 000000000000..3cc1a7564e35
--- /dev/null
+++ b/sys-apps/hdparm/files/hdparm-9.60-build.patch
@@ -0,0 +1,32 @@
+* drop hardcoded -O2 flag from CFLAGS
+* fix hardcoded `make` and hardcoded -j4 flags
+* respect CFLAGS when linking
+
+--- hdparm-9.60/Makefile
++++ hdparm-9.60/Makefile
+@@ -13,7 +13,7 @@
+ CC ?= gcc
+ STRIP ?= strip
+ 
+-CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
++CFLAGS += -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs
+ 
+ INSTALL = install
+ INSTALL_DATA = $(INSTALL) -m 644
+@@ -22,14 +22,13 @@
+ 
+ OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fallocate.o fibmap.o fwdownload.o dvdspeed.o wdidle3.o apt.o
+ 
+-all:
+-	$(MAKE) -j4 hdparm
++all: hdparm
+ 
+ static:
+ 	LDFLAGS=-static $(MAKE)
+ 
+ hdparm: Makefile hdparm.h sgio.h $(OBJS)
+-	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o hdparm $(OBJS)
+ 	$(STRIP) hdparm
+ 
+ hdparm.o:	hdparm.h sgio.h
diff --git a/sys-apps/hdparm/hdparm-9.56.ebuild b/sys-apps/hdparm/hdparm-9.60.ebuild
index acb642f6568a..1bfffb80b2fa 100644
--- a/sys-apps/hdparm/hdparm-9.56.ebuild
+++ b/sys-apps/hdparm/hdparm-9.60.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs flag-o-matic
 
@@ -11,11 +11,11 @@ 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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-9.51-build.patch
+	"${FILESDIR}"/${PN}-9.60-build.patch
 )
 
 src_prepare() {