[patch] bug-698128-ebuilds.patch

bug-698128-ebuilds.patch (text/plain), 1.74 KB, created by Brian Evans (RETIRED) on 2019-12-06 20:37:28 UTC

diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
index 78a09b75e22..a1e65c08438 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.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=6
@@ -25,10 +25,23 @@ DEPEND="
 	fontforge? (
 		${PYTHON_DEPS}
 		media-gfx/fontforge
-		dev-python/fonttools
+		$(python_gen_any_dep '<dev-python/fonttools-4.0[${PYTHON_USEDEP}]')
 	)"
 RDEPEND=""
 
+python_check_deps() {
+	if use fontforge ; then
+		has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	default
+	if use fontforge ; then
+		sed -i "s/= python/= ${EPYTHON}/" Makefile || die
+	fi
+}
+
 pkg_setup() {
 	if use fontforge; then
 		FONT_S="${S}/${PN}-ttf-${PV}"
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
index 7cff094ba51..943a48c23e7 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
@@ -25,9 +25,22 @@ DEPEND="
 	fontforge? (
 		${PYTHON_DEPS}
 		media-gfx/fontforge
-		dev-python/fonttools
+		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
 	)"
 
+python_check_deps() {
+	if use fontforge ; then
+		has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	default
+	if use fontforge ; then
+		sed -i "s/= python3/= ${EPYTHON}/" Makefile || die
+	fi
+}
+
 pkg_setup() {
 	if use fontforge; then
 		FONT_S="${S}/${PN}-ttf-${PV}"