gentoo resync : 28.04.2018

11 files changed, 10 insertions, 152 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 8c8d0eedb532..a5fad5c07cb5 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index 10e2441dd1a3..0db661830c11 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -3,5 +3,5 @@ DIST dejavu-fonts-2.37.tar.bz2 12050109 BLAKE2B f79504870b2b8748a23dfd58221ebe5b
 DIST dejavu-fonts-ttf-2.35.tar.bz2 5092541 BLAKE2B 49b7d4a4fb88bd4a6a98ec8e37e3b80c084171a8632b9632c9bcb41ee3f17f93114c9f35c513a769d901a70271380e4af209232a7719b081afd72c78028c4b49 SHA512 af0120e4c409cdcf31994499b2f24cb34e07961d5e48a70959ce6309df219e19bf35d0bb2a11f6ef5e24aa5788136998ec94fc2608bb6f409ba324595e858006
 DIST dejavu-fonts-ttf-2.37.tar.bz2 5429777 BLAKE2B d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a SHA512 bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654
 EBUILD dejavu-2.35.ebuild 2138 BLAKE2B 1be5537b1617cef6379bc45456557e01a877e6f5be30b5dfbb2257c697c1cca0d76094856907b4339b58f1eac4fce494c736e854ab78ea08a5b3522cb44e3e7b SHA512 7ebb17717372bade13726987d3f8c7bdedae0577fad1f63256926a7da676875a70ed21e8b9b77b52e2e4b7392d7c50bb6778df1d55d9f503c849d30c541824a5
-EBUILD dejavu-2.37.ebuild 2211 BLAKE2B fd75d8f0eb2147168ee0d3425844cd2c7a6fd3b8134fcd7cbfda977a4e30fb73e8ea673bb49f129b20958161a2ed8e6c0c7b7d17928733b85a5c93e1c20ee997 SHA512 8484875ec7a562dbf3ea4d69e8f5ff56e9da0864cf70b125f94d0c765f6c14a6dbf994138b0f3668a002419ab225aa9c5280b84ab9bd9d38bebd11eab39c05ed
+EBUILD dejavu-2.37.ebuild 2208 BLAKE2B ef4bddb6724d7fc335f4952631b29f009caae51ebe9a6061a93addbbdee07cba4d055c20cb4aab701e73ba17d2491998b4573a1606c1ba31928df6263f3bb8e3 SHA512 609b094efcdc1019b4bf7d5820cb4962ca4e338463ba27fe95e7370635f32bfa5f62858b0a679e0f89d7396c641dc5e71c53224fe2877c88d304e7778ddde9e5
 MISC metadata.xml 854 BLAKE2B 7d8d029b63f3abd43b29cfbe45a3008e4c94b8a2ec86726da3c129ac25ce4eeb56db8a7cb1018399bb5389fd15ab78231f6c438c73c4fcf364fc6c42fcdf7f86 SHA512 2baa05f3f861db77c828c4da9dd71067577a55e0566805d71ab553eec6c450609331477a614ce058b7bea4032b8eade7c1379f5db5a17cf7d00372620eb206ef
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index 343fe2c9c93f..a0ead71962a0 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
 DEPEND="fontforge? (
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 1912d0b7372d..b29f9f66c330 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,13 +1,5 @@
-AUX 2.00.0/60-liberation.conf 866 BLAKE2B 17be36c99d1aa5af5a3541b62cbd588640a18f4df3da6a9d8ad086d81e97e3be7df655ab223959d7649387c53381147fda9c9d74fab6755167f270e1a259568f SHA512 4b490ed2d925e2f3ae06c4d0db973d44f78b4427948b45380a8f1a410d6d539b21a92bd33863d38dcbe3099ea9634bf062df95a7ee5682a20c63fcc632db4909
 AUX 60-liberation.conf 1055 BLAKE2B 066343b8a6a6b1a17deb54718404a723d56aa354b3125caea83fc432bf8ed9f11998403a626117d403be478cbb83961510b1bcc17e885ac8e1d3375c7760d8f0 SHA512 dcc8066e511db34ed007df018fd2d24a9e4020e382e0f12bba8fcedac5c8a93f917885c09919e3eb38bf73b94f59eb16fc4a894952dc9709c2b12353542cf117
