gentoo resync : 16.06.2018

7 files changed, 14 insertions, 16 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index bfe07efbd16c..2e15a33bcf7f 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-fontconfig/Manifest b/app-eselect/eselect-fontconfig/Manifest
index df15fed69a10..c306f8aef133 100644
--- a/app-eselect/eselect-fontconfig/Manifest
+++ b/app-eselect/eselect-fontconfig/Manifest
@@ -1,6 +1,6 @@
 AUX fontconfig.eselect-1.0 4394 BLAKE2B 47b3570309471efbe4c0c5bfe64949a2933ff6067fe2766e03eccd3b2de6ea044debbe3de92ca6384db76ee9d25d8a541be9a1e65e24b7e0c468e6cf0fca1d9e SHA512 5ca29ddbb672193eac8edc1acdefee0f7924aaba23d8ce40317d3dacd339e820462382d3fdf233c2cf4e4b258a2956e7b86ec6f4f541876789ab234aeaa81f42
 DIST fontconfig.eselect-1.1.bz2 1713 BLAKE2B 30af0471a52d7e2785e6e0e5847f51f3a11d0fb53eb800a5314e18dbb61694f1542d71c3e0f4ceccf82a396432113529b0fdb1b5fc6eba37550b27410565c61e SHA512 3b5978e20009754f09cd39e39771e8151cbb7bda60378cda718182b2df2c267a64af5ead220a079fbeeffb30586bc432bbc83b94e4f910205c4a29040cd2ccbd
 EBUILD eselect-fontconfig-1.0.ebuild 547 BLAKE2B b70e0ed2e214ebd2d1cce70b0973ab1e0dee2f69d0b2f04676d1c691972f7d62a6d811ebabb7cadd214201ba0bcd17dc4c644070234b5687c23c56efd4dc6572 SHA512 db69bba98ea30fa5d61696e0ab25b74528c5c27a8410be24ed0efccc9955e7cec91f397b6c901c3f1300e80ce38b9c80c2f81e0a135f6233d8a8ef47f9ae7d83
-EBUILD eselect-fontconfig-1.1-r1.ebuild 789 BLAKE2B fefe90a8991b2783328a29ef49a8e79d609a7edde161706c44e3c8fadd343444d32914fb3ab3b3857db015c38a07667b32372549509881d248b6ae9a91bafc4f SHA512 3a9f09a980c5216f2756928cc2a2c419c7653aa4770a78ab5ac8082a3a92a74203cd4b216ef468551142d00acf2fc0f452bf691ef6da3a2d6771ef81684bfce9
+EBUILD eselect-fontconfig-1.1-r1.ebuild 779 BLAKE2B a300a7e60a70603450461d0fe4739598c107f261bc7ed6216aee65a6ddcb0e58dc36c522c36aad11be2502d1abaca3d04debc9db877d826bd53c48fac5965dd1 SHA512 9252f2c55633f6eb6166d9331296ace0be9664ebbdde8561df9ee134a9f979b6dcf6f4ad74cd23eefdcb9b9dccf5432aa4423f447cbd7a37e8c3d957f32082f9
 EBUILD eselect-fontconfig-1.1.ebuild 778 BLAKE2B 5692e983a9ac116d9d09f42a5d560cd6a777c8a851b53c7823b9feef836a8f6e118b56ebc4b449c570e6b0897bd49656ab0063b8bbeced0d284fc8bc52b94af5 SHA512 606b9b8e27c9a42e456123d551df54f3a2b1ae943c2cea185fd6b3711c2b4d24167d7934a009e0e2a067bc3af7ef9a88c29ec16a0ed87ffb9b033b7021629992
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
index 1bc8260b7b6b..a62e8774588d 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
 HOMEPAGE="https://www.gentoo.org"
@@ -12,7 +12,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND=""
 RDEPEND=">=app-admin/eselect-1.2.3
 		 >=media-libs/fontconfig-2.4"
 
diff --git a/app-eselect/eselect-infinality/Manifest b/app-eselect/eselect-infinality/Manifest
index b2d5ac18c308..404e6980f64a 100644
--- a/app-eselect/eselect-infinality/Manifest
+++ b/app-eselect/eselect-infinality/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-infinality-1.tar.gz 8274 BLAKE2B be4696f34c908a5e6e55546dbaf63a753e936f06074face5f8c9964f89015ee7be88c935c32d36a255c9e7ed71e967d4591ee0ad598f5cbfafc809149e728b3b SHA512 0bff25817b68125c670ffb2782704604415f233711974c47935bd5dac80b164ca471cea1fea193886b30d0eec60a4a208f0ede6bd1a40488c2458a7dd9fe127d
-EBUILD eselect-infinality-1.ebuild 695 BLAKE2B 1f6a5c3a9185cf2a73257f8558531b64b27951c53595495a4c487eaa128328ae8efeebd9e17942db09e39f3b711d401b418c367cae2a1bb42067e83026fe5503 SHA512 6ded213c904bf4bb7dcc927b5bf95b7341a85205b5bf6d2a0a082e032507d28cdda906742183e453043daad508af8bc244fd744545d517bd95b6fc0e1929ca65
+EBUILD eselect-infinality-1-r1.ebuild 698 BLAKE2B e3a20c706cfda7f0319751def8f49a03236cecf22ed068d7b3815d43be35d2a538616d176315f184ca4aa8b53e2a494b84d9eb5324c4284b3c5f514800e4f559 SHA512 81afb855c952f12c56aa6d3d46d027d1d8c9791ce5213706e5acb5017ab0dfd0fafe95d0d10a6b783d2c87e40da91b861083442d0fe214a0720d9604e1d210d3
 MISC metadata.xml 338 BLAKE2B 19f8bbc98dc95fbdf49922713afa90c1e1fbfaaf7c96fdd7862720be12de546f68155d2a3e76e7547a4530e8e0ef13e7c411d8cda9d4f8869536481da71d3d40 SHA512 f4a839e992f958b55552878bcde35f45bb7f8130b5fae9b382793e3aaba710230cf703b965eb0007ea5cad31e2702d88536c32d19cd30e05fb60bb359e965351
