gentoo resync : 09.06.2018

3 files changed, 16 insertions, 12 deletions

diff --git a/sys-fs/cachefilesd/Manifest b/sys-fs/cachefilesd/Manifest
index 000ef0054d29..4da176d385ce 100644
--- a/sys-fs/cachefilesd/Manifest
+++ b/sys-fs/cachefilesd/Manifest
@@ -3,8 +3,8 @@ AUX cachefilesd-0.10.9-makefile.patch 609 BLAKE2B 0b6f518b71866b4220164ec27a8ba3
 AUX cachefilesd-3.init 1677 BLAKE2B 20406636f93b3e002ab15bb33879101813a7bcc23dfe0b5dbc35e24ec3f192023e4cfbacefff6985b39bcc205575ba3b9b6ed44be96679b7486df550641a11e4 SHA512 ca227db027c1673f9e1339f6a3952c93a2cbdf454adb690e43c8eb49860cf998b5e12f0191ec58c78055212f7a65269b77a413e7ee89c3293ac9a3af5a0ec8f8
 AUX cachefilesd-tmpfiles.d 32 BLAKE2B 26527e8c3b8e821fc05c6bb1ddd0a6cf74857f8219307a96c4a12cc25517d26bd3b377deee41eae00b0a12ef55a6a9b9820836ae57bbfdb4c2b381a2efa6bb71 SHA512 37ddd3a452cc1d639b3ea3e98fc528c4552dd7f768a05fd1e4ad1821bbd6a0092f1cc5cfa4e7e41664952e4fd06001724fe64f6a16115fff15c542732d2ffec3
 AUX cachefilesd.conf 296 BLAKE2B fce58c6af2016c45c0545b86c4dd98ffba8f58193af0b163a8ba83c297c9a9af944ba6d8997da5f1ac44c8cb331fafe94f93ed0b5fb4d4b14c5025cf6436b46e SHA512 6b82563b27b3a202afa6922bf4059836c7d363c5350d2b348ecca6ae12de2ae31d903e65b00f427712e7df22c0401b181177e168715e5e375b290f6d247fd846
-DIST cachefilesd-0.10.5.tar 112640 BLAKE2B 2dadd76c522fb4fb7cf3fdf5dc69d43e7585c21d8988ad44714a0f30b110c2eebae855c71f61259c39e7018391c24a14e894bddfe4eaaa9766a93f912bf6ff6f SHA512 996e47de40cff4d2c0d265689ef3a33aee6ef0d0432a03d7428133c091e77b0e099bd1346b5638bf2d9df6bb47bce519491b420d5916a3211c4e04e158ad92e8
+DIST cachefilesd-0.10.10.tar.bz2 26694 BLAKE2B c527a6283617ba53818e0cad1859544b1e66af1107b05d1f83904669425d31c5374f3c032b892c9d95892d02d9256bbd9b180f1d0b6b430f0cfa70440406ef9f SHA512 d7d816b5ef1fffe1272cb8c2e9cbd18c1393438afca250436a36a446c6a37303e7784057725a56be839e0489101190b563c4fc015fc4ff11baa8003121e5183a
 DIST cachefilesd-0.10.9.tar.bz2 26555 BLAKE2B da5df1d2c6715a7cc304b32842f00e69d356359abfae865cfc1b63b89e1149bcb48762ddf84d13f5d18b727d8e0693257d424e599c3874bbe842da9aed4a0cfe SHA512 06ab444a7df8ec37c15bc03554510f4acbb453e0730277f036abc5d61f9e377d90d9387dd5237ea481b95b1bf097b5992adce90ce971fe29760cc4c0d3c9cf34
-EBUILD cachefilesd-0.10.5-r4.ebuild 1480 BLAKE2B 727ca79292b21ce313374e069b7c0dac4e3ed57cef36054344848f9df165480d1f08a9b18433a5f741d98e5145ddcd5164128232faf03a8aa7a325e0294749e8 SHA512 65cea8918efadaadca5a2eb422b1fa1082d741977ac8420eb2b7f2e7fc6c03e758cfd046c1cf1f609a1f50d046132bf029b9f490fc1e3eb458c25315f582fb92
-EBUILD cachefilesd-0.10.9.ebuild 1475 BLAKE2B 678722c38815e850e1a011eaeddd5d2f7cef56dcb6b2acf222da0173afacb3be820e4d6f7985c55038ba459fb01776cdb1b2fb14c3e3b6ecc23f57e80082ae5a SHA512 7c554794416a185738ba1fabda6395fe6443b6eb519bf2c750a414980cd66af5b218c9375a9747d0234b7566f1b583f2c4d267f66fc780dc1db0c4bb27de6c4d
+EBUILD cachefilesd-0.10.10.ebuild 1478 BLAKE2B e94563ae245a849ade78e8e89e3df399a5190cdf4cc4412b2437c99f8b1ef3c19b6afdbdcd1653e865f3062d59312813abea5ac7ead3dc7c81096f1d7a48fc31 SHA512 21c5044a4af28a5c8fa6aa36c2b579c60e8f964bd5f13aaece7315e05ddc5751fb3ee8dabe467f6dcfa7ba82f53457f58c6783ebd2c20fc5a99e1f1d845a8ef8
+EBUILD cachefilesd-0.10.9.ebuild 1474 BLAKE2B f6f6a711efb2f8a6e4da64eeef209aabc7c3fbbefe99381bff20761d9295d2717e65c983d83a588348a62f9df3c0242c1d2858d3b61a5d4714c51b668938a0a2 SHA512 ca2637b562004f977847dc0697753b2114a5ed53dca94906209f90e763bb2126e36fabe59f6ef8ddb2579387eed090d76a6f1c8726d0b4a7882af0db0ca587f3
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild
index c1084bae7fcb..629ffd58c2cf 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils flag-o-matic systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="Provides a caching directory on an already mounted filesystem"
 HOMEPAGE="https://people.redhat.com/~dhowells/fscache/"
-SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2 -> ${P}.tar"
+SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
 DEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.9-makefile.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.10.4-makefile.patch
-	tc-export CC
+	default
 	if ! use selinux; then
 		sed -e '/^secctx/s:^:#:g' -i cachefilesd.conf || die
 	fi
 
+	tc-export CC
 	append-flags -fpie
 }
 
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
index b0bebcb564b0..2e389839aefe 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"