-DIST liberation-fonts-1.07.4.tar.gz 2937949 BLAKE2B 7dc9b12fa24f68d2d5c55f4407bfdf51fdea4ce9b8e0f11c98039ff3c49ca36253c57e1b19a5e71ac8054c21594c9b47b4f38e6e3c41f00ef085ad8e00bb1c49 SHA512 fc5abb4903f79621157d478baed0963600b04997ded1e0b937a9a41aee3b21900430a4c8ac92e09b7bd8b635ac6cd67c9a3c9f3532ff978d235ba965c25a8f68
-DIST liberation-fonts-2.00.0.tar.gz 4835476 BLAKE2B 8488d48a8e21ae51d70f19d4a033283029dc5b106cc405a69c20db96d03e9c06709db094aab4017289a73b206afb5a9a2c628c04b3d59fd6d95fbb0e69537bc2 SHA512 6936e45fc5992ae802cf0b9867759e86d0682ff42f9ab12d16a6913f2e563de3565063f737a739a85ba71545907bceed8ed11da07a5cbc2f3fdef38f455b79f3
 DIST liberation-fonts-2.00.1.tar.gz 4842687 BLAKE2B c38635a3bfdddbf5ef3f2ed2a1f78d47ef7e384625606f47f94aacf1b07c805307a0e1fc3dea52b1dee823f66934f6ce767496f830fdd50c9a5efb073802b173 SHA512 8cfc1fa8f36e9f1c622879a822614b851b8339673ed6d2736937c483d85764ef12cc0d8a308f6c50e4877c2ab9b83ca2ea748b1458aa02cc840251e400285362
-DIST liberation-fonts-ttf-1.07.4.tar.gz 1333593 BLAKE2B 9134e05337c418eb3781b07e251a592b7161b8f295be8d617982f1f25ad4395de353a3baf46f0fd1f59c0399a507392a5be52a4629f858b7bbb496b5f293f3ec SHA512 0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f
-DIST liberation-fonts-ttf-2.00.0.tar.gz 2302736 BLAKE2B 01ee49cfe6759bc0f652874dfbd2b6c8293cde1c64386e0a37c71d67489675d1a8cb35a8018ebf7e466f51e3b44714c132c814055b02268a9aaac84e42c71fde SHA512 d7b801967dbbe643316241883b2f58e658f0ed55e3de6153f23c7110afb8f1f683602362c7e44a66e68c7fb5b4bdb600e4e0a6697bbaa5ec67f64891d1dcec87
 DIST liberation-fonts-ttf-2.00.1.tar.gz 2285857 BLAKE2B 5eb3e10dbf1e5867bcbd443b5f68153448956fc73313e60a408fc69985229658951175753ccf694a79dcc91faafdec3edf113f300ee55f2246261f0dd3067054 SHA512 52dce5cf2c35165f81c903f2c7245d7f0e37a37eeb4003a015d8cc2404728f17ff4d723ddc5d4b6a6c03044d7ec97b98cf4eecfbc91607fcfed6e0aaff260739
-EBUILD liberation-fonts-1.07.4.ebuild 870 BLAKE2B 4e3a666eb8626610e1687327ceb78a11b2da4bc9a50cb3c58cd4bc76b5ce28da52844297e7a61197d598cedffedfbc0867b04b44dad2ee69ba47906757720f56 SHA512 408536e43cb39236596146938f63cea0a42d7beaf8e1975d19f885609335fbad96267c018cf3cbbeefe61fa58b75477b34018323f5db899ab8eefd0ab0f67535
-EBUILD liberation-fonts-2.00.0-r1.ebuild 879 BLAKE2B ff380aaa11fca1a7ed617f9964a19edb720f02496d216e4ca2f908bd77939a91f760e728107282bac47326ddc8bcb86979c6fae811850d5cd9daf9c3d6adefed SHA512 799c282b49369c50919e008a0aeee507ead5acd9406493518fc81968e63d2e9efed097a8f739c7b7e36c241a6272692173054558dde08c923f15713ad5db1313
-EBUILD liberation-fonts-2.00.1-r1.ebuild 971 BLAKE2B afb4ddfb0a00941bc9db84527c9d559114c7f122cd9c5434b198083f34a98dd1cc6726a1c9cc340da7c2ed35965db647a654bfb91db51717b7f7cdeac4a3789b SHA512 b6d4b3bcd9a8d81fd39844011451f07fdc1555da4a71f948eb731d113af383038ea86bb7eb8c5ba1680747b05941ae9c7885022cf6de7a619dd40ab30408ed1b
-EBUILD liberation-fonts-2.00.1-r2.ebuild 1001 BLAKE2B ee8b2eeb073a5651d55f546911ff65f88f0f257b7f0becc71a1e3706cb59440e7fb32b1c117f30eb25194bd9c7f2a080ec9f343890457456c96212a0a81205ba SHA512 81c36e1ecf05f02947338432a0628b71daa42fdce29cbb558466f900249358273c5e4294fc12b1ed57a1cf650c84f11696236e643fd986aff8721ab1618434c6
+EBUILD liberation-fonts-2.00.1-r3.ebuild 949 BLAKE2B 31e981baa4879a0838ce6e51113da376a55f2a84f932b42a7efb91eb3112dab0bdb2b93eb13573622a9937d1b3d2d6bba357763c7dd06ad787a75ad4ddbfc1b6 SHA512 7dfae220ca92c82e73a6f441bf994f3b5a493028d258539a51e8329022835dcb83f4ca05ff80d1593bb810ee0ccd6360c12f0eafaa1e7f0ded5925cc6a5ceb29
 MISC metadata.xml 481 BLAKE2B fb490d1a105e25ddde3d2cab04533d563cfbbd59e1c4ab14043ff6d383954f69bcd6b06318407f11e892f0d69c9707998e31ebd0a03aac82aca923664073a0d6 SHA512 6cb38a8d01724aae1f550fac02e128b0da8644de5bef5784bf0c69e59df6cf535867956115d0ee1a626c5e1e39eb207360a9f53883f04a22378272a84219bcc7
