gentoo resync : 20.03.2021

3 files changed, 7 insertions, 48 deletions

diff --git a/media-fonts/quivira/Manifest b/media-fonts/quivira/Manifest
index 9f5e0e786a0e..a9138a964fa5 100644
--- a/media-fonts/quivira/Manifest
+++ b/media-fonts/quivira/Manifest
@@ -1,13 +1,7 @@
-DIST quivira-4.0-Combining.pdf 311026 BLAKE2B 98544081c6effef9ac7cc535507fda6af8dc9d72ac4653faeba3e578387596a9dfeda3944b42be354861dfef4c68288768e609351cc1c86d677fac94118af5cf SHA512 f904b8587623782093db25d2a069e32ba671f6f1a60ea3b8c8374ede3f48ab0daaa2e0cdff5acc72e97422c00c4f7286a2fe9503960d666429073379282aab9c
-DIST quivira-4.0-PUA.pdf 354040 BLAKE2B 9710d626ee104eed3758702b3c1b668f22ced8e38d822a6e084f71da15e455b06ac31b4b3557a2a1a8cdf404195ccd315f3a78bf3f9be489aae294152cbaa289 SHA512 a07a41e1e0027a03f7f1f4e81ddfb50b09a8dfad4f1342a32aab71505e6ce9ef2a7a8733145887651b20dd472c58b4167faa34945f8ca61bc4e016859a65cbba
-DIST quivira-4.0-Testpage.pdf 822289 BLAKE2B 9515a8dff0178638566af96b23af533b11cdde5a5399d0ad599bf1d86b0aa9d8f8fb11ea01f4c05bb15136b3f924606e9bed57e2dd3e5a11d05f8a0441cd6a0f SHA512 8ed238c9aa03544308dcd471eb6145aa81423a6877a2a5e6d1022277545317568ba642871eb2f3c03c38a9d3030e3f94d8c30469b6c331eaed553b81db154585
-DIST quivira-4.0.otf 1475236 BLAKE2B a42490f1ae75912b217993615b5bb3904c2a96200dde4c5d209a3dd6e25232ab74b2dd38e89f8025f8400620f69ebd7b9fb845fa46a94f198cfb47cbef3d66f3 SHA512 2887152660a8908947c1baa83025c408ac11139067278bce6c8a789d846cf764b9a464dc678ee6acc2b555c9f0d40be3464ac102a97fac8aa9bc04acf926f1b6
-DIST quivira-4.0.pdf 3877062 BLAKE2B 5147d57277be608aea1e250df26fddb5c6e3b9bf201c47d1ef23cde50d8b8d68b59d7a2362dffbfa6aeae4d95adc7616a69d8688fc87f11d8513b74673ddfd5b SHA512 38469819d0b8e062ac2b4f35ef5d8be300ea36645ffc7841428015191d129e1239ec0dff1605cfa0af76fd32ee1e590ed4a146117408afaa9a826328115db4a7
 DIST quivira-4.1-Combining.pdf 152768 BLAKE2B 4b0bd89ca5077d57c6643036343b79a460c9215a70cb4a11642a7275c0d2304b0893dfb3aa6abe2dcf8fcd18abe1d508b0ca371c81132b020128cbf53e890d9f SHA512 87bc7bdc5e0c4584c70d65268305d1e6fbc11ba53dea37f958175140934e90d224d9d6764d693f5a5b8dbe888b547dd862f73b6f99381294ea9fd9be079d716d
 DIST quivira-4.1-PUA.pdf 375319 BLAKE2B b8ed5627510aa2ef358f683b641e6e18a5ef5a06756277f8eb266b1d2fccd36f148c549d24d30752b64112bdebf9bf0ff6419e0013e46d3b1f4cd6f68e19229d SHA512 9f235e0ff48fbf0d8ff024640a9cd0e408a648b0fba0fc37cda7aaf9b5c7c9bb106d5a0ac82381d1d960068da01e56dd255c883da48b3d3d9120f8b9ff451324
 DIST quivira-4.1-Testpage.pdf 851341 BLAKE2B fa3be619255a487638eaf0e3e85ce67e70be0919ea34d7bcb2550beb1bbe9a7a728a325670ab076749f41b42cdff082050bf9fa0d0ed6baf68ea7919df9cc2ab SHA512 ed7129738f72a97e22f234ec36cb19517dd92d279b3536d8eb3fdaac8414ebe29f66a7d1625b27f3e0a39e53fa7539c01f6495af8cab63e4141d165f39f890e5
 DIST quivira-4.1.otf 1549016 BLAKE2B ec99585e4998c0411d4d5fb364d97ab479069549be475cb195b0b1512ac94c66ba5beeb7d07dc26cbe130ab44090f189e20d71a794334831808ddf58d05b63c1 SHA512 8f76c0e05aae7db9f4a155725f024dd019500bcb14fb1398182f897798128dd2ccf13840446382780b0c4873e6f8dc2d8a2e1c49e9bf17266b52248beb919c65
 DIST quivira-4.1.pdf 1632238 BLAKE2B 755dfd91812cc7c49875f9ccaadff9934dc5d7f86ce4cd2a1473d7c43aeb83f54dabf67985cbe14690ec4655b847c78bd9a92dc277520c63964ac548990f6a9e SHA512 7863b8c4aebbf9e1c8ef6033b6eacb9bceb9d52502ba90c87924809485c3071931a6f1382072bbe5ba1e39aa844d2e9551fefd746929040230ea6ae32b2ac748
