From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E1C6D138334 for ; Sat, 19 Oct 2019 18:07:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 647C3E0921; Sat, 19 Oct 2019 18:07:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F099E0921 for ; Sat, 19 Oct 2019 18:07:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D329A34C06F for ; Sat, 19 Oct 2019 18:07:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 130C288F for ; Sat, 19 Oct 2019 18:07:31 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1571508365.41b1bd2775cb0f4c487089ab6d4a61457c0dc58b.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-fonts/aquapfont/, media-fonts/aquapfont/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-fonts/aquapfont/aquapfont-2.6-r2.ebuild media-fonts/aquapfont/files/60-aquapfont-r1.conf media-fonts/aquapfont/files/60-aquapfont.conf X-VCS-Directories: media-fonts/aquapfont/files/ media-fonts/aquapfont/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 41b1bd2775cb0f4c487089ab6d4a61457c0dc58b X-VCS-Branch: master Date: Sat, 19 Oct 2019 18:07:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 215ceea7-bab1-4f93-862d-7c2361e1097f X-Archives-Hash: 18f2b3878441aac9f609a37fcb193638 commit: 41b1bd2775cb0f4c487089ab6d4a61457c0dc58b Author: David Seifert gentoo org> AuthorDate: Sat Oct 19 18:06:05 2019 +0000 Commit: David Seifert gentoo 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 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 @@ - - - - - serif - - aqua_pfont - - - - sans-serif - - aqua_pfont - - - 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 @@ serif - mikachan_o-P + aqua_pfont sans-serif - mikachan_o-P - - - - monospace - - mikachan_o + aqua_pfont