gentoo resync : 06.08.2019

2 files changed, 18 insertions, 18 deletions

diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 0da4a8697c01..d19aa74b16a0 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -7,6 +7,6 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r1.ebuild 3774 BLAKE2B 50fddecf53e357e92921d2b469704bbad1350420a1b8adbaa3a00ff834727621ad2c7ea0582de54982f61ddacc4462e0a0595221e96a3d2f3548ab36dfe15cf4 SHA512 0344ff3b1c1a4f737cf4fea23a4015d0005f9a7b4974ea3d72c672c9710039a25b87f4ad9693504fb887030d1618b0f9036c86153ad1d243cdbf7c788059cf75
+EBUILD lirc-0.10.1-r1.ebuild 3740 BLAKE2B 094a39484b473f0a36d5ace14edecc3ac8e33a4fe7a5d739bd55f34a0aab83ec2ebed9abc0df51d50ef9f9affcfd1f7dd112449a7ec3b6941ebb949441050120 SHA512 e9e5f1bc6746ec2bb8cf11c3935ae480ab94603f7e97b0e7530c63d7560c34d281fc7117eb1e783e1c403d04de7e55503747798f9e4c0b96ed6b968d6656a8a7
 EBUILD lirc-0.10.1.ebuild 3726 BLAKE2B 7054ad4a9a02d499e4460c9178f24eead6da0efa148e680e96c0a261899a05e63fc77221f270e448e2a3269a538b1a92f58b90592193f569ee1b29499b7e68d3 SHA512 db8f02c0931238d4d8d73a2217076d31d4b609dcd874a246005633d98ec655ac51d818e4007a673d19db279d3a1995609c6d3e0ac0cbb4a28242432ab1ae351e
 MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r1.ebuild
index d054d3132398..6a9261677694 100644
--- a/app-misc/lirc/lirc-0.10.1-r1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r1.ebuild
@@ -94,7 +94,7 @@ src_install() {
 
 	if use !gtk ; then
 		# lirc-setup requires gtk
-		rm "${ED%/}"/usr/bin/lirc-setup || die
+		rm "${ED}"/usr/bin/lirc-setup || die
 	fi
 
 	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
@@ -109,37 +109,37 @@ src_install() {
 	newconfd "${FILESDIR}"/irexec-confd irexec
 
 	keepdir /etc/lirc
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
+	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+		newdoc "${ED}"/etc/lirc/lircd.conf lircd.conf.example
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
 
 	# Avoid QA notice
-	rm -d "${ED%/}"/var/run/lirc || die
-	rm -d "${ED%/}"/var/run || die
+	rm -d "${ED}"/var/run/lirc || die
+	rm -d "${ED}"/var/run || die
 }
 
 pkg_preinst() {
-	local dir="${EROOT%/}/etc/modprobe.d"
+	local dir="${EROOT}/etc/modprobe.d"
 	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
 		elog "Renaming ${dir}/lirc to lirc.conf"
 		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
 	fi
 
 	# copy the first file that can be found
-	if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
+	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
+		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
+		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
 		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	elif [[ -f "${ED}"/etc/lirc/lircd.conf ]]; then
+		cp "${ED}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
 	fi
 
 	# stop portage from touching the config file
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${ED%/}"/etc/lirc/lircd.conf || die
+	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+		rm -f "${ED}"/etc/lirc/lircd.conf || die
 	fi
 }
 
@@ -148,13 +148,13 @@ pkg_postinst() {
 	# without portage knowing about it
 	# so it will not delete it on unmerge or ever touch it again
 	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
+		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
 		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
 			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT%/}"/etc/lircd.conf || die
+			rm -f "${EROOT}"/etc/lircd.conf || die
 		fi
 	fi
 
 	einfo "The new default location for lircd.conf is inside of"
-	einfo "${EROOT%/}/etc/lirc/ directory"
+	einfo "${EROOT}/etc/lirc/ directory"
 }