gentoo resync : 10.11.2019

6 files changed, 5 insertions, 67 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index c5c9d8c96374..3c14964d6274 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/nvram-reboot/Manifest b/sys-power/nvram-reboot/Manifest
index 46e5610a9f72..bd0ae9f75c99 100644
--- a/sys-power/nvram-reboot/Manifest
+++ b/sys-power/nvram-reboot/Manifest
@@ -1,3 +1,3 @@
 DIST reboot-2004.10.03.tar.bz2 425622 BLAKE2B 1f434fc58a066ecc9bee0e839eef035b32d9bf2fff78f73c5ee843e2a856084f1e0653d746744312595000706292250aed03f714e606d3facc0a44e0a9fc8945 SHA512 b85a7372369f3ba9e36af1b96ccbf31ba1febcc3ebf31a8684332d370ea85428a3bfc4855c7df10f9b92a3c57b704fabbe5069a792cd8aaa1b45511f88c41906
-EBUILD nvram-reboot-2004.10.03.ebuild 604 BLAKE2B e0bbbbf43122c53583655e0b87c65971db9e139612bf90e069132fe1b263692e8b918ea7974c8783db42bffd74adc80e8a88d7d74d81af0c03cb986e6e73c99d SHA512 25ec9984ccad58c42edb8c4f2d5625632aa728284d2dbca1d45ef7adbb17c2a20d1f65e2d522b522b43f5ac06b1429d7f40620fd7bb1d22b0539083974d5bdb4
+EBUILD nvram-reboot-2004.10.03-r1.ebuild 585 BLAKE2B 819b19ada4775d0350e0e00bb775098c67572027def888a10670ddaed6048aa529940d9aeac0c4c79c49af82ea77daf290085db343f9d22c7f847bd53e270a92 SHA512 ff101c58b4c02ee4f65df027b391f0593cfac13b6ab857ce9062d3d0102b29e2ce919932af0a53a2d11fe2ad8eae659a6a0edea5a76d07cdddd30a85dd4e305f
 MISC metadata.xml 332 BLAKE2B da79324331fe0e03012a29f4a25a7df5ee5e9e3673c280f322f55ed62b969e72b85ff31411bd443b4234e60df86e1efa96a9de45a864d5871075d3934cd8ff08 SHA512 948648cf4b193094ffe04b679d159ea2acf4a42d5005792889b782d56fc96cccdd87ba2b92ed5eade664a379107a1ee3a2a197c6dd69b531c395ebdf38229ebb
diff --git a/sys-power/nvram-reboot/nvram-reboot-2004.10.03.ebuild b/sys-power/nvram-reboot/nvram-reboot-2004.10.03-r1.ebuild
index a66f39e0b684..d4f0e45cb304 100644
--- a/sys-power/nvram-reboot/nvram-reboot-2004.10.03.ebuild
+++ b/sys-power/nvram-reboot/nvram-reboot-2004.10.03-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit mount-boot
 
@@ -21,7 +21,6 @@ S="${WORKDIR}/${MY_P}"
 
 src_install() {
 	insinto /boot/nvram-wakeup
-	doins apm-poweroff.bin bzImage.2.4.20.poweroff dioden-poweroff \
-		|| die "doins"
+	doins apm-poweroff.bin bzImage.2.4.20.poweroff dioden-poweroff
 	dodoc *.patch *.diff *.txt config.*
 }
diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest
index c221acd9c754..d36c48778751 100644
--- a/sys-power/suspend/Manifest
+++ b/sys-power/suspend/Manifest
@@ -1,6 +1,4 @@
 DIST suspend-1.0_p20120915.tar.xz 111080 BLAKE2B 99eea1d9808219373501001f0af90973c9176c1b19d62bff7be26886b11ebb514134b68434e9b453146ef1a4af2c4cc8e26326b956a1b2378c38c100638af17c SHA512 bb714b4a7c0f5749c4b711a5c38ca5d8cb5078176a75387957123f75cfe8348adc3aa4e96335eb65c14ad1dd2f99fd6dbca3b415525dd39b3c547f9b13b775be