diff --git a/app-eselect/eselect-infinality/eselect-infinality-1.ebuild b/app-eselect/eselect-infinality/eselect-infinality-1-r1.ebuild
index 8d4606437afa..a6353e254a52 100644
--- a/app-eselect/eselect-infinality/eselect-infinality-1.ebuild
+++ b/app-eselect/eselect-infinality/eselect-infinality-1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit vcs-snapshot readme.gentoo
+EAPI=6
+inherit vcs-snapshot readme.gentoo-r1
 
 DESCRIPTION="Eselect module to choose an infinality font configuration style"
 HOMEPAGE="https://github.com/yngwin/eselect-infinality"
diff --git a/app-eselect/eselect-lcdfilter/Manifest b/app-eselect/eselect-lcdfilter/Manifest
index 9a2d00ed02e5..2e582f45c255 100644
--- a/app-eselect/eselect-lcdfilter/Manifest
+++ b/app-eselect/eselect-lcdfilter/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-lcdfilter-1.tar.gz 17206 BLAKE2B 8ac9b6b85819104dd9ce25a08e28694497218372a63f65000591546aa51de94ad6dd03530f62e1e5b5bc8abf0090b9695e8cce04c6a2d37684d489fff983be5f SHA512 1f86fb2cc21ff9cc9b79c50578a02f7c461ae203533cc817dc733d0dde9ad43763267bb1703b9495ba6f46989e0446bb1cba39aaa705d3b605118f62cb0d2dfc
 DIST eselect-lcdfilter-2.tar.gz 18365 BLAKE2B 25acb2f29c3248711fbe5cfd9ba9fa7489de246ff1a4b07121d45987650e89389bb12a299520181c2012ea74fd8f4b87b8d33dcf0ab1dfea8beebb5b8928580c SHA512 e17c475c860f0a3ad7249d21ca11c52f3226852ba042b83058baf6823242c4f8be0042aad52029757944fce6d816df386b928f2005ab87e0778d3ecb26ceec92
 EBUILD eselect-lcdfilter-1.ebuild 994 BLAKE2B 687b7600c746fc51a2be57749142f5a32b7e043aa5a4a85ac2781459f31c316bd1351e803e5fb1f9d779c87950330caecc4c4d861669fefbd7e8fb366c298f60 SHA512 871e6671cc69ddab4d230af7203c149627d21730819435710590c1e5f0094882c6a15cbbe6c7ae5561c2a4c5c1a942de7971d0c9aea1e12659fa5016af93cacf
-EBUILD eselect-lcdfilter-2.ebuild 1021 BLAKE2B 38747b2b7706cafeabb7dfdd9293a231577fbb97cbdfa4448206544e711e8049dcb79c056ee00cd0aedd312af79cb95f0e1d3d1c5a15c31282ee061368259aae SHA512 82487fe67826c79a252d4177959016cad16b326a8ed4dc6eef63d56afd0565fc72cec03005f46a444f5989f0f2047f04067b1bd8d068ddb2881ba3738745edfa
+EBUILD eselect-lcdfilter-2.ebuild 1017 BLAKE2B 4415986a1891825048e5efc214468e7d7676d332606e0886700501a88ad29e51e5b837df40dcdea061460de15d85b12a6469dbc1afe87e111bf1b6bb8b1c3901 SHA512 2d09f0f3269ab196d6a3293e8a92de964d6a87559f76963d13ffdc197826ea54e541a91f09eaa35c8e68e8ef8a360fd3598cccd43bcfa2c0cb576260fbc594a0
 MISC metadata.xml 337 BLAKE2B 9228fb77b981e77d2998e14e342da38e1c6f8a3211ff0907ff63004ba38d7347fd5e7ba76e3da1d7d619bc2e4a24e86ac8b9d22cc7f329b8af28603a0abb23b5 SHA512 4f60f1456c6e04af05a9f716dfed68d56462dcb599a50f6c4de38f6621d13eea013740e5dac04e1f0a8da5775eb429954f5dfe85bed6f7bbbad6e6a768cb5b12
diff --git a/app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild
index ae5074c16aca..6f0ea6b5c257 100644
--- a/app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild
+++ b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit vcs-snapshot readme.gentoo
+EAPI=6
+inherit vcs-snapshot readme.gentoo-r1
 
 DESCRIPTION="Eselect module to choose Freetype infinality-enhanced LCD filtering settings"
 HOMEPAGE="https://github.com/yngwin/eselect-lcdfilter"
@@ -13,17 +13,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
 RDEPEND="app-admin/eselect"
 PDEPEND="media-libs/freetype[infinality]"
 
-src_install() {
-	DOC_CONTENTS="Use eselect lcdfilter to select an lcdfiltering font style.
-	You can customize ${EPREFIX}/usr/share/${PN}/env.d/custom with your own settings.
-	See ${EPREFIX}/usr/share/doc/${PF}/infinality-settings.sh for an explanation and
+DOC_CONTENTS="Use eselect lcdfilter to select an lcdfiltering font style.
+	You can customize ${EPREFIX}/usr/share/"${PN}"/env.d/custom with your own settings.
+	See ${EPREFIX}/usr/share/doc/"${PF}"/infinality-settings.sh for an explanation and
 	examples of the variables. This module is supposed to be used in pair with
 	eselect infinality."
 
+src_install() {
 	dodoc README.rst infinality-settings.sh
 	readme.gentoo_create_doc