gentoo resync : 17.10.2017

3 files changed, 28 insertions, 22 deletions

diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 042c70c401ff..1c6a40a09815 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -14,8 +14,8 @@ AUX slim-1.3.6-systemd-session.patch 820 SHA256 1cb2b5f322ae975cd5a5a9ccca45854c
 AUX slim-9999-config.diff 2480 SHA256 e3005e301c54d370cea3911ce1f3dc96f3dae579fc4ec91e7c4581b197084ceb SHA512 6018c5eadd0c63e86b07ad8662ffc046fd1f586c101dc84bc9452295a9a11ed1a82a6a8a228bf8d5e064cc5d17b1bcea8662f957b831c96f8ba21c0f55a0d216 WHIRLPOOL 1479e9e37ba520cd95f63920d68c76910a7390b7f9ab7677e6eea91f60ae21437f1e0f1d481fe39758c923db53cd3ac7cd6f2d17577af2da8dd0cb3539a42467
 AUX slim.logrotate 102 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 WHIRLPOOL 9e940bd1d88613e46ac4a333afa0f02cd16c583a1b34f509c4409321f7d5c5e14ec86e38e9743a6176187a72e403683127fbaf293abbef678e23873c428613c1
 DIST slim-1.3.6.tar.gz 232547 SHA256 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c WHIRLPOOL 473fa2f3752ec0c1bd2410ff3110649ce792c2e904928694b5fb8a43de619945276282e4a9de86198b9f38cdd74d1f9dc9cbcc754cc97989002b368ef26a8429
-EBUILD slim-1.3.6-r5.ebuild 4192 SHA256 1482c46164fcd85f5545d441943cf99c2ae03a3590e9810569a9799efcae90b6 SHA512 30666fddd7b6d85ea19a5cee3a6cca3eddaa08a488ba149fa38a9efd54d018d0e6d6d707d2a43c3247ed0d0c55212eda97dd7823e964f94b887e1d645e6aefed WHIRLPOOL 1fb5583b5dfeacf0c41a63fd1d08f6a990f9bff5858048e49669eadbd04c4ffdf02c2104aebc3373668376035796df960905d21f717176e28b1472f7769f651f
-EBUILD slim-9999.ebuild 4018 SHA256 468982fc85e8e793d661081f53abd5c384cc7b1d06c1bb6e8709bb81efe551ab SHA512 0c19543e3e0a17dcd57077e3a434d78844059d9c019ad0fec3c4807eeb7b84065e445aaf4f31949012f0d375eac6bc7b3a2cc4b3f009e0e1fa9d8c0da065f7a4 WHIRLPOOL 6bc8bd5a0ae21316c68da51deda870dbbcdb6e5abd94cf63ef0838de81e56b0e18453b3cce22202c52566cd035def1dadae4360d979a98bb44232799b2144580
+EBUILD slim-1.3.6-r5.ebuild 4182 SHA256 444e718911a24c8ee304f569560d3242a6ec08e934ed0768d88e45d9b90c4041 SHA512 c81b6e112a3b657763b376a5da461a9fcb48d14d3d8b2af7ecd1b17add81c8f06bc6322ae1a48f54267a33b7bbddf5fcb5f4541e97374d8651e00b129464485b WHIRLPOOL 9fd181c9315cb0e20573328b1e01eb00cd0090e1e98260071cadf5638c80b5fb7dff115b252e0fc4deaf14a5b02dbe024cf5b364818e7bf6630dff3713d17bf3
+EBUILD slim-9999.ebuild 4055 SHA256 3ebf79afaba19ea6732083429ac767af1349e7e0ccc9180b85ae5f0768d0176d SHA512 9027bc73ccb70c95b1000545bfbd8b1314f1a08d9833389b25887b929323e8379f7442182a0a802ea4ece764447f1a2dbbabd2fae31bc64e99b39afea4d04803 WHIRLPOOL 2339f479f1dba7360dde6a01838c7327202b26ef2b4b4f82da227604cc2f8d187b9a939c3730c20143056ebbbfe73b6b80bb20eeafc8ee653f38f8946468959e
 MISC ChangeLog 5333 SHA256 f9c57c79c9c3ba95f341184696aadc7687a54aacfdddc52dcf68706d51cc7d99 SHA512 534536b3c01ddd5f7eecfbb6f6dfcd73b351a4f7aea514a4af3fde846deb83c68320b4aac07ef519d619090a9ba0bdb2c368da73e445161f294032669ba1aa10 WHIRLPOOL 052878a509d34f34576d1b7be013efffc77c33d27eb8796e4b5dda6c5a5bbee497d2a771381b80f4a9983b663b1a156b8d3f02bd83bb1d603e3e722d0e6c6a5d
 MISC ChangeLog-2015 22739 SHA256 1e67ee4595a1e8158ecd11793aee571869c36ac957cbfcee33568fe3322567c2 SHA512 b4b057c02f75ce35393919f66b30bdab9e022ec3b4c84a3f2b1df8326cff73544242a7f8e89573158f4c3900de3445bca7cadc04e7711238ab5671d93ddbaf9b WHIRLPOOL f14e454abea01516a1fd930fa599077b09e0f53984fa377070e2ee706cc44392622793a7fb351d492cc7a6d89dec11b78293dbd0fba3f21e174aa55d43515097
 MISC metadata.xml 514 SHA256 8096ec96a71df42b3dad271816d305140ad3dc67321778a300a8d3876a4fcb0e SHA512 28f99f92bda5c50f97a164aa53915ecc458dfd84e6c3dbfb9dbfd6e64d0a98b7de9bfc202949506b2af91cb716a8b681f1db07b974d3d3776f15e2cdf5129950 WHIRLPOOL 695802103c841ee6ae60fe8225e6eefbbeae6ed65d7dcf51b249a77c3ef1339e485f29c60ddd4f392aa9e524fe97e5e9a7ed519c262b62fd67b52d0836265e60
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 6663621cf77b..3a0c714df65d 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,20 +32,24 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto"
 PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