-DIST suspend-1.0_p20150810.patch.xz 6172 BLAKE2B 026aee69c59119b2d51ec1bf396633b2a3df018c95eecc53106a2d99017169a95951f8296a4962b32e5ea4c8d8cf4ea77f693367866137390048bc137456fe4d SHA512 cb186bdb0619ed4852e2ba12d6048f26fa23c7556d7c95713f14a4258fbb014bbec2281edee6478ebf5916600b674d47d8ba53e7644391de933b03e9fd1b96e9
 DIST suspend-1.0_p20190605.patch.xz 6224 BLAKE2B 0eefbef5a8d777590f69c85b02edb5575a357b373b78d94846e2c2bd59430cbd55af59ee0e676faa7f60388cb3910adb2182dedadb1fdc1df38a409411ea2df1 SHA512 cf576a029b35306368cbdabb9863965e055198920b86eab7205083f3502ae69ec3e8a4267fb6ceaaf1560a8bdb0c59543453f1baad4758c8adc4ac4ae92736bc
-EBUILD suspend-1.0_p20150810-r1.ebuild 1238 BLAKE2B 59622315e2d58d9964c25f32c3822015291a9fadc5172607231d148faea005cfab097f4715a9d8ae903889aa67517529095526e6abee5d1a1dbfd77fe84d8dc6 SHA512 72088eb67fb794ca2baeed5f2a9b574068f959bacf58509eb5314e84a2a1807c17648f1c82e21149a277b97e37c5065c92f88369c7736e6d1b78af34376fd37b
-EBUILD suspend-1.0_p20190605.ebuild 1274 BLAKE2B 00535874ddb86768702d1b38dcdb37c4f1a3862f6bcb870d48452f888a8c5f3cbc3431b97ae3dafe60cd26ec43ad6f1d50fe7285efc446e9a94ebd16adb65b34 SHA512 a26639411a6e24d6767faf1e168e5ceefef400a38b045a2a59dfffb18c1f2250e03c2ba09e08aecb008597b7de65b2805d335b3928b20c6a0b9267f3460b053d
+EBUILD suspend-1.0_p20190605.ebuild 1272 BLAKE2B 79fa816ac9e697b25e0339723311649955d646fae4411bd267638002889b536c9027a6bfef574100b46a39ed94ba9661df4cdb75db2196dc2126b48d092ae38f SHA512 9ecb5db5b5e7cfac88e968652a0a1745bbaab8f8f7548f36a2fada30bc50d835fa63b9bcf3907a97c8835bbd55a4db21084c3eaba38e5dcd696f63a1533100d4
 MISC metadata.xml 471 BLAKE2B 2ea30120686624747556b6498973fbd771c5d58ef822daa17f2f162ca212631b2657a0d2c8ac07e25f654e478f1be70c7fcf256112fbf54fe5adc1dc565509e8 SHA512 e357c0bf04493ca74cd36d4f3d5781c3d03afd24cad914a0fab8149c99a5543bc4dddee538d235147ea3b73a8ba081e16badde28bf10af52b2cb99eb89c19f4a
diff --git a/sys-power/suspend/suspend-1.0_p20150810-r1.ebuild b/sys-power/suspend/suspend-1.0_p20150810-r1.ebuild
deleted file mode 100644
index 14c95b47135a..000000000000
--- a/sys-power/suspend/suspend-1.0_p20150810-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-BASE_PV="1.0_p20120915"
-
-DESCRIPTION="Userspace Software Suspend and S2Ram"
-HOMEPAGE="http://suspend.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${PN}-${BASE_PV}.tar.xz
-	https://dev.gentoo.org/~bircoph/patches/${P}.patch.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="crypt +lzo threads"
-
-RDEPEND="
-	dev-libs/libx86
-	>=sys-apps/pciutils-2.2.4
-	crypt? (
-		>=dev-libs/libgcrypt-1.6.3:0[static-libs]
-		dev-libs/libgpg-error[static-libs] )
-	lzo? ( >=dev-libs/lzo-2[static-libs] ) "
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5.10
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${WORKDIR}/${P}.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--disable-fbsplash \
-		$(use_enable crypt encrypt) \
-		$(use_enable lzo compress) \
-		$(use_enable threads)
-}
-
-src_install() {
-	dodir etc
-	emake DESTDIR="${D}" install
-	rm "${D}/usr/share/doc/${PF}"/COPYING* || die
-}
-
-pkg_postinst() {
-	elog "In order to make this package work with genkernel see:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=156445"
-}
diff --git a/sys-power/suspend/suspend-1.0_p20190605.ebuild b/sys-power/suspend/suspend-1.0_p20190605.ebuild
index 4987f5237b2b..9ade9df39d9d 100644
--- a/sys-power/suspend/suspend-1.0_p20190605.ebuild
+++ b/sys-power/suspend/suspend-1.0_p20190605.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${PN}-${BASE_PV}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="crypt +lzo threads"
 
 RDEPEND="