From 62648a9e6ded470d447c540de8a977b3a6b388f5 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 20:01:40 +0200
Subject: sys-apps/personal-utils: try to fix emerge version check

---
 sys-apps/personal-utils/files/emergefix                |  2 +-
 sys-apps/personal-utils/personal-utils-1.6.0-r1.ebuild | 16 ----------------
 sys-apps/personal-utils/personal-utils-1.6.1-r1.ebuild | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 sys-apps/personal-utils/personal-utils-1.6.0-r1.ebuild
 create mode 100644 sys-apps/personal-utils/personal-utils-1.6.1-r1.ebuild

(limited to 'sys-apps')

diff --git a/sys-apps/personal-utils/files/emergefix b/sys-apps/personal-utils/files/emergefix
index a60e94e..a131fa1 100755
--- a/sys-apps/personal-utils/files/emergefix
+++ b/sys-apps/personal-utils/files/emergefix
@@ -14,7 +14,7 @@ run() {
 
 #################################################################################
 
-if [ "$(equery -q l -I -o sys-apps/portage)" != "$(equery -q l sys-apps/portage)" ]; then
+if [ "$(equery -q l -I -p sys-apps/portage | grep -vE sys-apps/portage-9999 | sort -Vr | head -1)" != "$(equery -q l sys-apps/portage)" ]; then
 	step "Update portage"
 	run emerge -1 sys-apps/portage
 fi
diff --git a/sys-apps/personal-utils/personal-utils-1.6.0-r1.ebuild b/sys-apps/personal-utils/personal-utils-1.6.0-r1.ebuild
deleted file mode 100644
index db86a53..0000000
--- a/sys-apps/personal-utils/personal-utils-1.6.0-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.6.1-r1.ebuild b/sys-apps/personal-utils/personal-utils-1.6.1-r1.ebuild
new file mode 100644
index 0000000..db86a53
--- /dev/null
+++ b/sys-apps/personal-utils/personal-utils-1.6.1-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