From 36545821140f2e331bbc174cee674670edb4e399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 22 Apr 2020 11:05:07 +0200
Subject: sys-apps/personal-utils: enable all fonts in emergefix

---
 sys-apps/personal-utils/files/emergefix            | 38 ++++++++++++++--------
 .../personal-utils/personal-utils-1.5.7-r1.ebuild  | 16 ---------
 .../personal-utils/personal-utils-1.5.8-r1.ebuild  | 16 +++++++++
 3 files changed, 41 insertions(+), 29 deletions(-)
 delete mode 100644 sys-apps/personal-utils/personal-utils-1.5.7-r1.ebuild
 create mode 100644 sys-apps/personal-utils/personal-utils-1.5.8-r1.ebuild

diff --git a/sys-apps/personal-utils/files/emergefix b/sys-apps/personal-utils/files/emergefix
index 2a3a3b0..d621173 100755
--- a/sys-apps/personal-utils/files/emergefix
+++ b/sys-apps/personal-utils/files/emergefix
@@ -1,25 +1,37 @@
 #!/bin/sh
 set -e
 
-fail_ask() {
-	echo -ne "\e[1;31mContinue?\e[0m "
-	read
+step() {
+	echo -e '\e[1;34m==========' "$@" '==========\e[0m'
 }
 
-get_perl_version() {
-	equery list -F '$version' dev-lang/perl
+run() {
+	"$@" || {
+		echo -ne "\e[1;31mContinue?\e[0m "
+		read
+	}
 }
 
 #################################################################################
 
-echo -e '\e[1;34m========== Update packages ==========\e[0m'
-emerge -auDU --with-bdeps=y --keep-going @world "$@" || fail_ask
+step "Update packages"
+run emerge -auDU --with-bdeps=y --keep-going @world "$@"
 
-echo -e '\e[1;34m========== Rebuil packages ==========\e[0m'
-revdep-rebuild -- "$@" || fail_ask
+step "Rebuil packages"
+run revdep-rebuild -- "$@"
 
-echo -e '\e[1;34m========== Rebuild preserved ones ==========\e[0m'
-emerge --keep-going=y @preserved-rebuild || fail_ask
+step "Rebuild preserved ones"
+run emerge --keep-going=y @preserved-rebuild
 
-echo -e '\e[1;34m========== Clean packages ==========\e[0m'
-emerge --depclean -a "$@"
+step "Clean packages"
+run emerge --depclean -a "$@"
+
+step "Enable all fonts"
+enable_all_fonts() {
+	eselect fontconfig list | \
+		awk ' $3 != "*" { print substr($1,2,length($1)-2) }' | \
+		while read -r font; do
+			eselect fontconfig enable "$font"
+		done
+}
+enable_all_fonts
diff --git a/sys-apps/personal-utils/personal-utils-1.5.7-r1.ebuild b/sys-apps/personal-utils/personal-utils-1.5.7-r1.ebuild
deleted file mode 100644
index db86a53..0000000
--- a/sys-apps/personal-utils/personal-utils-1.5.7-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"
-}
diff --git a/sys-apps/personal-utils/personal-utils-1.5.8-r1.ebuild b/sys-apps/personal-utils/personal-utils-1.5.8-r1.ebuild
new file mode 100644
index 0000000..db86a53
--- /dev/null
+++ b/sys-apps/personal-utils/personal-utils-1.5.8-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"
+}
-- 
cgit v1.2.3