diff --git a/media-fonts/liberation-fonts/files/2.00.0/60-liberation.conf b/media-fonts/liberation-fonts/files/2.00.0/60-liberation.conf
deleted file mode 100644
index bda888cefd37..000000000000
--- a/media-fonts/liberation-fonts/files/2.00.0/60-liberation.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-	<!-- Symlinking this file to /etc/fonts/conf.d/ will allow 
-         you to use liberation fonts instead of the microsoft truetype fonts.
-         (from http://uwstopia.nl/blog/2007/05/free-your-fonts) -->
-
-	<!-- Liberation fonts -->
-	<match target="pattern">
-		<test qual="any" name="family"><string>Times New Roman</string></test>
-		<edit name="family" mode="assign"><string>Liberation Serif</string></edit>
-	</match>
-	<match target="pattern">
-		<test qual="any" name="family"><string>Arial</string></test>
-		<edit name="family" mode="assign"><string>Liberation Sans</string></edit>
-	</match>
-	<match target="pattern">
-		<test qual="any" name="family"><string>Courier</string></test>
-		<edit name="family" mode="assign"><string>Liberation Mono</string></edit>
-	</match>
-
-</fontconfig>
-
diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.07.4.ebuild b/media-fonts/liberation-fonts/liberation-fonts-1.07.4.ebuild
deleted file mode 100644
index 8a0a8525ccea..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-1.07.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-HOMEPAGE="https://pagure.io/liberation-fonts"
-SRC_URI="!fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${PN}-ttf-${PV}.tar.gz )
-	fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${P}.tar.gz )"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="GPL-2-with-exceptions"
-IUSE="fontforge X"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
-
-DEPEND="fontforge? ( media-gfx/fontforge )"
-RDEPEND=""
-
-pkg_setup() {
-	if use fontforge; then
-		FONT_S="${S}/${PN}-ttf-${PV}"
-	else
-		FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
-		S="${FONT_S}"
-	fi
-	font_pkg_setup
-}
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.0-r1.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.0-r1.ebuild
deleted file mode 100644
index c615f3f57e49..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit font
-
-DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-HOMEPAGE="https://pagure.io/liberation-fonts"
-SRC_URI="!fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${PN}-ttf-${PV}.tar.gz )
-fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${P}.tar.gz )"
-
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-SLOT="0"
-LICENSE="OFL-1.1"
-IUSE="fontforge X"
-
-FONT_SUFFIX="ttf"
-
-FONT_CONF=( "${FILESDIR}/${PV}/60-liberation.conf" )
-
-DEPEND="fontforge? ( media-gfx/fontforge )"
-RDEPEND=""
-
-pkg_setup() {
-	if use fontforge; then
-		FONT_S="${S}/${PN}-ttf-${PV}"
-	else
-		FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
-		S="${FONT_S}"
-	fi
-	font_pkg_setup
-}
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r1.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r1.ebuild
deleted file mode 100644
index c7852bc0bbf8..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit font python-any-r1
-
-DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-HOMEPAGE="https://pagure.io/liberation-fonts"
-SRC_URI="!fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${PN}-ttf-${PV}.tar.gz )
-fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${P}.tar.gz )"
-
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
-SLOT="0"
-LICENSE="OFL-1.1"
-IUSE="fontforge X"
-
-FONT_SUFFIX="ttf"
-
-FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
-
-DEPEND="fontforge? (
-		${PYTHON_DEPS}
-		media-gfx/fontforge
-		dev-python/fonttools
-	)"
-RDEPEND=""
-
-pkg_setup() {
-	if use fontforge; then
-		FONT_S="${S}/${PN}-ttf-${PV}"
-		python-any-r1_pkg_setup
-	else
-		FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
-		S="${FONT_S}"
-	fi
-	font_pkg_setup
-}
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r2.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
index 6d4272bace05..78a09b75e220 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r2.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -9,16 +9,10 @@ inherit font python-any-r1
 
 DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
 HOMEPAGE="https://pagure.io/liberation-fonts"
