gentoo resync : 27.03.2021

4 files changed, 52 insertions, 44 deletions

diff --git a/media-fonts/stix-fonts/Manifest b/media-fonts/stix-fonts/Manifest
index 6a0413047bb6..06f85edbe8a7 100644
--- a/media-fonts/stix-fonts/Manifest
+++ b/media-fonts/stix-fonts/Manifest
@@ -1,6 +1,9 @@
 AUX 61-stix.conf 1929 BLAKE2B c44515faed76fcb503fa0a51f0b9c7a1a805fad718afcf547212ce73a7c42d6e55cba7fd401756dda1b11cf9f9cc182244d58503ca3f8638e74e81e0cfa30008 SHA512 578b29a2703f393d002e343a4184952f32a20272af6cc925d21310ca5163a88c8a50cf04c5289ad55df29845b62efa6a9773c8310022e82901ec896d92688de1
 DIST STIXv1.1.1-word.zip 1834654 BLAKE2B ddd240876ae432a5796b70c7d4adc7f44446db7883b4bb3528b223d729a28cbff6f589e7f06323859397a4c9dcad34a1d5dcb9092977a8ae323b4adf1ee5ea64 SHA512 df5171f1a2de4e4e513013b47943cc8f7e210c59ddc11bb4d1f7d07680d7efdd0c73c96a349e523fbca24782314ded81a4eeb1b87aeb2a2c81d00fa9dbcd4b11
-DIST STIXv2.0.0.zip 3921396 BLAKE2B 3188b28e6f21df0bd3283cacac071399afb325cad3c36387e47448ee9bffcd452b59e4381663d06fbbb93d704a3510c23c31a88e832e75fbd7be85a179761553 SHA512 b5d1a98be67fb548d8898cee207b429a6b53617c0ee33b798273e4626e287af9404acf85e702c7fc6cd0b27da379a03013f77caeb57b957d7633efa722f69ae0
-EBUILD stix-fonts-1.1.1.ebuild 774 BLAKE2B be4a24f2f62be5e46a2b7847d0b0108c9d75aa45cd054f5ac63695882f0dd593d26c2474c32be0f8cfad89f8436b80d51c16420fb40941ecd731b34dab34d579 SHA512 6aaac661d65288765996b34711fa96c0d323abb24107c4b67304450f2c17177fea94842530eb1c3f057c7efb3cbc36177c26cc7e24ced4f9126a5103970d0939
-EBUILD stix-fonts-2.0.0.ebuild 690 BLAKE2B 8c65c732b600087b8d7299aa1bbb89d1558bbf4bdc4d9b13c5b79d7a49eba71c3ec5b832cc978a65faa85adc032660b8e896ca281eb722c3aec5d74c0637fe8a SHA512 2d9d87ccc0cae1085f998d5e43454a508885c8c456d443087f1d34b99b9fc9e97bbb226cf82faa8ab53e42dd046eeda3c481e654964f5b057764b275f523fe63
+DIST stix-fonts-2.11-FONTLOG.txt 27987 BLAKE2B b29daccfd54daaa59e694bf105d566fb14e4b4c8bf732dd9eccbdd610983e0fc3798a8f8c3bbca80e86190f9e44cdf27e527a721c0ef548addcf39c3f240c6f6 SHA512 3cd3c87b5b8c7ba4e4f76ed95349a375c5a365303f0e9a8bb26922c8b4382e47f4903531dacffd9f2d6df8bb0be8f50fb965695fc5c5ed69c443345140952067
+DIST stix-fonts-2.11-STIXTwoMath-Regular.pdf 988219 BLAKE2B 614fce509b4890aff9732fec997e1665bce256a381457a00b4508ebf052a2aeaa264bd13917c0df34610332a15fbf9a0951f00477d9e17bfb156bc62aff584c6 SHA512 be03b5539bff41b904a4971e07d717d2b8b5bc4805f05c18bb56ec79ee07d38dd7bd1274c0887fc3019594aa09945e59cee30a22a0406c7985dba72245987861
+DIST stix-fonts-2.11-STIXTwoText-Regular.pdf 371400 BLAKE2B 874d78aac0cf335f5d7a616ca54b8efd707d15a7e4a9d6c18541f277554688fc321f51d3c13d7ae9c55a916b8e4a17730c63c7886bbd81c509b6883c97096e5c SHA512 2cdfe0f3906480e8449c969ee52ece50322b27bf1d9f3da664086d0846fd5fdf007d5e1daf181a0cabc8b9a5c63645722f7ce3d3cd69d3930c6b3d3474e7f032
+DIST stix-fonts-2.11-otf.zip 2151460 BLAKE2B 77640182e9672a7d478068aafcd527620c3d1326af2670b8fab96c61fc0944b7158831c3262a09061cb3e66e81562f91078a1432740d4b733787699b740dfac8 SHA512 629723260c79cd2ee2e07e4b70a3022e6ad2dc476088108a17f85276673b28933b327f76f945b373b66cc52360df14ea4dcd8d9c9f4424af06d065eeda010208
+EBUILD stix-fonts-1.1.1.ebuild 674 BLAKE2B ecabf1d65d90ea6e2d0404ec3d8bf98a773b97c9cbb65a923773122eb0f59e8cb197f99be05af1174a7a7a53155a1314df45d3aa675c073f72c178023a562fba SHA512 f0fda106b17ecc778db50db86a4ccd090f6cf7f79039a6ca9f42837e918efe29a15c9a404eacd5546e43e67f4a9106fa2bc87f676a0c07fdd0989acc21dba088
+EBUILD stix-fonts-2.11.ebuild 990 BLAKE2B c687d32b8054a03ecb8b7a590746db8cf5b525e6cba21e939d07bbb1e51a8ccfff472ad0a90484f20996f7ed8b7bab0397d62cb0eabff67be9991882f29316a7 SHA512 d9e55c455fd52348532b467480f999b2a0511f9e4115892aaf7b7956b4a05c986e7db1959c90fff1d8246523aef42a50b3e4b680ca97a482b250722058a8e227
 MISC metadata.xml 317 BLAKE2B 503285934782ce57ede0881674e286d015803dd09480ada7e3fffc9fffe82160bde205b2141f448f814c06fcb16066b32624d74c2c4f0a694c31bb6472d4c5ae SHA512 7e384d1a8a6b0cb9cba64e52c57cb6d762218f1032f0680c2e35efd00d1e4c92444fc1ab8e7782d6a85b1cbc7835faada3d2e89c9692383f54035bf7676e2af9
