From 248892efb6b4ab81ddd6b9ac2b2d6a58470a753b Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 17 Mar 2010 11:48:11 +0000 Subject: Really don't install the TTF font. Also fixes bug #30689. Package-Manager: portage-2.2_rc65/cvs/Linux x86_64 --- media-fonts/font-misc-ethiopic/ChangeLog | 8 ++++++- media-fonts/font-misc-ethiopic/Manifest | 10 ++++----- .../font-misc-ethiopic-1.0.1-r1.ebuild | 26 ++++++++++++++++++++++ .../font-misc-ethiopic-1.0.1.ebuild | 19 ---------------- 4 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1-r1.ebuild delete mode 100644 media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1.ebuild (limited to 'media-fonts/font-misc-ethiopic') diff --git a/media-fonts/font-misc-ethiopic/ChangeLog b/media-fonts/font-misc-ethiopic/ChangeLog index a05c8335e80b..b2153fab83af 100644 --- a/media-fonts/font-misc-ethiopic/ChangeLog +++ b/media-fonts/font-misc-ethiopic/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-fonts/font-misc-ethiopic # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-misc-ethiopic/ChangeLog,v 1.33 2010/03/15 22:24:32 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-misc-ethiopic/ChangeLog,v 1.34 2010/03/17 11:48:11 scarabeus Exp $ + +*font-misc-ethiopic-1.0.1-r1 (17 Mar 2010) + + 17 Mar 2010; Tomáš Chvátal + -font-misc-ethiopic-1.0.1.ebuild, +font-misc-ethiopic-1.0.1-r1.ebuild: + Really don't install the TTF font. Also fixes bug #30689. *font-misc-ethiopic-1.0.1 (15 Mar 2010) diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest index 0c98acbaef56..ae6c8a3a4cfd 100644 --- a/media-fonts/font-misc-ethiopic/Manifest +++ b/media-fonts/font-misc-ethiopic/Manifest @@ -4,13 +4,13 @@ Hash: SHA1 DIST font-misc-ethiopic-1.0.0.tar.bz2 184348 RMD160 53e2176a4073fdceae9b2a5392b252209536372a SHA1 d598b873ea897574b86167a36b4c151f84d22d68 SHA256 58d2868801ca063797fa88fb4aea59f7c550473be4e9a4f96d84fe39b967d141 DIST font-misc-ethiopic-1.0.1.tar.bz2 235856 RMD160 af4cf0787335ac2ad75f03717391ec8a70d3002b SHA1 2677191fd8b515c53bde6402513249fc0f48d53a SHA256 bf3b3a994b6c4047b2d79f590e7113ed429b8b7a83992cb753a83e6e8bd3d948 EBUILD font-misc-ethiopic-1.0.0-r1.ebuild 728 RMD160 87d73454e16c682d3e59b7981118ccfda301d525 SHA1 5b322c88d957e0a1ece3b44add3a84a1148cfb7d SHA256 a0d5a3febb90c91ba7c496f56e678df711c46c0d2a5d53eade579d2a49dbd46d -EBUILD font-misc-ethiopic-1.0.1.ebuild 553 RMD160 bf29e736f96dc786996a69cd670d95e8e8fefce9 SHA1 8a258d775a283a7c904f38f8eac154b43d9ac210 SHA256 de80bfaf8ff733941fcf721ada3e9e19c58714366d159f4f951edcc68e5fd9e6 -MISC ChangeLog 5396 RMD160 d934cc067417b53fe39c3724e663d094803f4bce SHA1 0cc224bf653b6c3953b887f4bc2a2ce73a386ff5 SHA256 0ac1ee69b3bfb8819b5631414cdf6c2ac9546f2811ce4f74726431c51df36b82 +EBUILD font-misc-ethiopic-1.0.1-r1.ebuild 732 RMD160 25befebcc507237c68f612ff34ae1feed1c89329 SHA1 35e952a4628ec2a490fe7229f6f164058a82573e SHA256 2c0d7a340ef341add750b1c8a137e5bc330f6b1e8a42e67a5184691ec1536444 +MISC ChangeLog 5629 RMD160 935e3b3c42e77f9b4491ead27bc10c11dda79c78 SHA1 77011356380250226aae936aa0f16daac85cb15e SHA256 ef1cabcd824792dad21748bc1806f1f50f399512c5b2840725f4dcbd91b27945 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkues8YACgkQHB6c3gNBRYe5HgCgykyC6TyTb+OtOPyL7+CBC7Zi -L4MAnArA8BFJqwBbP8clv7CgH4n1aj6g -=tE+c +iEYEARECAAYFAkugwXoACgkQHB6c3gNBRYdFoACfXLv7HhuYJyz0UjAsTgKIJZy4 +WooAoKyDIf8ZqLpe4l73DsXKtqKFoaW+ +=3mEV -----END PGP SIGNATURE----- diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1-r1.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1-r1.ebuild new file mode 100644 index 000000000000..b8ca3f96f3b7 --- /dev/null +++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1-r1.ebuild,v 1.1 2010/03/17 11:48:11 scarabeus Exp $ + +FONT_DIR="OTF" + +EAPI=3 +inherit xorg-2 + +DESCRIPTION="Miscellaneous Ethiopic fonts" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + x11-apps/bdftopcf" + +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 "${D}/${EPREFIX}usr/share/fonts/TTF" +} diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1.ebuild deleted file mode 100644 index 68668b618734..000000000000 --- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1.ebuild,v 1.1 2010/03/15 22:24:32 scarabeus Exp $ - -FONT_DIR="OTF" - -EAPI=3 -inherit xorg-2 - -DESCRIPTION="Miscellaneous Ethiopic fonts" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - x11-apps/bdftopcf" - -FONT_OPTIONS="--with-otf-fontdir=${EPREFIX}usr/share/fonts/OTF" -- cgit v1.2.3-65-gdbad