gentoo resync : 15.09.2018

7 files changed, 17 insertions, 88 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 60d42bed212e..a23d5c30eb6a 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 72296e09a2fd..aa1212fe37b1 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -6,10 +6,10 @@ AUX acpid-2.0.25-kde4.patch 1015 BLAKE2B 2e925c69ffc607126dafad82aa834e6f202769d
 AUX acpid-2.0.26-init.d 436 BLAKE2B de812b8d63f8427fc32b5d177f39d80cfdc8b92918cfe05de5483b6dd7c6091ce17ec65188376468c722c735cc2b01985366a9cedc693fd7d21eb6ada2055960 SHA512 7381d30b5c6478cdbf5dff93ae95baa0b3b1fe0a04b02cf491831f1657d6f71b8eef121b7e78f3201d11a5856bfb30df0a57437c76e6fbe05ad88cd45e86ae64
 AUX systemd/acpid.service 155 BLAKE2B 763b5f0ad5d03e91098ec9e71a17c5d0a52c90f1935381722513ef9ff5e53c4d1c98a989632a73707af006bf6a4fbd54f8e251b188eb84bfa8bf34c9cb8d5df8 SHA512 51c1e2a10968bd6555debf237c064dec7a347a5adfe0e8612e9ad49168e727d0779744ae8c2842b2e943dd46ab310343aeebb9eb6c9e85cb77123d966e8561b1
 AUX systemd/acpid.socket 119 BLAKE2B a0f22e8579c48d7258c81f7fb97a9566f1dd4722da9d2f68c1b960ee88ca432ab17890b556df913a44aaba9b91c309de073afa1710eea71528a3c85988533ad9 SHA512 9a8293166b3818255d39d972dd354e675d23e4d59fb4ce3a8b5dedbf33e809f808ae3020f308426ba8d9d1317396727edc5be5bf51a7a30bc40c809442c96c0a
-DIST acpid-2.0.28.tar.xz 156036 BLAKE2B a6a78f82f7f4ecbd0d883d175c921195970e157a919fefc9cf48a94db534b496a8570c031fda5b08df3fb1775e26a50b5942bac7717aa582d590605930e3af78 SHA512 effe9c3b30b4a6ea20eca4b36a06d4b3da9b262d100685958faec4b38f89377a87dcaecee7a69b87aaddfa47688bcc46fc47a38391ac4bd2019cb3b48ab18fcb
 DIST acpid-2.0.29.tar.xz 155568 BLAKE2B 9a2c9f2f8ba035bf7452b633c20a73796ca05d4849d567f076a08a8216f2e07ca7a0b25e995054697e70bacacad07872e153c6c47f8204294964b276bca49f62 SHA512 5f480cb4456b6b843adb239519a8d05f83c3c668525457e55d7fae2ba7725356ec7a1faa16bbd54086f0eab2e8ca20952180c00b2b65a27eda534c3f28e8ed17
+DIST acpid-2.0.30.tar.xz 155528 BLAKE2B cbf387dc6342e0f4256360e99c02f8ebf4c322cd1c1dbd4ff0fcf703a323b90cfb0eb256233917dbdb81cd9a5f9bd075c581de9daee3d3a311208553084a093e SHA512 6901e93cc626817b782e43976caf4b7f89e8c4275eb7e9d31aeeb967b5d5bbb6a2b4dcf71e72ba666e10343cdbdbe8528feee955af5ba14de8ec88ef61b29f96
 DIST sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd294248d48c8852f689f0a6082d9b74b33b77918d3ce21d7f1bf8a3aafeaa252e8fe170b3829155344a256f01fe80414369f02d50a17ff55 SHA512 f2c366c50c75790df32a1f6573b7de640fd09a97c4598155ebd0aad2eba118961ddc82fe0fbb4dc935aa5b6d7fcfe3ade73fff555b4588b0e4579a1028bef12f
-EBUILD acpid-2.0.28.ebuild 1855 BLAKE2B 62f1e4e4ec4166157ed4d6ff1bbfe7b5780d563f04cc13677994e49c050bab02bf29d5d314e7a193a2b5b9678956d5bc62fe87895c40be6dc80e13326ec11a07 SHA512 20d97d0e1bf2000efd03975a564f8c9c2f5d37312188311efcacc66d6918a85159f223054ccbd79f633666d423b603a8387dd40e23c36178561d534517d14de4
-EBUILD acpid-2.0.29-r1.ebuild 2105 BLAKE2B bfc3e6af77d185075e90e8909d4fcb0b24b3ae578e3efd74a1240524231f93897f78ed083207d3de67af3f88e6ca39618674674a012a961847744633997d8dc8 SHA512 43924ebcf12a742c181b4b73d5164a486482e0b93e6055f3c92363b03f1d225ade67f2e55155470d900838fe3d1f5f95fb99fdbf32d02fbe53e0de43ee422c65
+EBUILD acpid-2.0.29-r1.ebuild 2104 BLAKE2B f477d8ec3a9f417e2b3b44ef24652c0653ed01ed7b013ef86c9bab17463441da4da3c8939c1b4fdad4cae78f4eca783dca1dc251fa8621d2c92961c7c1eec6a9 SHA512 a88604dc9044e2dc401b3dd5bf469b88fe8526b0250c2c266ba81c260e785e68aa13ce8ddf8c4b37c9c6f069c31b45e22893799648ef10524f3f063f6960d575
 EBUILD acpid-2.0.29.ebuild 1858 BLAKE2B 4bf788cb1010e66eebc1aaa34b4b3851307588bcb1b78f6dfcc0fd236db897f512d4ca3f98d0c0864c6bd10fb1fc27fcbaa94c8439d2d647caf1f684de9f1847 SHA512 a76fbf6aa2260cecf8a08a0fa013dc14a7a4d7fd90ad65f6a8a70c64d1dea445c97cff7413cb08c13e1251e9634ae3f2c33f8866f4e0c561635c79eb4e6e08be