diff --git a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
index b91640f47201..32beaebcb6cd 100644
--- a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
@@ -1,30 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit font
 
 DESCRIPTION="Comprehensive OpenType font set of mathematical symbols and alphabets"
-HOMEPAGE="http://www.stixfonts.org/"
+HOMEPAGE="https://www.stixfonts.org/"
 SRC_URI="mirror://sourceforge/${PN/-/}/STIXv${PV}-word.zip"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+RESTRICT="binchecks strip test"
 
-S="${WORKDIR}"
-FONT_SUFFIX="otf"
-FONT_S="${S}/Fonts/STIX-Word"
-FONT_CONF=( "${FILESDIR}"/61-stix.conf )
+BDEPEND="app-arch/unzip"
 
-src_install() {
-	# DOCS can't do files with spaces so handle it ourselves
-	font_src_install
-	dodoc "STIX Font ${PV} Release Documentation.pdf"
-}
+DOCS=( "STIX Font ${PV} Release Documentation.pdf" )
 
-RESTRICT="binchecks strip test"
+FONT_CONF=( "${FILESDIR}"/61-stix.conf )
+FONT_SUFFIX="otf"
+FONT_S="${S}/Fonts/STIX-Word"
diff --git a/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild b/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
deleted file mode 100644
index 160743fffa9b..000000000000
--- a/media-fonts/stix-fonts/stix-fonts-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-MY_P="STIXv${PV}"
-DESCRIPTION="Comprehensive OpenType font set of mathematical symbols and alphabets"
-HOMEPAGE="http://www.stixfonts.org/"
-SRC_URI="mirror://sourceforge/${PN/-/}/${MY_P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-FONT_SUFFIX="otf"
-FONT_S="${S}/Fonts/OTF"
-FONT_CONF=( "${FILESDIR}"/61-stix.conf )
-
-DOCS=( docs/STIX_2.0.0_release_notes.txt )
-
-RESTRICT="binchecks strip test"
diff --git a/media-fonts/stix-fonts/stix-fonts-2.11.ebuild b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
new file mode 100644
index 000000000000..3955c4a40819
--- /dev/null
+++ b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Comprehensive OpenType font set of mathematical symbols and alphabets"
+HOMEPAGE="https://www.stixfonts.org/"
+BASE_URI="https://raw.githubusercontent.com/stipub/${PN/-/}/v${PV}"
+SRC_URI="${BASE_URI}/zipfiles/static_otf.zip -> ${P}-otf.zip
+	${BASE_URI}/docs/FONTLOG.txt -> ${P}-FONTLOG.txt
+	${BASE_URI}/docs/STIXTwoMath-Regular.pdf -> ${P}-STIXTwoMath-Regular.pdf
+	${BASE_URI}/docs/STIXTwoText-Regular.pdf -> ${P}-STIXTwoText-Regular.pdf
+"
+S="${WORKDIR}/static_otf"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE=""
+
+RESTRICT="binchecks strip test"
+
+BDEPEND="app-arch/unzip"
+
+FONT_SUFFIX="otf"
+
+src_install() {
+	font_src_install
+
+	local doc
+	for doc in FONTLOG.txt STIXTwo{Math,Text}-Regular.pdf; do
+		newdoc "${DISTDIR}"/${P}-${doc} ${doc}
+	done
+}