gentoo resync : 23.09.2020

2 files changed, 14 insertions, 34 deletions

diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index e9cefe457bb4..86588a3c666b 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,5 +1,5 @@
-DIST restart-services-0.14.1.tgz 20909 BLAKE2B 2f6b74fc6094be83e1872d2a6ca7abb02a49b5db65d81cd37f8161bac148e5fe0614502f1f06356ff9cd6c6ba03c416dae1eec3a86f48dc011bc6e28c1b076e3 SHA512 3434c4b6cdf9d02b035eba2cc67cebe8e06a2cf31c2d8627063b84224dcb6d44e276e1fcb82221ad77ab7ee7e16fa7ee58fb94b7849d40e6786d3fcfb6087866
 DIST restart-services-0.15.2.tgz 23688 BLAKE2B e043b872d55109ad176a6437006cf581a993e72e460bb034625ed612f9ceca85ef91a20e90f23bcecc964caa527cfa4bc39d97c52487b7bf92eec21dc2e35c48 SHA512 afe7c96aabf61d664460d5d68447df09b3d9a54098887727db796821220f5ddd5a3b5030d995d5a6c3128e4a2b8494b9a0a3b86b5c805d56c0e201058ad04327
-EBUILD restart-services-0.14.1.ebuild 2285 BLAKE2B 7eb13e920790aae88e74b10cce100923aa490726011cdc33f96d0a38be957a0cbdc44e13a52b51a8b3c8d30e33464f72073f49888ffc4c573a65287ed49624c7 SHA512 841a1c6fa9d4c8b435f015c1785dd7c39929c808d771b7095f89a2d2832664a5b8915b3dfe56db5d9e4898a3d21b93e2c8ae01fa4502f33e5396ec6508c55a53
+DIST restart-services-0.16.0.tgz 24531 BLAKE2B fea233755d214a502096551226078a7fe15a75ccf937bbf8a75c78b7a294b5977da453f54f37e3d7e65f131e49e018bf08bec6245a3aa46ec6c3bec94019f5ad SHA512 57b3514132c02839cafbfd9152445a6482cf3591e22d18436a4d894061b59d2495863a912a87495559e9945a39715e7e798dca44dafd52c26b5412d749f37cc2
 EBUILD restart-services-0.15.2.ebuild 1791 BLAKE2B dd068050b6902dae67edf63b00afc64e65b53225d14e7a201da6cee76dbed62af643625a7ed10a4021481f4e3a0a31f8534972ba6132cd468262af73947042c2 SHA512 74dc54132343203ab53b13d1649bd9e4b3a28d31040e5c54f32707b94267cb0d29873d48e3a3e00d70a7763a6f57d841518602c405599f575e359b5fa9f1e999
+EBUILD restart-services-0.16.0.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/restart-services-0.14.1.ebuild b/app-admin/restart-services/restart-services-0.16.0.ebuild
index d83a7fafc540..874ac8f35520 100644
--- a/app-admin/restart-services/restart-services-0.14.1.ebuild
+++ b/app-admin/restart-services/restart-services-0.16.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
 HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
@@ -9,13 +9,14 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
 RDEPEND="
 	app-admin/lib_users
 	sys-apps/openrc
+	app-portage/portage-utils
 "
 
 src_install() {
@@ -26,9 +27,6 @@ src_install() {
 	doins restart-services.conf
 	dodoc README CHANGES
 
-	# remove after 2018/07/01
-	dosym restart-services /usr/sbin/restart_services
-
 	sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf
 	cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF
 	# You may put your local changes here or in any other *.conf file
@@ -48,34 +46,16 @@ pkg_postinst() {
 		MINOR=${MINOR#*.}
 
 		if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then
-			einfo "Migrating config"
-			if [[ -e /etc/restart-services.d ]]; then
-				ewarn "/etc/restart-services.d already exists?!"
-				return
-			fi
-			if [[ -e /etc/restart-services.conf ]]; then
-				ewarn "/etc/restart-services.conf already exists?!"
-				return
-			fi
-
-			if [[ -f /etc/restart_services.d/00-local.conf ]]; then
-				sed -i 's/restart_services/restart-services/g' \
-					/etc/restart_services.d/00-local.conf
-			fi
-			if [[ $(ls /etc/restart_services.d/) ]]; then
-				mv -v /etc/restart_services.d/* /etc/restart-services.d/
-			fi
-			if [[ -f /etc/restart_services.d/.keep_app-admin_restart_services-0 ]]; then
-				rm -v /etc/restart_services.d/.keep_app-admin_restart_services-0
+			einfo "Checking for old config"
+			if [[ -f /etc/restart_services.conf ]]; then
+				ewarn "Old config file found: /etc/restart_services.conf"
+				ewarn "It will be ignored so please migrate settings to a file in"
+				ewarn "/etc/restart-services.d/ and/or remove /etc/restart_services.conf"
 			fi
 			if [[ -d /etc/restart_services.d ]]; then
-				rmdir -v /etc/restart_services.d
-			fi
-
-			if [[ -f /etc/restart_services.conf ]]; then
-				sed -i 's/restart_services/restart-services/g' \
-					/etc/restart_services.conf
-				mv /etc/restart_services.conf /etc/restart-services.conf
+				ewarn "Old config directory found: /etc/restart_services.d"
+				ewarn "It will be ignored so please migrate files to /etc/restart-services.d"
+				ewarn "and/or remove /etc/restart_services.d"
 			fi
 			einfo "done"
 		fi