+EBUILD acpid-2.0.30.ebuild 1964 BLAKE2B 9d7d5320ae264613c61d57c32e4d76dcc9b4a4e9b8e1fc21a4cfe08eba4538b79ecbcde5f60aa3971b0a77cd3c229c3b2397796229f5524eb457e0b4423e2c08 SHA512 e69f770e5baf539b219984432d8bc6309051c9787141558ee17412fb0732ced6c1aea7062387c4734523b240921c9ca10b69a9b3a04e477886f3cbb57030fc46
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.29-r1.ebuild b/sys-power/acpid/acpid-2.0.29-r1.ebuild
index f751df7c4bc1..23eb1895e8df 100644
--- a/sys-power/acpid/acpid-2.0.29-r1.ebuild
+++ b/sys-power/acpid/acpid-2.0.29-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ia64 x86"
+KEYWORDS="amd64 arm64 ia64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
diff --git a/sys-power/acpid/acpid-2.0.28.ebuild b/sys-power/acpid/acpid-2.0.30.ebuild
index d55a1952ea66..931b65a63269 100644
--- a/sys-power/acpid/acpid-2.0.28.ebuild
+++ b/sys-power/acpid/acpid-2.0.30.ebuild
@@ -6,11 +6,15 @@ inherit linux-info systemd
 
 DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
 HOMEPAGE="https://sourceforge.net/projects/acpid2"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
