gentoo resync : 03.11.2019

3 files changed, 7 insertions, 32 deletions

diff --git a/media-fonts/vlgothic/Manifest b/media-fonts/vlgothic/Manifest
index 5977c841a55d..c557cf26dfa8 100644
--- a/media-fonts/vlgothic/Manifest
+++ b/media-fonts/vlgothic/Manifest
@@ -1,5 +1,3 @@
-DIST VLGothic-20110722.tar.bz2 4797664 BLAKE2B 03e3afb8914234843a22221419d106cbea48b3dfd2d74367932a30c405e08850e4405d8346e8e1dcf27b20f106c2a91acc143091d416c7e888a72baead49b550 SHA512 91693c293e0ef9db01532a08d3f5f96104e7eacda580213537dedb9d8d8318b8520aa292cb625629db1d6f2a4714e977f55d23721fbde746c10049c971183f1b
 DIST VLGothic-20141206.tar.bz2 4952134 BLAKE2B b650481bd63c71f996e584c60e612201d131c6f89a4b2d5843be30922ea05358add61cd6c5fe3205a1f81f5e79a049c284fa90092196d79f5c114d4a58205806 SHA512 70ef712398b48486c0494ca52c97e145ebbaae0988b535a5447c796ed668944c0700175ab80587e0226d507d1589cedfe733f10f47f9b024873cf9e5d4e7983d
-EBUILD vlgothic-20110722.ebuild 525 BLAKE2B f1337b817cf1495036485fd3d51cfd06376b5223dca4fef38b030f250c86fd00c587164cd73987de7916c857b31458f78e8d09654da1f4b2dc03484546e87f42 SHA512 a28e5941a20a8dfb4619a32883d38034b414e694bbf547a4d996274361d341b69887a56905aa86d3ea5bb2ad65048b7f93baf29590974e863ec9c599ca665f6d
-EBUILD vlgothic-20141206.ebuild 546 BLAKE2B 7a3e52e33dc3974f209394999106c9712adc434bd26a3abc85c34a9cae6cd9a32c059f955d6560afa990e30882597701f23c5ef0441f9386f7b2662624c646ae SHA512 85e4e35e326f17fa099b3e5cd21d3442002ce9f3629d5bb60821a0b2ee472ec4f6831d51f5883dbc47de3f3a794ce4baff494a50ae1306e6f4b5b3479170c015
+EBUILD vlgothic-20141206.ebuild 529 BLAKE2B ac642e25ed951d067b88b29bf87e35c96d9538035256cd59e6b5a149529478148fa95bc05a8bf1a9abf38af942b39ef7770744bd6344f9d1e11110f716070fa5 SHA512 984d5bc29d0ae1596943aabf6f4de104cdb8a6688b9005efb6c89e7cf6dcf20c48aa415f659bd86feffb136a5c01180f96e157de0fe17d714509b67390c5cf60
 MISC metadata.xml 430 BLAKE2B 5a58b9c299fcb447e5d3895a54cf16bc8c3e2233c062a35e0d6dd3764bc7ba78fbad57a07ca5c02ddbe90a6a4967d268c7c9a44599f996a4c6674d765964bf9a SHA512 ef2fc0344b55c169ba468dcfbc72cddb81c68f63974add68430c39924ac5f7aa77c2130815496c68a025f7809fa0454aa0b44a0c50892d6db6fd64052adfbcc7
diff --git a/media-fonts/vlgothic/vlgothic-20110722.ebuild b/media-fonts/vlgothic/vlgothic-20110722.ebuild
deleted file mode 100644
index 15d9b83c3142..000000000000
--- a/media-fonts/vlgothic/vlgothic-20110722.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit font
-
-DESCRIPTION="Japanese TrueType font from Vine Linux"
-HOMEPAGE="http://dicey.org/vlgothic/"
-SRC_URI="mirror://sourceforge.jp/vlgothic/52711/VLGothic-${PV}.tar.bz2"
-
-# M+ FONTS -> mplus-fonts
-# sazanami -> BSD-2
-LICENSE="vlgothic mplus-fonts BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/VLGothic"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-DOCS="Changelog README*"
diff --git a/media-fonts/vlgothic/vlgothic-20141206.ebuild b/media-fonts/vlgothic/vlgothic-20141206.ebuild
index d41bfc2fafdd..25963876bb5a 100644
--- a/media-fonts/vlgothic/vlgothic-20141206.ebuild
+++ b/media-fonts/vlgothic/vlgothic-20141206.ebuild
@@ -1,11 +1,12 @@
-# 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
 
 MY_PN="VLGothic"
+
 DESCRIPTION="Japanese TrueType font from Vine Linux"
 HOMEPAGE="http://vlgothic.dicey.org/"
 SRC_URI="mirror://sourceforge.jp/${PN}/62375/${MY_PN}-${PV}.tar.bz2"
@@ -14,11 +15,10 @@ SRC_URI="mirror://sourceforge.jp/${PN}/62375/${MY_PN}-${PV}.tar.bz2"
 # sazanami -> BSD-2
 LICENSE="vlgothic mplus-fonts BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${MY_PN}"
 
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
 DOCS="Changelog README*"
+FONT_S="${S}"
+FONT_SUFFIX="ttf"