From 8229611d82dbfa5d9cfb15dba584dc366abea7e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 7 Sep 2020 18:52:41 +0200
Subject: sys-apps/personal-utils: do not run fontconfig when not available

---
 sys-apps/personal-utils/files/emergefix              | 20 +++++++++++---------
 .../personal-utils/personal-utils-1.5.10-r1.ebuild   | 16 ++++++++++++++++
 .../personal-utils/personal-utils-1.5.9-r1.ebuild    | 16 ----------------
 3 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 sys-apps/personal-utils/personal-utils-1.5.10-r1.ebuild
 delete mode 100644 sys-apps/personal-utils/personal-utils-1.5.9-r1.ebuild

diff --git a/sys-apps/personal-utils/files/emergefix b/sys-apps/personal-utils/files/emergefix
index dc7c1f2..bcec51d 100755
--- a/sys-apps/personal-utils/files/emergefix
+++ b/sys-apps/personal-utils/files/emergefix
@@ -26,12 +26,14 @@ run emerge --keep-going=y @preserved-rebuild
 step "Clean packages"
 run emerge --depclean -a "$@"
 
-step "Enable all fonts"
-enable_all_fonts() {
-	eselect fontconfig list | \
-		awk 'NR > 1 && $3 != "*" { print substr($1,2,length($1)-2) }' | \
-		while read -r font; do
-			eselect fontconfig enable "$font"
-		done
-}
-enable_all_fonts
+if eselect modules has fontconfig; then
+	step "Enable all fonts"
+	enable_all_fonts() {
+		eselect fontconfig list | \
+			awk 'NR > 1 && $3 != "*" { print substr($1,2,length($1)-2) }' | \
+			while read -r font; do
+				eselect fontconfig enable "$font"
+			done
+	}
+	enable_all_fonts
+fi
diff --git a/sys-apps/personal-utils/personal-utils-1.5.10-r1.ebuild b/sys-apps/personal-utils/personal-utils-1.5.10-r1.ebuild
new file mode 100644
index 0000000..db86a53
--- /dev/null
+++ b/sys-apps/personal-utils/personal-utils-1.5.10-r1.ebuild
@@ -0,0 +1,16 @@
+EAPI=7
+
+DESCRIPTION="My simple personal system utilities"
+HOMEPAGE="http://git.cynerd.cz/gentoo-personal-overlay/"
+S="${WORKDIR}"
+
+LICENSE="GPL-3.0+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="app-portage/gentoolkit"
+
+src_install() {
+	dosbin "${FILESDIR}/emergefix"
+	dosbin "${FILESDIR}/gentoo-mount"
+}
diff --git a/sys-apps/personal-utils/personal-utils-1.5.9-r1.ebuild b/sys-apps/personal-utils/personal-utils-1.5.9-r1.ebuild
deleted file mode 100644
index db86a53..0000000
--- a/sys-apps/personal-utils/personal-utils-1.5.9-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-EAPI=7
-
-DESCRIPTION="My simple personal system utilities"
-HOMEPAGE="http://git.cynerd.cz/gentoo-personal-overlay/"
-S="${WORKDIR}"
-
-LICENSE="GPL-3.0+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-portage/gentoolkit"
-
-src_install() {
-	dosbin "${FILESDIR}/emergefix"
-	dosbin "${FILESDIR}/gentoo-mount"
-}
-- 
cgit v1.2.3