diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
| commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
| tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /media-fonts/aquapfont | |
| parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) | |
gentoo resync : 03.11.2019
Diffstat (limited to 'media-fonts/aquapfont')
| -rw-r--r-- | media-fonts/aquapfont/Manifest | 5 | ||||
| -rw-r--r-- | media-fonts/aquapfont/aquapfont-2.6-r2.ebuild | 27 | ||||
| -rw-r--r-- | media-fonts/aquapfont/files/60-aquapfont-r1.conf | 16 | ||||
| -rw-r--r-- | media-fonts/aquapfont/files/60-aquapfont.conf | 10 |
4 files changed, 13 insertions, 45 deletions
diff --git a/media-fonts/aquapfont/Manifest b/media-fonts/aquapfont/Manifest index a0557c56373c..1df2627ab6f9 100644 --- a/media-fonts/aquapfont/Manifest +++ b/media-fonts/aquapfont/Manifest @@ -1,5 +1,4 @@ -AUX 60-aquapfont-r1.conf 327 BLAKE2B 0c247d357b0093e43c961afa34dd4a7ecbcf0720d68b96b0606bd9324d0b1a82a97332b5b6a4988fe6ece3e495715196dac485c980a2b0e32ff972ccb9c2f412 SHA512 3aa64fadc46c1d9ad3ac6e47ad5fe8bf9e3f1fb7272e7e722e57ebdbda8415fbe6e212864dcb2360a6ec7d28ff9f5309d0c0308017e7730b5b3d3cc10c1996d2 -AUX 60-aquapfont.conf 451 BLAKE2B 435a16b9dc29a642ff006bea4cf0bf274c0544e51bbbc0a201f8f3a33643ddcb516b57b253b5eba8e8c87ad3caacc15f8e038f0178fb95d31cd8448385388e1f SHA512 9bf5dc2944a8e34bc5e6343e75b76a424e586cea27f64ca3a1ba0b155b423b83e33990547df72a0bcea0b38271a28d32e710a345dae16b49b2da6e333d8b44f1 +AUX 60-aquapfont.conf 327 BLAKE2B 0c247d357b0093e43c961afa34dd4a7ecbcf0720d68b96b0606bd9324d0b1a82a97332b5b6a4988fe6ece3e495715196dac485c980a2b0e32ff972ccb9c2f412 SHA512 3aa64fadc46c1d9ad3ac6e47ad5fe8bf9e3f1fb7272e7e722e57ebdbda8415fbe6e212864dcb2360a6ec7d28ff9f5309d0c0308017e7730b5b3d3cc10c1996d2 DIST aquap2_6.zip 2896324 BLAKE2B 4bd7e699c71758117b42538360901b252006af2619ece3294662a49724810c2f0e900ab4529bdf6bff774c9421de1dbe57fc82e91cbfad35615a3b3b271ac086 SHA512 5a46fe428eb81739cd9eda0570350a1a892fb7dd6f4e136f4f1d585837a668ac63d816bfa0f956ac24d945b20e16e7b72274cbf1d21e9f93ca057eee72b6af88 -EBUILD aquapfont-2.6-r2.ebuild 940 BLAKE2B bc385aa55f5201e231f5fda7029a5e774db8d0f78bdb1b75997a0ac561af7081ede8310abae27be9a4edb2f34b433a0cce98844d4e35435b473c3d00ccdefc45 SHA512 ee86cefafe441038606268d2ef3a763052b9c746135be84a607e82a8693c4510d8afc6b1a8cf1ca04472587d6d12c26eb8c8324c06053d89f988808a977ca3f2 +EBUILD aquapfont-2.6-r2.ebuild 823 BLAKE2B 0b65c4214dc17b4db56176915b8d6484b5d95fa2464b7b69268db3548c76d1c0a649715c7d73d0d0aaf600d3201388442429a189353a0e4e80f56d1f12fd06f7 SHA512 c8afdafe551a174fd638648cef765ac0746d1bb7da6e77199ab359c9c0a63c4c36712ae3513d4bfa79e07941c96e809f89f1cb77f46857b091e5e51be7827786 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41 diff --git a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild index 657d83c7c412..dfa5495e12f6 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 3610820e10db..000000000000 --- 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 07c60a6afe56..3610820e10db 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> |