From 9253efd988a7c9922cee69e4a0148f0c5618a506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 28 Sep 2018 10:06:15 +0200
Subject: Try to cleanup ebuild insts little bit

---
 app-crypt/usbkey/usbkey-0.2-r1.ebuild                  | 8 ++------
 sys-apps/multiconfig/multiconfig-0.2-r1.ebuild         | 7 ++-----
 sys-apps/personal-utils/personal-utils-1.5.1-r1.ebuild | 7 +++----
 x11-misc/xshot/xshot-1.ebuild                          | 2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app-crypt/usbkey/usbkey-0.2-r1.ebuild b/app-crypt/usbkey/usbkey-0.2-r1.ebuild
index ccb8b4e..20ac8ad 100644
--- a/app-crypt/usbkey/usbkey-0.2-r1.ebuild
+++ b/app-crypt/usbkey/usbkey-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI=7
 
 VER="${PV%-r*}"
 
@@ -21,15 +21,11 @@ dev-libs/openssl
 RDEPEND="${DEPEND}"
 
 src_install() {
-	dodir /usr/bin
-	exeinto /usr/bin
-	doexe "${S}/usbkey"
+	dobin "${S}/usbkey"
 
-	dodir /usr/share/bash-completion/completions
 	insinto /usr/share/bash-completion/completions
 	newins "${S}/bash_completions" usbkey
 
-	dodir /usr/share/zsh/site-functions
 	insinto /usr/share/zsh/site-functions
 	newins "${S}/zsh_completions" _usbkey
 }
diff --git a/sys-apps/multiconfig/multiconfig-0.2-r1.ebuild b/sys-apps/multiconfig/multiconfig-0.2-r1.ebuild
index 374d14e..7b2daa4 100644
--- a/sys-apps/multiconfig/multiconfig-0.2-r1.ebuild
+++ b/sys-apps/multiconfig/multiconfig-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Multiple configuration system"
 HOMEPAGE="https://git.cynerd.cz/multiconfig/"
@@ -15,11 +15,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_install() {
-	dodir /usr/sbin
-	exeinto /usr/sbin
-	doexe "${S}/tools/multiconfig"
+	dosbin "${S}/tools/multiconfig"
 
-	dodir /usr/lib/multiconfig
 	exeinto /usr/lib/multiconfig
 	insinto /usr/lib/multiconfig
 	doexe "${S}/multiconfig"
diff --git a/sys-apps/personal-utils/personal-utils-1.5.1-r1.ebuild b/sys-apps/personal-utils/personal-utils-1.5.1-r1.ebuild
index 0f40c22..2cd5bcb 100644
--- a/sys-apps/personal-utils/personal-utils-1.5.1-r1.ebuild
+++ b/sys-apps/personal-utils/personal-utils-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI=7
 
 DESCRIPTION="My simple personal system utilities"
 HOMEPAGE="http://git.cynerd.cz/gentoo-personal-overlay/"
@@ -9,7 +9,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 src_install() {
-	exeinto /usr/sbin
-	doexe "${FILESDIR}/emergefix"
-	doexe "${FILESDIR}/gentoo-mount"
+	dosbin "${FILESDIR}/emergefix"
+	dosbin "${FILESDIR}/gentoo-mount"
 }
diff --git a/x11-misc/xshot/xshot-1.ebuild b/x11-misc/xshot/xshot-1.ebuild
index 8e89304..2cd933c 100644
--- a/x11-misc/xshot/xshot-1.ebuild
+++ b/x11-misc/xshot/xshot-1.ebuild
@@ -11,5 +11,5 @@ KEYWORDS="amd64 x86"
 RDEPEND="media-gfx/imagemagick"
 
 src_install() {
-	doexe "${FILESDIR}/xshot"
+	dobin "${FILESDIR}/xshot"
 }
-- 
cgit v1.2.3