-EBUILD quivira-4.0.ebuild 1190 BLAKE2B cc7d53f06132921919f9f1c38dcb7bcb9149460579f174b464571819c0a9b649ba363833a1547f46da843ba8b0bf8f32d14348cf725cee2080c229f04a3fa39e SHA512 bf968670b547031b633c006e50e0affa7adcaf9b871f15aae5e5bf993ebf5c78063c9cae4a4fef180e674c2ecb1c4b50c896d2f876fe544448f04174e6ddf00f
-EBUILD quivira-4.1.ebuild 1186 BLAKE2B 2402c0c4d7489c6453f0239eec1fe729e5e829e18b0156d07a90f651df491d304e75e6148d977622f1028a16431ec9074af0c9815c162aa1c4b51be7fe54d0aa SHA512 3aa6517ca57e3db28de074907039bdd295b651612993d25b4191c0341f43b1504d67c3eaac20ad51fad780785808a08d3676ad8f5d6430a86cf54c94860804f4
+EBUILD quivira-4.1.ebuild 1196 BLAKE2B 09ab7f130f662b7fa71b5dc1bf847fafad24490f0c1c5b65f5277e8cb3e0ec14b31257a4cc0e2dc42b29c572dbafa493a4900653275b408a4ab6b45aab7b9994 SHA512 c83d66e1e7c9de36e0ffd9a18eb2dedfbfac48932dad03d0496a3482594b779c2f118a5df86c622717edc7aa2cec4ea3d0c8453214216757bcf4b1d87c45149a
 MISC metadata.xml 584 BLAKE2B 24a5dcc1462e9cd796888fffc048851540811d9e75cdf5b804832e4f29f9fe4cafbaed037872c251839182b9f48e56a9b2a655089f72d45583a44c708e50e47e SHA512 bc10043cd40ac32b7d4309fbec2d702ed02b56d8cd822ed324c39e925c66c3bd070f3472d605c0c28e6ab64f8c401e1f87ec7977142a29c98d4484a7c1010c7d
diff --git a/media-fonts/quivira/quivira-4.0.ebuild b/media-fonts/quivira/quivira-4.0.ebuild
deleted file mode 100644
index edea0e21cfbc..000000000000
--- a/media-fonts/quivira/quivira-4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="${PN/q/Q}"
-
-inherit font
-
-DESCRIPTION="Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek"
-HOMEPAGE="http://www.quivira-font.com/"
-SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
-	doc? ( http://www.quivira-font.com/files/${MY_PN}.pdf -> ${P}.pdf
-		http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
-		http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
-		http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
-LICENSE="public-domain"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc"
-
-S="${WORKDIR}"
-FONT_SUFFIX="otf"
-
-src_prepare() {
-	cp "${DISTDIR}"/${P}.otf "${S}"/${MY_PN}.otf || die
-	if use doc; then
-		DOCS="${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf"
-		cp "${DISTDIR}"/${P}.pdf "${S}"/${MY_PN}.pdf || die
-		cp "${DISTDIR}"/${P}-Testpage.pdf "${S}"/${MY_PN}Testpage.pdf || die
-		cp "${DISTDIR}"/${P}-Combining.pdf "${S}"/${MY_PN}Combining.pdf || die
-		cp "${DISTDIR}"/${P}-PUA.pdf "${S}"/${MY_PN}PUA.pdf || die
-	fi
-}
diff --git a/media-fonts/quivira/quivira-4.1.ebuild b/media-fonts/quivira/quivira-4.1.ebuild
index 8ae94696b6bd..26c1d7afa8c2 100644
--- a/media-fonts/quivira/quivira-4.1.ebuild
+++ b/media-fonts/quivira/quivira-4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
+FONT_SUFFIX="otf"
 MY_PN="${PN/q/Q}"
-
 inherit font
 
 DESCRIPTION="Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek"
@@ -14,19 +14,19 @@ SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
 		http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
 		http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
 		http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
-LICENSE="public-domain"
 
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm ppc x86"
 IUSE="doc"
 
 S="${WORKDIR}"
-FONT_SUFFIX="otf"
 
 src_prepare() {
+	default
 	cp "${DISTDIR}"/${P}.otf "${S}"/${MY_PN}.otf || die
 	if use doc; then
-		DOCS="${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf"
+		DOCS=( ${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf )
 		cp "${DISTDIR}"/${P}.pdf "${S}"/${MY_PN}.pdf || die
 		cp "${DISTDIR}"/${P}-Testpage.pdf "${S}"/${MY_PN}Testpage.pdf || die
 		cp "${DISTDIR}"/${P}-Combining.pdf "${S}"/${MY_PN}Combining.pdf || die