gentoo resync : 31.05.2021

3 files changed, 2 insertions, 38 deletions

diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index b0d85aa7b003..d21a18da2ca6 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,5 +1,3 @@
-DIST sdparm-1.11.tgz 473501 BLAKE2B 7c8b8a1c14b72de3c36cd701c6d870e0b671df2f17d17a63eb00cce41a80f3cbfbe9e3f2afca08f1a1a9be5a08fbb98a9ddb1ccdc117bceef508790407513754 SHA512 cb5d1dd351464fcc05005429bb8f452b05e6673b1dd8b699f762d005ab3e612b3b7d6ea400ffbd5e98e33e3e78da735d01705353b8a9b9567aac55a3f6b6d813
 DIST sdparm-1.12.tgz 486592 BLAKE2B 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6 SHA512 00e2775c290c6db3a02780dd3eefa58ac40e1df79a7f19f80a9d497c019a9a4a9a16fb2726f48e7083d0104a8e74326e683c3f5f44c7d1f591a0f607e10493b1
-EBUILD sdparm-1.11-r1.ebuild 1013 BLAKE2B b6ad08363dc6b2bcb1313ec286a8c8f89d0d00a606413f5df8021cfe5523143050bc30a5be3d774de29c84adbbce3449e0dcbfbc0ee2c505a2e2e698ccba1d0e SHA512 09908f1ed86909834dc4e42d310b4e411d446a28dd8d1da74b65a1d6246121443cec3ee55be72e507b12ac723794c9b09b8a0f810da77c7ebd27661d71d975aa
-EBUILD sdparm-1.12.ebuild 1019 BLAKE2B f260399daf449a20f2585ea61d6e8bb9f57ca5366b0c170e58d9b656a498ddc69af7e040379628cdb67f2eac3f0d84ef806196c7184ab4fdf35afb6ebe3a12b6 SHA512 01bb2a18c387fe7c8f1079ac3c937acc5101da5f943fec37926bd915d510182feffbc461321a16614fc94637ea3d993da7761d37a3c6cb75c4811c7a87c7568b
+EBUILD sdparm-1.12.ebuild 1013 BLAKE2B b6ad08363dc6b2bcb1313ec286a8c8f89d0d00a606413f5df8021cfe5523143050bc30a5be3d774de29c84adbbce3449e0dcbfbc0ee2c505a2e2e698ccba1d0e SHA512 09908f1ed86909834dc4e42d310b4e411d446a28dd8d1da74b65a1d6246121443cec3ee55be72e507b12ac723794c9b09b8a0f810da77c7ebd27661d71d975aa
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sdparm/sdparm-1.11-r1.ebuild b/sys-apps/sdparm/sdparm-1.11-r1.ebuild
deleted file mode 100644
index 3a51faebd89d..000000000000
--- a/sys-apps/sdparm/sdparm-1.11-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utility to output and modify parameters on a SCSI device, like hdparm"
-HOMEPAGE="http://sg.danny.cz/sg/sdparm.html"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Older releases contain a conflicting sas_disk_blink
-RDEPEND=">=sys-apps/sg3_utils-1.45:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog CREDITS README notes.txt )
-
-src_configure() {
-	# sdparm ships with a local copy of this lib, but will use the system copy if it
-	# detects it (see the README file).  Force the use of the system lib.  #479578
-	export ac_cv_lib_sgutils2_sg_ll_inquiry=yes
-	default
-}
-
-src_install() {
-	default
-
-	# These don't exist yet. Someone wanna copy hdparm's and make them work? :)
-	#newinitd ${FILESDIR}/sdparm-init-1 sdparm
-	#newconfd ${FILESDIR}/sdparm-conf.d-1 sdparm
-}
diff --git a/sys-apps/sdparm/sdparm-1.12.ebuild b/sys-apps/sdparm/sdparm-1.12.ebuild
index 451f17f9b145..3a51faebd89d 100644
--- a/sys-apps/sdparm/sdparm-1.12.ebuild
+++ b/sys-apps/sdparm/sdparm-1.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink