gentoo resync : 01.10.2021

9 files changed, 48 insertions, 7 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 946e3567ea30..363bc7100255 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/droid/Manifest b/media-fonts/droid/Manifest
index 8f6797bd8f64..4e9c5aa9aa3d 100644
--- a/media-fonts/droid/Manifest
+++ b/media-fonts/droid/Manifest
@@ -4,5 +4,5 @@ AUX 59-google-droid-serif.conf 329 BLAKE2B 4d7042c7eaefcbaa8ba29650b541d613a899e
 DIST DroidSansMonoDotted-112_p1.ttf.bz2 74649 BLAKE2B 07124449926ae09babf6d298b8d180f4309580608614228257230348b2207ae565e6c1cc40b9b85d233a396a72c8db4ad8f9694a4807b95902a20e5fc055d6b1 SHA512 420cf24d3585d1f7b8a81f81e743ec415344b365f1f80447f43e384df39b9825926efd8762bc7864c3c3363e4054b8bc8f8f78871b6a23074994a869da911fdf
 DIST DroidSansMonoSlashed-112_p1.ttf.bz2 74632 BLAKE2B e699ae9170d91a980fe295fcc22a8efdd499381447fcde3e2403c6c63f50e3579f71507d8df744077ea8131446c1668d344838bb38d049c8c15e2d9926907bdc SHA512 bd6031600631fcd51c72232c6a2b42230274b3445b658a2299f4d87613e3a97775b08d10b4a1ad0f3758a5b927593bff0dac6ebb3768d6e44e32c047d858878c
 DIST droid-113-r1.tar.bz2 4227725 BLAKE2B 9b9c25b93c5b4b9335589af02e6844d52a5a01d37b168b117f0191793b5274e8d4c944dd15a949c4ad868d8c2e51412ec875e72fc642b388d4018e6bfadb9248 SHA512 1219f54bb153b26bf460d89d866236a4f4ae9010eaf0c1236a9d9633dea7808df7228c6cffcf9635fcfeaa81e5f93e8ece7b02b885a5e9baddc9f522ee07ac64
-EBUILD droid-113-r5.ebuild 1129 BLAKE2B 92bd5ea310e2d191b802d01f58a85600aa704667e7392d9a20847eeb448cd17b8b33b167ff29d9908ac744dc8b268f5e87f72996a5adc13d4fbe71766a445f4d SHA512 6062693e59a9d52213b56400aee40de40a87306537d996601559f6ccaebac31dca0364d0ba27436c0d5f2f9648754efc0097217c8d02ed5ac481e32479218167
+EBUILD droid-113-r5.ebuild 1135 BLAKE2B a99b5f0f365170606c87b9cfdafcfc1c1627abb7a212f1b7a8c472de29566f63c082a2df9267a80be4db4ae79229c8aaea5170888a6fd073a4c00ccc2713e2e8 SHA512 75722adb91e21ae9c8e22edc443d9b24503287943eb9642ff7cf7181e0f68718c293462820964a23a20e096b76c5bb1477802ac44730c0bf1e7b35c4aae0b2ae
 MISC metadata.xml 239 BLAKE2B 5aaac778361cc8f607c6587e338cb80fd9a032e722766c60e011327e58b327fd4ca5113b66b281273c718c7492edd2477a0d702acd900fd9e376faeaedf717b0 SHA512 333c4df4d2002923cb872edc1e4e4f121563d73b157a8b2a4605ee449c759417014e9bc1342acaf697325d3d3bd8babe5930bbe4e08df90650cd1a52a0ecd337
