gentoo resync : 19.04.2018

8 files changed, 20 insertions, 91 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 2ed95cf27d24..2dd8f7ead0b7 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index 2118723b5757..10e2441dd1a3 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 2146 BLAKE2B 541f713b9a981df6530315b7345b33e55adf1a3c9e94b6431e58143e2275f63933e1650824a1b5f690ee97abf695cb420747baa4f9467c80c71af76de48c24e5 SHA512 d35fcb8e49d08adb5f950cfba5d5c92de64d295e98d3d1927565f221faf806b225f5a1a3e80d314eab4568e6dc65beb9fcee2f612e3563563547d59ae547894f
+EBUILD dejavu-2.37.ebuild 2211 BLAKE2B fd75d8f0eb2147168ee0d3425844cd2c7a6fd3b8134fcd7cbfda977a4e30fb73e8ea673bb49f129b20958161a2ed8e6c0c7b7d17928733b85a5c93e1c20ee997 SHA512 8484875ec7a562dbf3ea4d69e8f5ff56e9da0864cf70b125f94d0c765f6c14a6dbf994138b0f3668a002419ab225aa9c5280b84ab9bd9d38bebd11eab39c05ed
 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 dd07747d42aa..343fe2c9c93f 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit font versionator
+inherit font versionator xdg-utils
 
 DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters"
 HOMEPAGE="https://dejavu-fonts.github.io/"