-src_prepare() {
+PATCHES=(
 	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${P}-config.diff \
-		"${FILESDIR}"/${PN}-1.3.5-arm.patch \
-		"${FILESDIR}"/${P}-honour-cflags.patch \
-		"${FILESDIR}"/${P}-libslim-cmake-fixes.patch \
-		"${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch \
-		"${FILESDIR}"/${P}-strip-systemd-unit-install.patch \
-		"${FILESDIR}"/${P}-systemd-session.patch \
-		"${FILESDIR}"/${P}-session-chooser.patch \
-		"${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch \
-		"${FILESDIR}"/${P}-drop-zlib.patch \
-		"${FILESDIR}"/${P}-freetype.patch \
-		"${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch
+	"${FILESDIR}"/${P}-config.diff
+	"${FILESDIR}"/${PN}-1.3.5-arm.patch
+	"${FILESDIR}"/${P}-honour-cflags.patch
+	"${FILESDIR}"/${P}-libslim-cmake-fixes.patch
+	"${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
+	"${FILESDIR}"/${P}-strip-systemd-unit-install.patch
+	"${FILESDIR}"/${P}-systemd-session.patch
+	"${FILESDIR}"/${P}-session-chooser.patch
+	"${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
+	"${FILESDIR}"/${P}-drop-zlib.patch
+	"${FILESDIR}"/${P}-freetype.patch
+	"${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
 
 	if use elibc_FreeBSD; then
 		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -55,12 +59,10 @@ src_prepare() {
 	if use branding; then
 		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
 	fi
-
-	epatch_user
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use pam USE_PAM)
 		$(cmake-utils_use consolekit USE_CONSOLEKIT)
 	)
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 1b8b9a68b1c8..7b08d5e831de 100644
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-9999.ebuild
@@ -38,9 +38,13 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto"
 PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
-src_prepare() {
+PATCHES=(
 	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${P}-config.diff
+	"${FILESDIR}"/${P}-config.diff
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
 
 	if use elibc_FreeBSD; then
 		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -54,7 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use pam USE_PAM)
 		$(cmake-utils_use consolekit USE_CONSOLEKIT)
 	)