diff --git a/media-fonts/droid/droid-113-r5.ebuild b/media-fonts/droid/droid-113-r5.ebuild
index 4883bcdd608e..c6f3a2002eb9 100644
--- a/media-fonts/droid/droid-113-r5.ebuild
+++ b/media-fonts/droid/droid-113-r5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~m68k ppc ppc64 x86"
 IUSE=""
 
 FONT_CONF=(
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 8b459f886e91..46d319db64d0 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -4,5 +4,5 @@ DIST liberation-fonts-2.1.3.tar.gz 4977444 BLAKE2B 1d77ea6a9aa850a3501a7051bf3e3
 DIST liberation-fonts-ttf-2.1.2.tar.gz 2370416 BLAKE2B 386eab6e886b677082bbbe1bf625bf91304e6baa4352a8dba3d073d3d2d80c1ae85ebb456f0b967be7ba9c430d7a95364107e54e789d419605976174ceb751b3 SHA512 bfdc3fb7dff1e78aa833035dad40bc26b12bce24b9e16863ec2f8f768a2a370705fafd25c430e3ed4ba7f742051c52ed3cf14da82a8500797b9efcdeef507f3c
 DIST liberation-fonts-ttf-2.1.3.tar.gz 2370443 BLAKE2B af9039d7586e87b25b05ee80893fb63f0857c05de748a9a9228557556d74cd322c8411672387f6a55b4e6ae2e7c16adb00b6e4d19b6170ce822721845741d0bf SHA512 d988cf02119352f7815327e58ac93ffc2301da66b9afe4427b49ed01edd465dbefd05bf76936035f501d9d38636e97cf243ba87e9f62ca85599ad2c9874a2c77
 EBUILD liberation-fonts-2.1.2.ebuild 1267 BLAKE2B f60735a91a98b46366b8b741e18e0602994c9630feee641309e8c8d4bd7100de07109d3b7b5ec0f84cbf18a767ef3e18c77d640c5931b2153c482275027fc1db SHA512 fe42c6bebcc1c3aa988cbb42c97802cbd5c8ca0ab8beb0fd9dd14a26e3598b907416434e54c1b3fa1d1090827096a341b63457bcb83123cf14b5c4968baf8f36
-EBUILD liberation-fonts-2.1.3.ebuild 1267 BLAKE2B 4095338208d33e0f2a343bc557418fc351e7bd3dd0329522c76dfaef8575fec7bb50688351ec048db87ab59161be7cf5b2170880f77916385bef8b2519d02843 SHA512 19021537102bffa4b25786c6d3ab4dced8b2e597d8025ed570e5e6f46f8b18d52584bed122a409c946c8e4f215f7537124f8b77ea63694bf2200e6d4b450e044
+EBUILD liberation-fonts-2.1.3.ebuild 1273 BLAKE2B 12798414a7d44d44997664cd60ce71e3a56de37e9d452cc4043812621288c5cde0dea6266feb4af41a7e0a3512fd085c2911b121f29af03a0bae8898cbcd0c38 SHA512 926f895b460d5eb72336782699c57f8e2c76fd343208d0317d473acac5396279b90cba47a8694535fe191defbf42cd260a335c36a5769f60005ce7f6b32aa119
 MISC metadata.xml 348 BLAKE2B 48542ff2974580db41cdc0be2cca36b72db1ce5fbc3fa9e32799d8c8f27d1821ea56c3b1292d015bd2ba255ba691173a7b89dab6f644bb50e3508fea6d9df802 SHA512 c4d46c9102a2b128fe23dc52e2e23ef838d99a28854f3ca78e4e0ce2aeaa0135a7ac23e503cc49c77b836118c703c494cb59db4da53aea78c3785b36a3a62ec6
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
index ef04f9e9ef1d..52c8ae9efc21 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/
 	!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/${PN}-ttf-${PV}.tar.gz )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
 SLOT="0"
 LICENSE="OFL-1.1"
 IUSE="fontforge X"
diff --git a/media-fonts/vollkorn/Manifest b/media-fonts/vollkorn/Manifest
index 63ecc83362a5..d07ef13c3a6b 100644
--- a/media-fonts/vollkorn/Manifest
+++ b/media-fonts/vollkorn/Manifest
@@ -1,3 +1,5 @@
 DIST Vollkorn-2.1.zip 139737 BLAKE2B 5aa31eb1b7e493b273e7623eb22d99b629f5c044ae1ff594cb48d488cf800114a4fc4884c02e7e9400bcaa4d6b6d344283e7a2de885f9c95dd33beba690ae7d9 SHA512 f6d3283a06204491119ce3a3796dace7db640469192b9d44fd44471a185dc580a2ba8160f2983371b6160cb782adaabcd02872cfc2b1d05b10f3d6e73c60cded
