commit: f93be544dadeafab67385d1046455d3746e33338 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Oct 19 19:47:57 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Oct 19 19:47:57 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93be544
media-fonts/lfpfonts-fix: Port to EAPI 7 Bug: https://bugs.gentoo.org/697304 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../files/lfpfonts-fix-0.83-noglyph.patch | 4 +-- .../lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild | 30 ++++++++++------------ 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/media-fonts/lfpfonts-fix/files/lfpfonts-fix-0.83-noglyph.patch b/media-fonts/lfpfonts-fix/files/lfpfonts-fix-0.83-noglyph.patch index 77cf7a5fe5f..cd0e8f0b9ff 100644 --- a/media-fonts/lfpfonts-fix/files/lfpfonts-fix-0.83-noglyph.patch +++ b/media-fonts/lfpfonts-fix/files/lfpfonts-fix-0.83-noglyph.patch @@ -1,5 +1,5 @@ ---- src/ucs2any.agriffis 2001-02-17 12:34:50.000000000 -0500 -+++ src/ucs2any 2006-01-11 10:53:15.000000000 -0500 +--- a/src/ucs2any ++++ b/src/ucs2any @@ -225,12 +225,7 @@ if (!is_control($ucs)) { if ($startchar{$ucs}) { diff --git a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild index 371687a3172..4049c6c2f00 100644 --- a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild +++ b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild @@ -1,37 +1,33 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 -inherit font eutils font-ebdftopcf +inherit font font-ebdftopcf DESCRIPTION="Linux Font Project fixed-width fonts" SRC_URI="mirror://sourceforge/xfonts/${PN}-src-${PV}.tar.bz2" HOMEPAGE="https://sourceforge.net/projects/xfonts/"; -LICENSE="public-domain" +LICENSE="public-domain" SLOT="0" KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86" -IUSE="" +# Only installs fonts +RESTRICT="strip binchecks" S="${WORKDIR}/${PN}-src" -FONT_S="${S}/src" - -DOCS="${S}/doc/*" +PATCHES=( "${FILESDIR}"/${PN}-0.83-noglyph.patch ) -# Only installs fonts -RESTRICT="strip binchecks" +DOCS="doc/*" +FONT_S="${S}/src" -src_unpack() { - unpack ${A} - cd "${S}" - epatch ${FILESDIR}/${PN}-0.83-noglyph.patch +src_prepare() { + default + sed -i -e '/^FONT /s/\(.*-\)C*-/\1C-/' src/*.bdf || die } src_compile() { - cd "${FONT_S}" - sed -i -e '/^FONT /s/\(.*-\)C*-/\1C-/' *.bdf || die "sed failed" - + cd "${FONT_S}" || die font-ebdftopcf_src_compile }
