gentoo resync : 26.11.2017

2 files changed, 25 insertions, 5 deletions

diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index d4ffc0c9f234..e99a40266588 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1,5 +1,4 @@
-DIST font-misc-ethiopic-1.0.3.tar.bz2 245606 SHA256 53cb1fd83afdbe7939c0eac34003676ee0e6023216892d98054db90b703c98a5 SHA512 b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d WHIRLPOOL ce823c72f9b9c021b3d4bcb4756897f6b8f8682940d403e7004550ecfa2ae42439e57a914925a7fe9fc7bdf6c262806fcb125239d54ec61f07467f53addee97c
-EBUILD font-misc-ethiopic-1.0.3.ebuild 596 SHA256 d7e740e48912c1529704992945638d70d88f0a6a563a3eb95311a0aec6bc027d SHA512 c5c54393facda8a76cfb2a2e24c35f632e543bfccf4b7cc1549b97c26e596272fecb9861e804dcaf2d3feb10bcf56211b93c6a6d8efcfde017933d9fcf24db6c WHIRLPOOL 58bef5b83282e4f77ded3757e5f0e3ce160474d64beaf542849f44a6ff78468cba93269f63763e6f5db3394b1814aae9c21e02b2cd2dd0209368502bdcefecc1
-MISC ChangeLog 2638 SHA256 64c7b61794fa41f91431ac15913c8450e93432d826f327df87adb062d4456d55 SHA512 ffb3dd6fb4e7ee14fe94dde1f2dc67c4545196b6adddbf2299255b51eb9c7540ab1e01100df77d2bd3eb6e84fa4389db605efbbca5e074b2e30ec13bfd039d5c WHIRLPOOL 1738b9ab8e94dfb60e951d20dc1f5a3c4ec89ae9ebc685f6d8f07df2251a23d04f08157115b5b368e3a6d7a63c98634461399271d0a06baa92c43a72b29c383e
-MISC ChangeLog-2015 7967 SHA256 32ff4a60052c29eb0c4edae6a998669055f2fa3a19b093a85d8312ac5cbf2728 SHA512 e7d845c8ed754a6e636d5cb1ec219156768ecd1843565fd128444a09e8dce6e4db668490a6e08f0dff578e894d717107a85f1c2a6355a0eec00650c01450725c WHIRLPOOL f93b5d992b2f67e351448243c94b6b8711be6b918a3ba70ebb73be0bad7090c88538c97fa7e442c70ef27afb2e3bb8650a2f8523978d4582effb3c0f4f533f90
-MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
+DIST font-misc-ethiopic-1.0.3.tar.bz2 245606 BLAKE2B e0cf89f4500226b7213d6f3f88b3bf575501140d8742fe5e30b07eefd2c1fe2fc9bfe941639032d3b5ce45eb7e6f352af7b6468e7f8b0fc941ed9cee8d531f96 SHA512 b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d
+EBUILD font-misc-ethiopic-1.0.3-r1.ebuild 556 BLAKE2B 641bb841a09a87363e957448b5b8af1ea195ef28442a61d3f6506d59e169054418880a28c2229faca6bcf69bb32c14fc7ad236d58f35e6cead69e416fe38a6ff SHA512 3c981513763a07262d86ddc27504cfdbaff4bc8bce060a511c011148a56eaafdcb1bfa7cf16be1f15af62fbd5f4b7d7fb441f186d30f6a285a65ccbe9d6cb08b
+EBUILD font-misc-ethiopic-1.0.3.ebuild 596 BLAKE2B 5c6de127990f4898d42fac579952c15a8b5fa3cbddcf4c67314512c965bb4f98fd6a4f45cdc023c185417f9340409cd9be8c15300b2c23497cace2067fbb9d53 SHA512 c5c54393facda8a76cfb2a2e24c35f632e543bfccf4b7cc1549b97c26e596272fecb9861e804dcaf2d3feb10bcf56211b93c6a6d8efcfde017933d9fcf24db6c
+MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..fe37758e9525
--- /dev/null
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+FONT_DIR="OTF"
+
+inherit xorg-2
+
+DESCRIPTION="Miscellaneous Ethiopic fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+FONT_OPTIONS="--with-otf-fontdir=${EPREFIX}/usr/share/fonts/OTF"
+
+src_install() {
+	xorg-2_src_install
+	# TTF fonts are not supposed to be installed.
+	# Also fixes file collision per bug #309689
+	rm -rf "${ED}/usr/share/fonts/TTF" || die
+}