gentoo resync : 24.12.2018

4 files changed, 16 insertions, 55 deletions

diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 922aa0b3f62a..dedc4de904c6 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -1,8 +1,7 @@
+AUX noto-emoji-20180823-build-path.patch 313 BLAKE2B c7a6a67639444329f033da14b58759d9ac265a3dfd7854fc6ba0466ace3c5ce9794c9c6493d08a89d29d4e9a5fa99d1553be13c49fc9f09fb82a82b6b61531f6 SHA512 544acdfd0f2dc0dcfc75b4081f7e1518ab914d02801bf7b38f31af9a0d55ed516a2f53e963606232a8742819b3005f8e9660c8a61257d0583bfee8f095d4e341
 AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
 AUX noto-emoji-use-gm.patch 1488 BLAKE2B 08bb2fa62c79615992c25503093d9ee8296dd3d0103ae50e9376020730c48d8e3eb5da281f066242b25d8e5c6a293cdb013b9d276fb10350021479aade1e78ab SHA512 0719575b7d2c3f0cc15c7e7a314e4a528b0601e14b8a06f0304a784d3d5dcf27cf4f881e4b57bb4647ba0cb36ba7be842bea2df1529de55d6ca16b6326c930d8
 AUX noto-emoji-use-system-pngquant.patch 2118 BLAKE2B 55048756859ead78a013a6ff749500107d9fe02fcfe775582fade153f268c5daa6f074ea1e8ea260bd09af077cc19cd8121b570bac47649b669df196e43d2574 SHA512 6bd4dd9e45aa73d8677c671a5ee3d6f03b3e94004db9b9c715cf76402ab2a641ce79991ec583cfe3a15a6c9803de4bfa863bd30cf16e96e9cb8a4683d6c04807
-DIST noto-emoji-20180814.tar.gz 51709109 BLAKE2B 9678861973b231de48b11dc9267840e4a4a6689c7c26281dfc1d6b0d4c1c1c627b503226d7eeac2f568dc19162c669b54c8dd34f5aa449850797437cf3a2e8cb SHA512 bca0fb73d3897c4ec1ba94173fda17804cdf2dfa365aa4a19bf1d24e9a94806bcdd5e6eb6304eb3e2312b37f37fa917905be6fe11c84510214f0eba70f426ea8
 DIST noto-emoji-20180823.tar.gz 51710829 BLAKE2B 66983bdd3cb5e95727f0ddebca5d85c3f22bb9e7b9216eb1af41c4cba19f2020592be3feb7ac47f723985574b8d57070d9d07d0ce5e5870512aecc2a55b52995 SHA512 73233f3742faae4e37f8588bda097fe9f745f5cc7e6601301c1dc9e30d656c496e074c80bf4391708f6c0dbe32043e8558e4395cce5dbf735772b0e41642b9bf
-EBUILD noto-emoji-20180814.ebuild 1111 BLAKE2B 0c7dc7b7689933d5d21a108eb30496e264d17ac8401df48c60dcb87ea3c188edd33510612e86ad4857a2f8c1c53616b3af4f1f5696e208bc7c69e22fb39eca40 SHA512 b465734cfd567ad77fa30c860e0f3ddaed332db9acf0c570d0fffda95316601ad52f0ba1384f14e78a956dbce6fa92b417e72faaae5896a0d1e783ef1a8c0a81
-EBUILD noto-emoji-20180823.ebuild 1331 BLAKE2B 0c9f33817f304a845e7b293daa499723d42dc697179f1957d7862b23c2c9140ebdd9c87f788c186aa2547f4dd7ee961e9b213de35ba7cc51ec6ff927d8214dba SHA512 7d1fe1210f181fcd8b39bf050c6f29cd0de098aa9910ebf6101d86491a867a482bd438e14b33889749b987d99a527fc074a07720d76ef5ba3a652e166cbbe6a1
+EBUILD noto-emoji-20180823.ebuild 1434 BLAKE2B 18e6e71351619a59045e25b922507435954f55a92d424d99129573639420a1ee21c64bf4bd89dee9a5183625207fe3da8380bccccf0f87bb7512f6644b62becb SHA512 07ab5662c74ac1dd8be2e2fa8bea0b08b5b428148d3e711b79126426bd5f79f96553192d176293d2fc07ce658e3ce578643002b614bcbc6c89f5ce4e0e13306d
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch b/media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch
new file mode 100644
index 000000000000..151f88251524
--- /dev/null
+++ b/media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch
@@ -0,0 +1,11 @@
+--- a/add_glyphs.py.old	2018-11-18 11:11:56.387323302 +0100
++++ b/add_glyphs.py	2018-11-18 11:12:18.203529159 +0100
+@@ -22,7 +22,7 @@
+ import add_emoji_gsub
+ import add_aliases
+ 
+-sys.path.append(
++sys.path.insert(0,
+     path.join(os.path.dirname(__file__), 'third_party', 'color_emoji'))
+ from png import PNG
+ 
diff --git a/media-fonts/noto-emoji/noto-emoji-20180814.ebuild b/media-fonts/noto-emoji/noto-emoji-20180814.ebuild
deleted file mode 100644
index 7dd40de2811e..000000000000
--- a/media-fonts/noto-emoji/noto-emoji-20180814.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit font python-any-r1
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji"
-
-COMMIT="3ffd20ec7504657aa17c84f9aa475ad09b20c362"
-SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	app-arch/zopfli
-	dev-python/fonttools
-	dev-python/nototools
-	media-gfx/pngquant
-	x11-libs/cairo
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick )
-"
-RDEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-
-PATCHES=(
-	# From Fedora
-	"${FILESDIR}/${PN}-use-system-pngquant.patch"
-	"${FILESDIR}/${PN}-build-all-flags.patch"
-)
-
-src_prepare() {
-	default
-	# Use system pngquant
-	rm -rf third_party/pngquant
-
-	# Fedora patch to allow graphicsmagick usage
-	if has_version media-gfx/graphicsmagick; then
-		eapply "${FILESDIR}/${PN}-use-gm.patch"
-	fi
-}
diff --git a/media-fonts/noto-emoji/noto-emoji-20180823.ebuild b/media-fonts/noto-emoji/noto-emoji-20180823.ebuild
index 847572c4ae70..52be1429c0d6 100644
--- a/media-fonts/noto-emoji/noto-emoji-20180823.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20180823.ebuild
@@ -38,6 +38,9 @@ PATCHES=(
 	# From Fedora
 	"${FILESDIR}/${PN}-use-system-pngquant.patch"
 	"${FILESDIR}/${PN}-build-all-flags.patch"
+
+	# https://github.com/googlei18n/noto-emoji/issues/240
+	"${FILESDIR}/${PN}-20180823-build-path.patch"
 )
 
 src_prepare() {