gentoo resync : 03.11.2019

3 files changed, 16 insertions, 80 deletions

diff --git a/media-fonts/cronyx-fonts/Manifest b/media-fonts/cronyx-fonts/Manifest
index bd80ef07ad99..8cd65a40e630 100644
--- a/media-fonts/cronyx-fonts/Manifest
+++ b/media-fonts/cronyx-fonts/Manifest
@@ -1,6 +1,4 @@
-DIST x6rus-2.3.1-bin.tgz 602902 BLAKE2B a42ea9ce78e16533bdd7c0336825d3361b1a655cf2dd39a6928b1a606d0fd68eaed5b1f815519d1bb9ec6d2f4109c9ffe4ac3d6ee632404cd8cf700bebefdc6c SHA512 0bc585724fa13edb27f8f0d275620fa01f35f885835a017428f12ca5cd30111942d7422efbc2a7e6b055325e1e8fb54bf58caadf2e981c56fc7f6deb96a75717
 DIST xfonts-cronyx_2.3.8-6.diff.gz 14285 BLAKE2B 91021cb3033fb6acd96b2f8fd12f4c621f066aabe7226b90d8a6a8da98fbfbfcb765a8a4cc7397b764b7b4c1f196c6e8a8df8cae1b7ae8c8f8981920f9b8ce42 SHA512 15703eda0e612b2cc29b16a4668fbe3efbfc3ffcea9bfa25ee47c4b3a7e1f0f8f5637b0f3c9b1239ab192f7229d56a433b8ff1b4366131d8d4c722f4451a1288
 DIST xfonts-cronyx_2.3.8.orig.tar.gz 269169 BLAKE2B e867a78511b744ca1b4fd95581c820b8932f8c17b336cc467f894324817b223b94179fe9cd5de46fd85445044e20c78ff067b650495eb0ba6e4781b05484f0bc SHA512 ac6e0d18977fb36ee255c57114f333dc5962c5a3f30dea8a6dccadd3831baa0d1b940c9a2fc40c56c043c8cb276c7a1bc039b555a68dab05e00139884b6b4696
-EBUILD cronyx-fonts-2.3.1-r2.ebuild 1695 BLAKE2B 94df9906a6ef86eddef1483adb1ec20651eabdad8822bc7190f2e15686fa5b4f12942ba871d853853d27da1798ac7dfaa1ca0c0abc514b809519c9c631ba3be4 SHA512 695ebf9acb6c062cc60cf04b23b23bc98fd6b061247c623edfb0fda2d6007dad0ba60de338fa3218b80a89310173215c5ab5931afcd08cf1287e8eaf6b0c9dbc
-EBUILD cronyx-fonts-2.3.8.ebuild 717 BLAKE2B ceab53f0038b2f5968251f8335d5d21731ff5bf8164ba1c1a46b9b2e073f18c2650d770b58d93f565924a450c46a274d0461d64889962460912753c3021eed6f SHA512 a1c1c33f6c36e1cac582a941d3464049cf84b3ced5f1725e84f970c463275bdd58f0ee9eac12507f473b820c900b0fbc5d373e21fb93f1247bb72b210dda733e
+EBUILD cronyx-fonts-2.3.8.ebuild 716 BLAKE2B af89e51e06b0a1442692d4ac4a0255e220c6b8567699beac078fb57cd6ecec5c3e799671d1d1e3e247f54f73190a50004f5aba9e19afe1d2a79f014d7f519daa SHA512 22270cb0be207c29bda4956b3ca73def9678834a7f844debe4ba892d7365125141ad2b9c43a97dd2236eb17ad09e1b404c52495dd9ce2bc833b2728548fb0f9e
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
deleted file mode 100644
index 8bf97ee3051b..000000000000
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Cronyx Cyrillic bitmap fonts for X"
-HOMEPAGE="http://koi8.pp.ru/frame.html?xwin.html#xwin_fonts"
-S="${WORKDIR}/cyrillic"
-SRC_URI="http://koi8.pp.ru/dist/x6rus-${PV}-bin.tgz"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
-SLOT="0"
-LICENSE="freedist"
-DEPEND="x11-apps/mkfontdir"
-RDEPEND=""
-IUSE=""
-
-FONT_ROOT=/usr/share/fonts/cronyx
-FONT_TARGETS="75dpi 100dpi misc"
-
-src_install() {
-	for dir in ${FONT_TARGETS}; do
-		insinto ${FONT_ROOT}/$dir
-		doins ${dir}/*.pcf.gz
-	done
-	# our install dir is still ${FONT_ROOT}/misc, so
-	doins misc/fonts.alias
-	dodoc xrus.info
-}
-
-rebuild_fontfiles() {
-	einfo "Refreshing fonts.scale and fonts.dir..."
-	cd ${FONT_ROOT}
-	mkfontdir -- ${FONT_TARGETS}
-	if [ "${ROOT}" = "/" ] &&  [ -x /usr/bin/fc-cache ]
-	then
-		einfo "Updating font cache..."
-		HOME="/root" /usr/bin/fc-cache -f ${FONT_TARGETS}
-	fi
-}
-
-pkg_postinst() {
-	if use X > /dev/null ; then
-		rebuild_fontfiles
-		elog "In order to make X see the fonts, you need to add the"
-		elog "following lines to the files section of your "
-		elog "/etc/X11/XF86Config (or the XOrg equivalent):"
-		elog "  FontPath \"${FONT_ROOT}/100dpi/:unscaled\""
-		elog "  FontPath \"${FONT_ROOT}/misc/:unscaled\""
-		elog "  FontPath \"${FONT_ROOT}/75dpi/:unscaled\""
-		elog ""
-		elog "In order to make them accessible to your current X"
-		elog "session, run:"
-		elog "  xset fp+ ${FONT_ROOT}/100dpi/:unscaled,\\"
-		elog "${FONT_ROOT}/misc/:unscaled,\\"
-		elog "${FONT_ROOT}/75dpi/:unscaled"
-		elog "  xset fp rehash"
-	fi
-}
-
-pkg_postrm() {
-	if use X > /dev/null ; then
-		rebuild_fontfiles
-	fi
-}
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
index c420a8ca405a..c07950ee68d1 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-FONT_PN="cronyx"
-inherit eutils font font-ebdftopcf
+EAPI=7
+
+inherit font font-ebdftopcf
 
 MY_P="xfonts-cronyx_${PV}"
+
 DESCRIPTION="Cronyx Cyrillic bitmap fonts for X"
-HOMEPAGE="http://packages.debian.org/source/sid/xfonts-cronyx"
-SRC_URI="mirror://debian/pool/main/x/xfonts-cronyx/${MY_P}.orig.tar.gz
+HOMEPAGE="https://packages.debian.org/source/sid/xfonts-cronyx"
+SRC_URI="
+	mirror://debian/pool/main/x/xfonts-cronyx/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/x/xfonts-cronyx/${MY_P}-6.diff.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 
 S="${WORKDIR}/${MY_P//_/-}.orig"
-FONT_S="${S}/75dpi ${S}/100dpi ${S}/misc"
-DOCS="Changelog.en xcyr.README.* xrus.README"
 
-src_prepare() {
-	epatch "${WORKDIR}"/${MY_P}-6.diff
-}
+PATCHES=( "${WORKDIR}"/${MY_P}-6.diff )
+
+DOCS="Changelog.en xcyr.README.* xrus.README"
+FONT_PN="cronyx"
+FONT_S="${S}/75dpi ${S}/100dpi ${S}/misc"
+FONTDIR="/usr/share/fonts/cronyx"