+EXTRAS_VER="2.0.29-r1"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
+	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
+	"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ia64 x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
@@ -25,8 +29,6 @@ pkg_pretend() {
 pkg_setup() { :; }
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.25-kde4.patch #515088
-	"${FILESDIR}"/${PN}-2.0.25-add_mate-power-manager.patch #538590
 )
 
 src_install() {
@@ -37,16 +39,16 @@ src_install() {
 	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
 
 	exeinto /etc/acpi
-	newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh
+	newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
 	exeinto /etc/acpi/actions
 	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
 	insinto /etc/acpi/events
-	newins "${FILESDIR}"/${PN}-1.0.4-default default
+	newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
 
-	newinitd "${FILESDIR}"/${PN}-2.0.26-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-2.0.16-conf.d ${PN}
+	newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
 
-	systemd_dounit "${FILESDIR}"/systemd/${PN}.{service,socket}
+	systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
 }
 
 pkg_postinst() {
diff --git a/sys-power/nvram-wakeup/Manifest b/sys-power/nvram-wakeup/Manifest
index 30186f21b30e..66db6acd3380 100644
--- a/sys-power/nvram-wakeup/Manifest
+++ b/sys-power/nvram-wakeup/Manifest
@@ -1,6 +1,4 @@
 AUX nvram-wakeup-0.97-nonls.patch 450 BLAKE2B cd67fd5ba3fd5bb56d10040ae8e0e5e5ade7f787d201be879bc859e069c26fc560d66840b24e1ceeb00c6464f8c036620774c13c0af27d76c59352adefc567c8 SHA512 014c0d04d0b6a765a9ea1a42bdd11d5bc8f2d6c580f1a7d08c90b4622b6958a129add4c3be7c79e05e529e1dc38fffffe4c14d90a266fee252df71ac508121f1
-DIST nvram-wakup-1.0.tar.gz 1068875 BLAKE2B 85b68033b1c021f0dd17f929f9e759b5a628d6b998fda4ab5b7bbaf2f55acdf5c4b7cbaa2a8be13a52954f1a2d883aff57756ec15c52e2edc6ceb81d6fb08882 SHA512 f9f350323cfb65a33903edc5938c3503c60f4259acbc347d76aece65307d97e971e3350724e6d4a4870175db1baf1d3f1803b6536f0529371aae1f9fc6ee56c0
 DIST nvram-wakup-1.1.tar.gz 1070097 BLAKE2B 9e9aad545d7a7d0882cf07522c60a68ab678ad2dec8ba51828862afe077fa5a11929aaf5a21bae69977338fdf1de5cb394a874475dcc8b4018c4358e780fe786 SHA512 a47c6831e004e25f43adbc25aa46aca457602c681693621e3acda12f1f775aa1c5fa30ec9a09d71945ef2de8a2dbe97f9c1c7e09b1ae3464c368c9b8fc0f11e0
-EBUILD nvram-wakeup-1.0.ebuild 2053 BLAKE2B 2f1200b20de08267c1104cb4524b2c8eb86c4597de7b6605fc9d6051196796c229253211a219f9ce6416c0164bbaff108825180c5173dfdfa38bc43a65b26efb SHA512 90d8a806aaecea39e6a95c9bd1a155bd8fead151129f73e22143c30a7ac79886bd429d2187f02b59a5a15a10b9c6e01f9b8fc82a1121980adfdee74db42b9a9b
-EBUILD nvram-wakeup-1.1.ebuild 2084 BLAKE2B 6e8701e78bbcae6a0211078bf472cdb7ab77ae6266fba5ce9c3b0874651efa18cc0c89fd7ab70b84c9832062bba67addea6d8fb0c2d7181cbfdea6ad72aa080b SHA512 0605cbc1336fcbb0d9c5943ba914620ad932fd44a64c7400175df6be6583b7d8f8c7ec9e6e5d1c36e7f80bb682b6a8eebb65f61fe60fd54d38c49e0386e929dd
+EBUILD nvram-wakeup-1.1.ebuild 2082 BLAKE2B e2097441340b17b06e0b7eb6abe303d575af8b1bafc921e49891f8784798630c70371bb68630697c6c4f6360646cba14ac18d90730147cc1b0b9c98dabf05897 SHA512 8ad07b94c71b73a658d0cb9eee229caaaee5c9b038b0d60229283045fe3335ad31bbaf3ae70672f4043b69e0daf54b92d1ca6238454ad5c9bd1d4200df5619ee
 MISC metadata.xml 332 BLAKE2B da79324331fe0e03012a29f4a25a7df5ee5e9e3673c280f322f55ed62b969e72b85ff31411bd443b4234e60df86e1efa96a9de45a864d5871075d3934cd8ff08 SHA512 948648cf4b193094ffe04b679d159ea2acf4a42d5005792889b782d56fc96cccdd87ba2b92ed5eade664a379107a1ee3a2a197c6dd69b531c395ebdf38229ebb
diff --git a/sys-power/nvram-wakeup/nvram-wakeup-1.0.ebuild b/sys-power/nvram-wakeup/nvram-wakeup-1.0.ebuild
deleted file mode 100644
index e9ad08cbf064..000000000000
--- a/sys-power/nvram-wakeup/nvram-wakeup-1.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic eutils
-
-MY_P=${P%_p*}
-[[ ${PV} == *_p* ]] && REV=${P#*_p} || unset REV
-MY_P=${MY_P/e}
-DESCRIPTION="read and write the WakeUp time in the BIOS"
-HOMEPAGE="https://sourceforge.net/projects/nvram-wakeup"
-SRC_URI="mirror://sourceforge/nvram-wakeup/${MY_P}.tar.gz
-	${REV+http://nvram-wakeup.svn.sourceforge.net/viewvc/*checkout*/nvram-wakeup/trunk/nvram-wakeup/nvram-wakeup-mb.c?revision=${REV}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-[[ -n ${REV} ]] && RESTRICT="mirror" #168114
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if [[ -n ${REV} ]] ; then
-		cp "${DISTDIR}"/nvram-wakeup-mb.c?revision=${REV} "${S}"/nvram-wakeup-mb.c || die
-	fi
-	cd "${S}"
-	use nls || epatch "${FILESDIR}"/${PN}-0.97-nonls.patch
-	# Need to be careful with CFLAGS since this could eat your bios
-	strip-flags
-	sed -i \
-		-e '/^CFLAGS/s:= -O2 :+= $(CPPFLAGS) :' \
-		Makefile || die "setting CFLAGS"
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		MANDIR="${D}"/usr/share/man \
-		DOCDIR="${D}"/usr/share/doc/${PF} \
-		install || die
-
-	dodoc "${D}"/usr/bin/vdrshutdown
-	rm -f "${D}"/usr/bin/vdrshutdown
-	dodoc set_timer
-
-	rm -f "${D}"/usr/sbin/time
-	rm -f "${D}"/usr/share/man/man*/time.8*
-
-	prepalldocs
-}
-
-pkg_postinst() {
-	echo
-	ewarn "WARNING:"
-	ewarn "This program  writes into the  NVRAM  (used by  BIOS to store the CMOS"
-	ewarn "settings).  This is  DANGEROUS.  Do it at  your own  risk.  Neither the"
-	ewarn "author  of  this program  (nvram-wakeup)  nor anyone else  can be made"
-	ewarn "responsible to any damage made by this program in any way."
-	ewarn "(The worst case  happened to me is that on reboot the BIOS noticed the"
-	ewarn "illegal  contents of  the nvram and  set everything to default values."
-	ewarn "But this doesn't mean that you can't destroy even your whole computer.)"
-	echo
-	ewarn "		YOU HAVE BEEN WARNED, HAVE A NICE DAY"
-	echo
-}
diff --git a/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild b/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild
index 80a7ddac4035..48e4da2acae3 100644
--- a/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild
+++ b/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/nvram-wakeup/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 [[ -n ${REV} ]] && RESTRICT="mirror" #168114