gentoo resync : 03.03.2019

5 files changed, 30 insertions, 53 deletions

diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 138792aaab31..45ac133a6700 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,7 +1,5 @@
-DIST mkfontscale-1.1.1.tar.bz2 139923 BLAKE2B 441aef79b2f1db18c56c5235afb83711c5ed43b16f8046750ab89abbe8eae58f01b7cd5b7a3565bcb10ac8a859ca2bc24b0bdd17ed15caa97f00915c9b2359f2 SHA512 7a6da239b2f166c6283090c219889e998be9332ee1e8eb4d84bbdf0cb58125a3773fe7ee97774d86f2cd5385dc49636a797c7b9c25c6c8bbe24b898329f97220
-DIST mkfontscale-1.1.2.tar.bz2 141728 BLAKE2B e15dea8a22fb59ad21a63a907dc0c30869480d26fa2721ecfd1ba65c81425b3ebf4709f89d4105a8f14d2d5c6e924754122713a244b58789227ad469a2d09d60 SHA512 5c3331f66cd523afe95347aa36440655ba8fdbc716c5987a24ad624c1fbd718c4a8d67aa36330f6d5ab2eb5a6195a409a041954568c0a3375c0e2aeb6a955601
 DIST mkfontscale-1.1.3.tar.bz2 144386 BLAKE2B 8cf4a61472b9357888ef355e89c3087102c4928884ecc6b5671202ad09284a2dc188b81faba6b1727b1a28ccaa6c3c36649c53659faf7a3fae4a2b32ab5a2420 SHA512 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62
-EBUILD mkfontscale-1.1.1.ebuild 565 BLAKE2B 3a79d562c59fe8b21680681361fb950c912ddb1ab5368af49bbb173fe04d59f5ea0a48c461bb466e8a9891d0773e646b2983a9ca43971fcf90d708032a9efe26 SHA512 1c24eaad1272373d83493c6829ecda78d4ae1bc3eb115f08b9ed5df5ac66ed1b9f3d18d4f84ce4ccba06f88a93b10ddec5cebd3d565306b13b340877fed86a50
-EBUILD mkfontscale-1.1.2.ebuild 605 BLAKE2B da214de6a0981b0df0b8e60e147518cfe94eea13925e2d8ba7251928495ec9272726571a732ec15d9d6394f8c4fab033c035585c2b28704c22bbdb637935e319 SHA512 38431c16c4e094bcef8ba874ae14a8cfef0b0de84b9960bf465e3deb26334aee3f76d46567190acf8e93e86ad0e5ae2c89f989a8a6af80a120ec8eb476778325
-EBUILD mkfontscale-1.1.3.ebuild 604 BLAKE2B 09a68c481f48dd3563d608d5667ff15af746ebe7775616c0e2cb02eefaf2990e4fb8cfbe7f4bf192ffdbedd929f997ad4d8937642f1e42301091f7ae76281a24 SHA512 0a5788b32ba76b0f8da63264d8f3a324d9618ace07e8af3d33271a0584b0ba6c23c17807f1749d1f381edc3753626020dee348d24aa8ce43c59ea5586e806d01
+DIST mkfontscale-1.2.0.tar.bz2 150646 BLAKE2B 7f4a0b279f0759b2d8faac584603488c9e405b92b43457b301aa6ba252bdef2cbfe65f58a1fb837e61113cfea139b6fcde1084450333864175e2cc4da84b6626 SHA512 3d02db7e031fe6730a07ed481d2a744592a7d542d75fedf55a4f5ad50d03d92e3534b4105af09d0a8f863bdc0321758222baf5b943de77ce4972978d86a5013f
+EBUILD mkfontscale-1.1.3.ebuild 600 BLAKE2B 1be6ee6b55382ed63fc6464fd83d3a6d90cd39c41952e0a35c2e46f3d88a41e5baed46669260bbd0084073f647ffb66ab18904dad7d1579c4f7afb035b42cb8a SHA512 222722cc686d874d3f457e6a908084fd5dfbeaff3a438f94cfc2f86b2545fec009a559fdfa68fd2ae9a86d80f13e93e980d0194cd858407f3f7ba2d49701cddd
+EBUILD mkfontscale-1.2.0.ebuild 636 BLAKE2B 2ae337a35debc23962c0f1e45bdb4b1a3c45cbc45a888a6eada210b265797e8398be9eecd02288b027866771d5598dde9f09caa396083db8ace8d71089caf3c3 SHA512 7d9d8f8ea83e0c3e955bca7af4bf6e8beca982090ec16fa46a5227dc58162ed3a56adabfae97f5349a004530ebb32b1314d471ed5432ba161726ca94f377dfa0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
deleted file mode 100644
index 958d59ad0534..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libfontenc
-	media-libs/freetype:2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	app-arch/gzip
-	app-arch/bzip2"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
deleted file mode 100644
index 75972e49b61a..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libfontenc
-	media-libs/freetype:2
-	sys-libs/zlib
-	app-arch/bzip2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/util-macros
-	app-arch/gzip"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
index 9cb7e7d141cc..bb2c8a3d40b5 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="create an index of scalable font files for X"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libfontenc
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.0.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.0.ebuild
new file mode 100644
index 000000000000..c0f737d6f423
--- /dev/null
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="create an index of scalable font files for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND="
+	x11-libs/libfontenc
+	media-libs/freetype:2
+	sys-libs/zlib
+	app-arch/bzip2"
+DEPEND="x11-base/xorg-proto"
+RDEPEND="${COMMON_DEPEND}
+	${DEPEND}
+	!<x11-apps/mkfontdir-1.2.0"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-bzip2
+)