[gentoo-commits] repo/gentoo:master commit in: sys-power/acpid/

["Andrey Utkin" <andrey_utkin@gentoo.org>]

commit:     b596268ae438301d51f2f1e0dc2b39841a3b99c5
Author:     Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
AuthorDate: Wed May  9 14:48:36 2018 +0000
Commit:     Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
CommitDate: Fri May 11 00:01:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b596268a

sys-power/acpid: use extras distfile instead of files/

This is to comply with QA policy of keeping files/ small.

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 sys-power/acpid/Manifest               |  1 +
 sys-power/acpid/acpid-2.0.29-r1.ebuild | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 9ff66cb6dd0..f9dc14c0197 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,2 +1,3 @@
 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 sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd294248d48c8852f689f0a6082d9b74b33b77918d3ce21d7f1bf8a3aafeaa252e8fe170b3829155344a256f01fe80414369f02d50a17ff55 SHA512 f2c366c50c75790df32a1f6573b7de640fd09a97c4598155ebd0aad2eba118961ddc82fe0fbb4dc935aa5b6d7fcfe3ade73fff555b4588b0e4579a1028bef12f

diff --git a/sys-power/acpid/acpid-2.0.29-r1.ebuild b/sys-power/acpid/acpid-2.0.29-r1.ebuild
index f9699804c53..0a9dce65d57 100644
--- a/sys-power/acpid/acpid-2.0.29-r1.ebuild
+++ b/sys-power/acpid/acpid-2.0.29-r1.ebuild
@@ -6,7 +6,11 @@ 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"
@@ -25,8 +29,8 @@ pkg_pretend() {
 pkg_setup() { :; }
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.25-kde4.patch #515088
-	"${FILESDIR}"/${PN}-2.0.25-add_mate-power-manager.patch #538590
+	"${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.25-kde4.patch" #515088
+	"${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.29-r1-extend-pms-list.patch" #538590, 628698
 )
 
 src_install() {
@@ -37,16 +41,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() {