commit: 41b1bd2775cb0f4c487089ab6d4a61457c0dc58b Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Oct 19 18:06:05 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Oct 19 18:06:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b1bd27
media-fonts/aquapfont: Port to EAPI 7 Bug: https://bugs.gentoo.org/697292 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-fonts/aquapfont/aquapfont-2.6-r2.ebuild | 27 ++++++++---------------- media-fonts/aquapfont/files/60-aquapfont-r1.conf | 16 -------------- media-fonts/aquapfont/files/60-aquapfont.conf | 10 ++------- 3 files changed, 11 insertions(+), 42 deletions(-) diff --git a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild index 657d83c7c41..dfa5495e12f 100644 --- a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild +++ b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild @@ -1,7 +1,7 @@ -# 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 @@ -14,30 +14,21 @@ SRC_URI="http://aquablue.milkcafe.to/tears/font/${MY_P}.zip"; LICENSE="aquafont" SLOT="0" KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" - -S="${WORKDIR}/${MY_P}" -FONT_S="${S}" -FONT_SUFFIX="ttf" -DOCS="readme.txt" - -DEPEND="app-arch/unzip" -RDEPEND="" - # Only installs fonts RESTRICT="strip binchecks" -FONT_CONF=( "${T}/60-aquapfont.conf" ) +BDEPEND="app-arch/unzip" -src_compile() { - cp "${FILESDIR}"/60-aquapfont-r1.conf "${T}"/60-aquapfont.conf || die -} +S="${WORKDIR}/${MY_P}" + +DOCS="readme.txt" +FONT_CONF=( "${FILESDIR}"/60-aquapfont.conf ) +FONT_S="${S}" +FONT_SUFFIX="ttf" pkg_postinst() { font_pkg_postinst - echo elog "To use aquapfont instead of the default font for sans and serif use:" elog " eselect fontconfig enable 60-aquapfont.conf" - echo } diff --git a/media-fonts/aquapfont/files/60-aquapfont-r1.conf b/media-fonts/aquapfont/files/60-aquapfont-r1.conf deleted file mode 100644 index 3610820e10d..00000000000 --- a/media-fonts/aquapfont/files/60-aquapfont-r1.conf +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <alias> - <family>serif</family> - <prefer> - <family>aqua_pfont</family> <!-- han (ja) --> - </prefer> - </alias> - <alias> - <family>sans-serif</family> - <prefer> - <family>aqua_pfont</family> <!-- han (ja) --> - </prefer> - </alias> -</fontconfig> diff --git a/media-fonts/aquapfont/files/60-aquapfont.conf b/media-fonts/aquapfont/files/60-aquapfont.conf index 07c60a6afe5..3610820e10d 100644 --- a/media-fonts/aquapfont/files/60-aquapfont.conf +++ b/media-fonts/aquapfont/files/60-aquapfont.conf @@ -4,19 +4,13 @@ <alias> <family>serif</family> <prefer> - <family>mikachan_o-P</family> <!-- han (ja) --> + <family>aqua_pfont</family> <!-- han (ja) --> </prefer> </alias> <alias> <family>sans-serif</family> <prefer> - <family>mikachan_o-P</family> <!-- han (ja) --> - </prefer> - </alias> - <alias> - <family>monospace</family> - <prefer> - <family>mikachan_o</family> <!-- han (ja) --> + <family>aqua_pfont</family> <!-- han (ja) --> </prefer> </alias> </fontconfig>