@@ -25,15 +25,17 @@ 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? ( x11-apps/mkfontscale
+DEPEND="fontforge? (
+		x11-apps/mkfontscale
 		>=media-gfx/fontforge-20080429
 		x11-apps/mkfontdir
 		dev-perl/Font-TTF
 		app-i18n/unicode-data
-		>media-libs/fontconfig-2.6.0 )"
+		>media-libs/fontconfig-2.6.0:1.0 )
+"
 
 FONT_CONF=(
 	fontconfig/20-unhint-small-dejavu-sans-mono.conf
@@ -57,6 +59,11 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
 src_compile() {
 	if use fontforge; then
 		emake \
diff --git a/media-fonts/ubuntu-font-family/Manifest b/media-fonts/ubuntu-font-family/Manifest
index f7d7d2fdc23b..1f39fdce0247 100644
--- a/media-fonts/ubuntu-font-family/Manifest
+++ b/media-fonts/ubuntu-font-family/Manifest
@@ -1,8 +1,3 @@
-DIST ubuntu-font-family-0.71.2.zip 1479191 BLAKE2B 22d2bf140e7a1f86f53ef26037abd57cbfee3e7893ef3ebbeb7be41649e0337a42ffdc85b9da601f0eb907026841f302ce02f87cf52328348b78a9fa5f35dd4f SHA512 c8cb6df0d65f992f3c06011c8467a2899fb9b1d0eef5f246de78c629889c2a9a7e91a7e61342cf603c86ed79cff849182b44464829e7b2fcdbad2c8b8ce1b163
-DIST ubuntu-font-family-0.80.zip 2091643 BLAKE2B 41d234c6ab62d2891b4563166f596ba48aa48859626d10917cedf4e4fd0df993f5851013d2d073216a23846b9ac416ace083de2e156f8416cd57372830a8cda4 SHA512 d35e382fd8c20057cfcbcca55b747eaf678fdbf2e146ee91cd081bd0614d2c88e5aa9f8d9e04b4368a17f89c243956532bd361f23609e9dd2f124fc52e218086
 DIST ubuntu-font-family-0.83.zip 2092263 BLAKE2B 996e2cf480eac3e3633bdcbc40766fe22b670152c9a4c462d9af7b1b85a7d0310ff118ad0f9f2670a56718391e684479bb5df74a5f31c2dbf4430dbf9c7cc189 SHA512 d9ab7afc8aab55810de6e403aa02c0118bb35d94844cc14bb07b71daef4c6d63a9c927f0e81a9f97d29904512d94fa0226fbff2341351ac000fc233d2dc55727
-EBUILD ubuntu-font-family-0.71.2-r1.ebuild 505 BLAKE2B 7d0869a060c905d87ec7e9aaff62db6baff4a0c3db79928a538f4f9876ab42c94117348d84f01a2d4f73556c3eac25cdb40380b987400ae41ca5ddbce6647ad9 SHA512 ddf26abde030d7deff6d9f4735e5faa88734621edfca138a4cd841e602a66108465dae8348cc160d2644ee2ff6146bea3c274681e8a3b09bac5a57f9e11297d9
-EBUILD ubuntu-font-family-0.71.2.ebuild 459 BLAKE2B 0e30366ee8a5af7db7fccef3a465f91ea3b9945dc7b39aff322eac9307977c39820ed312d6072aa156225fa9ca4966071757b94f28bdf073da7ed4918e684950 SHA512 d85fddbcf29ad01e2d899fb69cd87bdff6a73dfda266e49afd93008c4ca4200f01b520cf4439e8d487942358b08432b3faea841a1d31d20299db718d733a4ebb
-EBUILD ubuntu-font-family-0.80.ebuild 508 BLAKE2B a5c2eac6238a6334a49f82fc35083d4ec72bf94be5bccd5d30fd920fdcfb8a937c3ddcb37067deb2c5593a5a139315bac4777e3929d7eb2d1b7236e631ee8db5 SHA512 71afdc0100376f39e552567ed0f79b753d17adb60cdbd7d9d82edd80ee8ce1dc15b6d7b8e47283ab77328e04f3f6542f852fa9861d905209efcbfb4a061007ba
-EBUILD ubuntu-font-family-0.83.ebuild 524 BLAKE2B 99f1a2bfe92fe0a76cc4907ada2aafa730c6b719c0e4c68403749073d45cca958f191e6ab78a3190cc2ddb3fc073368155d946aad8c7293f58ba12a5498a8d2a SHA512 e8ad97d5ce8d0e7be99f469c671ad69ad0e71b6857e13406a0c9fb39b5d8fedda65222a9a276b9024789c7d3bd0e8b6a6bfca7f5ddd7cceffb1a081a25a0a836
+EBUILD ubuntu-font-family-0.83-r1.ebuild 551 BLAKE2B 1a7756e69d0450c77fd5e1a6cb3a6c79e0c2a37b7f071e6afa02e87eeb8a246cb070d7eacba1d5f664e8cca7b6c4415510e3b441912989db3834c5478a41f773 SHA512 c68b90eaeec1a7de9c7b555660eaef7a40781aa6c32912b12cf1837dd5a23b935d01a309128f5348363d7ce556573d42c4619323a123f8b8f7a15c5558d0d476
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.71.2-r1.ebuild b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.71.2-r1.ebuild
deleted file mode 100644
index f67fd43f3db3..000000000000
--- a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.71.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit font
-
-DESCRIPTION="A set of matching libre/open fonts funded by Canonical"
-HOMEPAGE="http://font.ubuntu.com/"
-SRC_URI="http://font.ubuntu.com/download/${P}.zip"
-
-LICENSE="UbuntuFontLicense-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-FONT_SUFFIX="ttf"
-
-DOCS="CONTRIBUTING.txt FONTLOG.txt README.txt"
-
-src_prepare() {
-	rm "${S}"/Ubuntu-M*.ttf
-}
diff --git a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.71.2.ebuild b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.71.2.ebuild
deleted file mode 100644
index 76cc753aedf3..000000000000
--- a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.71.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit font
-
-DESCRIPTION="A set of matching libre/open fonts funded by Canonical"
-HOMEPAGE="http://font.ubuntu.com/"
-SRC_URI="http://font.ubuntu.com/download/${P}.zip"
-
-LICENSE="UbuntuFontLicense-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-FONT_SUFFIX="ttf"
-
-DOCS="CONTRIBUTING.txt FONTLOG.txt README.txt"
diff --git a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.80.ebuild b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.80.ebuild
deleted file mode 100644
index acdff255c54c..000000000000
--- a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.80.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit font
-
-DESCRIPTION="A set of matching libre/open fonts funded by Canonical"
-HOMEPAGE="http://font.ubuntu.com/"
-SRC_URI="http://font.ubuntu.com/download/${P}.zip"
-
-LICENSE="UbuntuFontLicense-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-FONT_SUFFIX="ttf"
-
-DOCS="CONTRIBUTING.txt FONTLOG.txt README.txt"
-
-src_prepare() {
-	rm "${S}"/Ubuntu-M*.ttf
-}
diff --git a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83.ebuild b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
index 4d211863e954..2f40f2335ae0 100644
--- a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83.ebuild
+++ b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
@@ -1,17 +1,17 @@
-# 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 font
 
 DESCRIPTION="A set of matching libre/open fonts funded by Canonical"
 HOMEPAGE="http://font.ubuntu.com/"
-SRC_URI="http://font.ubuntu.com/download/${P}.zip"
+SRC_URI="https://assets.ubuntu.com/v1/fad7939b-${P}.zip -> ${P}.zip"
 
 LICENSE="UbuntuFontLicense-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
@@ -19,8 +19,9 @@ RDEPEND=""
 
 FONT_SUFFIX="ttf"
 
-DOCS=(CONTRIBUTING.txt FONTLOG.txt README.txt)
+DOCS=( CONTRIBUTING.txt FONTLOG.txt README.txt )
 
 src_prepare() {
+	default
 	rm "${S}"/Ubuntu-M*.ttf || die
 }