-SRC_URI="
-	!fontforge? (
-		https://releases.pagure.org/liberation-fonts/${PN}/${PN}-ttf-${PV}.tar.gz
-	)
-	fontforge? (
-		https://releases.pagure.org/liberation-fonts/${PN}/${P}.tar.gz
-	)
-"
+SRC_URI="!fontforge? ( https://releases.pagure.org/${PN}/${PN}-ttf-${PV}.tar.gz )
+fontforge? ( https://releases.pagure.org/${PN}/${P}.tar.gz )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
 SLOT="0"
 LICENSE="OFL-1.1"
 IUSE="fontforge X"
diff --git a/media-fonts/montecarlo/Manifest b/media-fonts/montecarlo/Manifest
index b90617dd767b..c202a11482f0 100644
--- a/media-fonts/montecarlo/Manifest
+++ b/media-fonts/montecarlo/Manifest
@@ -1,4 +1,4 @@
 DIST MonteCarlo-BDF.tgz 4586 BLAKE2B aed07bf7368f347079c38682e2a08da70f13d9b864b105cab4fab2deaec8e593de20edcfe8c68ba58112c9a89a482b0f00a63c12b6607085db65a85563ee95b9 SHA512 92001a6b4fa1818562f5df1585267eac09376f6a43a87ef24bfc44c7ad19094453009ed3573076737e43af3b69bee8eb1dbd27d34786ea38376ad1b5df731775
 DIST MonteCarlo-PCF.tgz 5749 BLAKE2B 43ac7a6dbb16a86dcccc903c4bcd615735f3f114ec0d447b023d7359fd9bc651223751549a3c283952660b15f755daea8d31996254c019e4f9b4dd34cbb6609b SHA512 c4a69d66b6c19c63b2430fbd82fff5067e7ebe49ad0e4d19c93f566bf5644e8a6555742338a8517e964ed7c0dc05e5ceee28db443d23301ad016b7b42403f03e
-EBUILD montecarlo-0.ebuild 629 BLAKE2B f9fa6482720e05f68aa76fc359c4a7449eb268004293336e304e3b2d52325dde0fc2c371e5b75a75c928e10c71545dd8c99d27880ecbc41c70b0be53e40163f6 SHA512 7b7261a715f4968bb3f019b8d5d5384c0c4fd06e9b44a96c69f26a490049f7a74f5128379229e17e9732069c72d406c9a9e54c60ed253d8fd513230446fa71b7
+EBUILD montecarlo-0-r1.ebuild 627 BLAKE2B b1c6da0b8e925da2482f210d1106b2f9ecd71f01683603060b2bb2856c7943ebb85850e5d1e733e94c84e1b56d2afe1ccd2c44385186a4176bc8ae0f6699d73f SHA512 467b52ee89ad5a6b1ba4e170ccbf795a5f39d2f6f53350740b305909e4cfa0e8a46149c3640fd7d890d3a455e671061e3f7f6138ee79cc627af6dc6dd1bd7162
 MISC metadata.xml 221 BLAKE2B c33e625394ad14de5167599890e5c861a26f950ec649ee4a41a5e1ac46a790fb0b777fad9af4534b9c04db8b7432955f8f23f7b58f853f08ee45e1f6f1af648d SHA512 58670d06b75425acd5979f5ff77f85ecf3dca85e8ec4a30d58e43cd6c4d578f901efaabf1730509bd4c2236f2062dc2abf9d72bf7e9fe9ffa30e088e077b7faa
diff --git a/media-fonts/montecarlo/montecarlo-0.ebuild b/media-fonts/montecarlo/montecarlo-0-r1.ebuild
index d9573ba07b7b..7f66d5da210a 100644
--- a/media-fonts/montecarlo/montecarlo-0.ebuild
+++ b/media-fonts/montecarlo/montecarlo-0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
 inherit font