-EBUILD vollkorn-2.1.ebuild 597 BLAKE2B 25727d6981214f06eb718ec54f28fd872cdbdfaad34c3d17eeddf3f9c1536b3d327f1ffc96c84b063bf40f8d5989c8da7e8caae978f7782f5abb4f1965e2d4c8 SHA512 56368666be3f69736ad5cae4c04018a0bc0a2b1bfbc3d9c1029e38f1b3c535860da489e873578d742bf336053a9f90173e853ed6b4a15a30c2075c7dbbd9379c
-MISC metadata.xml 235 BLAKE2B f469fc8727ef3de05c8a1d43d640dd5bc6aee0158f82ba12c1024613b9c4c0a681f91528205ecd30d47cb9aca08ab788f7f595168bf0ceba25d8a2baf34b4cba SHA512 3229f3ecdc21ea952f5d40215f5a75129d165b9e34f80f7194842fe6362ed4f585470c7f6e9751825313345cade1f153d122d59f67016c26b5d21eeef64dfd22
+DIST vollkorn-4-105.zip 11046213 BLAKE2B bfa8515335ab6f7eaa57ad03642b7694b41047b228e9c1c51285ac70f8d799a9d61ba0414bc91ec1fdb5e579597a8a3d5c901c1d77d1de1c425ba1822a29ced9 SHA512 847196951f842481d11d76304435f88190608cabd7ccb47ca19a10b7215b69e19c19dc85e628e6b2730dd9b8cf1850c6b30470103724dd40fcf9b5eadb88a3f8
+EBUILD vollkorn-2.1.ebuild 585 BLAKE2B 89c5949980a023119609c1e8e0bc88f17513ac9127421e28543102657f791e2aae913e63f2cacd51cca7908ec2d791bfa8ce3199676ce0d7b0729e7028a81b12 SHA512 fdf0a207513aa5f143b28081b16a2ce1eb89784c3fa115ae1fbf44ba76a760aa0136088a6b951f9a02ca2668a25b90c3df783655bed3e0d9f99ab49aa073a9fe
+EBUILD vollkorn-4.105.ebuild 777 BLAKE2B 6f0395650b562a97e718fa394f06b9a239d34fde720ac728a254dcaad836cbc5f56ad798015f0e49315c52633c535b5845e4ad00756f2852bfacedd7ae9fcb0d SHA512 c30d90e4605e937bba7934a0474ca9554715290a5cd5d7294dd8ce4825b21af0018293749bd09e39194bcdafa951060d714a0d83a891b15f605d4c477df4bf21
+MISC metadata.xml 470 BLAKE2B 83e993f3ad3b5c07184373535640408bf5c9cf85ceed425adefc7f4c887d9e5ca473a5f2749815f66dbbc78e8a88b04ade3c1be0e0aa8409842b0bec37fdf7b0 SHA512 29f8aeb86eed59dae79ca6f124ee197d0dd0ea7ec60a0b35e71b8a832aeea71d13529803900c0286cdf5f426ddd55a01777f161fa8d3995333272997ced53fc6
diff --git a/media-fonts/vollkorn/metadata.xml b/media-fonts/vollkorn/metadata.xml
index 9a448dfc2e7c..9c5f2fa2bea6 100644
--- a/media-fonts/vollkorn/metadata.xml
+++ b/media-fonts/vollkorn/metadata.xml
@@ -5,4 +5,11 @@
 	<email>fonts@gentoo.org</email>
 	<name>Fonts</name>
 </maintainer>
+<use>
+	<flag name="otf">Install the OpenType version of the font</flag>
+	<flag name="ttf">Install the TrueType version of the font</flag>
+</use>
+<upstream>
+	<remote-id type="github">FAlthausen/Vollkorn-Typeface</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-fonts/vollkorn/vollkorn-2.1.ebuild b/media-fonts/vollkorn/vollkorn-2.1.ebuild
index f6e6b19691a7..2232c8303960 100644
--- a/media-fonts/vollkorn/vollkorn-2.1.ebuild
+++ b/media-fonts/vollkorn/vollkorn-2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit font
 
 DESCRIPTION="Vollkorn, the free and healthy typeface for bread and butter use"
-HOMEPAGE="http://friedrichalthausen.de/?page_id=411"
+HOMEPAGE="http://vollkorn-typeface.com/"
 SRC_URI="http://friedrichalthausen.de/Vollkorn-${PV}.zip"
 
 LICENSE="OFL-1.1"
diff --git a/media-fonts/vollkorn/vollkorn-4.105.ebuild b/media-fonts/vollkorn/vollkorn-4.105.ebuild
new file mode 100644
index 000000000000..cb865153c23e
--- /dev/null
+++ b/media-fonts/vollkorn/vollkorn-4.105.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Vollkorn, the free and healthy typeface for bread and butter use"
+HOMEPAGE="http://vollkorn-typeface.com/"
+SRC_URI="http://vollkorn-typeface.com/download/${PN}-${PV/./-}.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+otf +ttf"
+REQUIRED_USE="|| ( otf ttf )"
+# Only installs fonts
+RESTRICT="strip binchecks"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+DOCS="Fontlog.txt"
+
+src_install() {
+	if use otf; then
+		FONT_S="${S}/PS-OTF" FONT_SUFFIX="otf" font_src_install
+	fi
+	if use ttf; then
+		FONT_S="${S}/TTF" FONT_SUFFIX="ttf" font_src_install
+	fi
+}