gentoo resync : 07.01.2018

5 files changed, 22 insertions, 19 deletions

diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index acd8426a35bf..ea3708804355 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,9 +1,9 @@
-AUX pktcdvd.init 1307 BLAKE2B 983127f7c28a0820ce579b42792864f5466d46c19ffc81057489c3024023e42dc1eb69bd91f289431cbc3453e2d0d3cd87f7280dee7954946a487df9e0aacf9b SHA512 6c5c7a8b39067924c5be31a951043a1c44ff53d951fa9307fde2393aaf9c2b5f8960a042aae238d71a09696a3077d72ed41acdf261739c2829ab25130f3b795b
+AUX pktcdvd.init 1360 BLAKE2B 16d01b722b98340a8a858c4f5e80881d41b010b9c6af6e4fdd489e1d000129b2d2793f6be6cfd4673851c26919bb310a6a8cf9f495360d0f24624bd5784f0116 SHA512 22522ff6bf19b08ef928ff87e0e3ffdf476f08c0c8b318770e522ad5187f323b94b26a3153bb56488618e8adff66b5585401e63ddae34068c4b2de472b1f5755
 AUX udftools-2.0-sysmacros.patch 1203 BLAKE2B 87e9d5ce829584ff0dae366bc3c2b52bcce7115668cc0ed9387a49744a2f558103e58980f038da141ae250135278a89578d4c7b3295a73ba7d3cd7a8ebd37aa5 SHA512 2108fb8e6d2e35922a47a6c7d82d218770ac1294cf0d2c88f9e3794ff2d91112eca850f8cda14ce019cc4c7e1653c173c9a6b3fffdf117ac58bfebb351c3b880
 DIST udftools-1.1.tar.gz 656865 BLAKE2B 6e76251368c121ab07e02071bfddde5c4f4523cc858a7ffcc86063b48adbc03233fab18a3ff50b840fc603e7f48f386e15b4ca556046116d4b42f43c06927dc5 SHA512 9c415d1cae1d79d49b4f9e3e6881f0b44b31d59f6d722571badd78ee68c422899ee8b95caed0ac50e76c13d8ed118f58f79efe5cbf775438a163d68160a30742
 DIST udftools-1.3.tar.gz 447063 BLAKE2B ff23f23dd5b9753d9e4cba6e326d302346233ed0a836ccf35372e61ca1d7a5c14ff8f1d1505f2f9fba779f4379adf472b64ce60aa4ca0d3e51679ea863db2f0f SHA512 d67f74640cc600fbdf3d7a67caee1342c15507357e155c5e1066aa6f6b3e2667483107edd663eaed5ebb690c13337598a75c1955e69cbc782bd481af783837e7
 DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
-EBUILD udftools-1.1.ebuild 664 BLAKE2B b127bbd656e4cfcf6d3c4a929f1dd709fd843eb0e1edcedab2a0f4428c4c08fd92c677f846da641877be52e21040be2bb4bed4117754e47aa04bd13b8aac1508 SHA512 829b847f094d1c8146c76312febedf72abca1a29def30410c00d509bae9b4da16ff6b9afbafe62ba54f6c97f174b51ff76b455a35f4ce19498f76e1f8fd974c4
-EBUILD udftools-1.3.ebuild 668 BLAKE2B 792c3c992300fbbe75dc8dcaa81a0a52aacf42dcc8e730e4475a31968843164c989aeb4941f6a52729e6f0d946082e03c3ef8cc984ec48689c41bf2e924fad43 SHA512 c7358d1dfb3e6fd253543d07798ceb43ada57f5917f674f471d38c6bc7d9251f4547a98b260e6d73766eca109b5e2ed8fa0d83dba6b05cae217969cce84eae4b
-EBUILD udftools-2.0.ebuild 707 BLAKE2B f3e673a67284445436156633d9fcba73a07a2690574c3746ea483caad28d7645d5f646fec82ae9923b1799e90b09c12db11ae76d99eea916c8344e8debcf5b3c SHA512 3385545b56fed68c7c3730d81c9ef2be41f4f85dc319d667895a7730f02c30a16c816798fa7146880fb1776262556d569cc0d44c9c31f78becbe1f5a0a3e3d58
+EBUILD udftools-1.1-r1.ebuild 664 BLAKE2B 83cc88c60000a72e00fcbfd8e65ebf00eee41d96945a7ab8498ac691f61025ea20c02f73f654b3df7c5a92af85c82f8ec88b5b1b72da2f6433a64e97e7522dca SHA512 96b9d3d58ed472e9f06de7041b6a379c66439165431435dafe17a7cd8d37796643048d41f2c7e0e219dc930b82fb848659fe13d054bee74fc958dbce026b233c
+EBUILD udftools-1.3-r1.ebuild 668 BLAKE2B 911f0dcb67cfd8fea0503ce0a5ed9369b955d2c67d20903b169465a7a8c053aa3a9486ba71af073b16a675630682df8e0dc6d9e01d9075bc754949a22dccb431 SHA512 67b23bdbd67de34bbfbd444807a8d6cf483d97cfaa6c11587ac86968be887fec4890a27b961f3b4eec0096497cd08622a29d203cf6c43e413bcc4a55612ca58c
+EBUILD udftools-2.0-r1.ebuild 707 BLAKE2B f3e673a67284445436156633d9fcba73a07a2690574c3746ea483caad28d7645d5f646fec82ae9923b1799e90b09c12db11ae76d99eea916c8344e8debcf5b3c SHA512 3385545b56fed68c7c3730d81c9ef2be41f4f85dc319d667895a7730f02c30a16c816798fa7146880fb1776262556d569cc0d44c9c31f78becbe1f5a0a3e3d58
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/files/pktcdvd.init b/sys-fs/udftools/files/pktcdvd.init
index 97375411e0e2..97bd34368240 100644
--- a/sys-fs/udftools/files/pktcdvd.init
+++ b/sys-fs/udftools/files/pktcdvd.init
@@ -1,13 +1,16 @@
 #!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 
+command="/usr/sbin/pktsetup"
+devdir="/dev/pktcdvd"
+
 depend() {
 	need localmount modules
 }
 
 checkconfig() {
-	if ! [ -e /dev/pktcdvd/control ]; then
+	if ! [ -e "${devdir}/control" ] ; then
 		eerror "Could not find packet-writing control device at /dev/pktcdvd/control"
 		eerror "Please ensure that your kernel includes packet writing support,"
 		eerror "and if modular, ensure that the module is loaded."
@@ -16,20 +19,21 @@ checkconfig() {
 }
 
 get_rw_devices() {
-	devices_raw=$(sed -re '/^drive name:/I!d; s/.*:\s+//' /proc/sys/dev/cdrom/info)
+	local sys_file="/proc/sys/dev/cdrom/info"
+	devices_raw=$(sed -re '/^drive name:/I!d; s/.*:\s+//' ${sys_file})
 	count=0
-	for i in $devices_raw; do
+	for i in ${devices_raw} ; do
 		eval "devices_$count=\"\$i\""
 		count=$(( $count + 1 ))
 	done
 	devs=""
 
-	cdrw_caps=$(sed -re '/^Can write CD-RW:/I!d; s/.*:\s+//' /proc/sys/dev/cdrom/info)
+	cdrw_caps=$(sed -re '/^Can write CD-RW:/I!d; s/.*:\s+//' ${sys_file})
 
 	count=0
-	for i in $cdrw_caps; do
+	for i in ${cdrw_caps} ; do
 		[ "$i" -eq 1 ] && eval "devs=\"\$devs \$devices_$count\""
-		count=$(( $count + 1 ))
+		count=$(( ${count} + 1 ))
 	done
 
 	echo ${devs}
@@ -43,10 +47,10 @@ start() {
 		devnode="/dev/${i}"
 		[ -e "${devnode}" ] || continue
 
-		/usr/bin/pktsetup "${i}" "${devnode}" > /dev/null
-		[ -e "/dev/pktcdvd/${i}" ] || continue
-		chmod 660 "/dev/pktcdvd/${i}"
-		chgrp cdrw "/dev/pktcdvd/${i}"
+		${command} "${i}" "${devnode}" > /dev/null
+		[ -e "${devdir}/${i}" ] || continue
+		chmod 660 "${devdir}/${i}"
+		chgrp cdrw "${devdir}/${i}"
 	done
 }
 
@@ -55,7 +59,6 @@ stop() {
 	
 	for i in $(get_rw_devices)
 	do
-		/usr/bin/pktsetup -d "${i}" > /dev/null
+		${command} -d "${i}" > /dev/null
 	done
 }
-
diff --git a/sys-fs/udftools/udftools-1.1.ebuild b/sys-fs/udftools/udftools-1.1-r1.ebuild
index efaa1d7e62cc..f0ef22a1e86d 100644
--- a/sys-fs/udftools/udftools-1.1.ebuild
+++ b/sys-fs/udftools/udftools-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/sys-fs/udftools/udftools-1.3.ebuild b/sys-fs/udftools/udftools-1.3-r1.ebuild
index d2a858cd9b0a..cd7b7e75dada 100644
--- a/sys-fs/udftools/udftools-1.3.ebuild
+++ b/sys-fs/udftools/udftools-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/sys-fs/udftools/udftools-2.0.ebuild b/sys-fs/udftools/udftools-2.0-r1.ebuild
index c5a2970d94c8..c5a2970d94c8 100644
--- a/sys-fs/udftools/udftools-2.0.ebuild
+++ b/sys-fs/udftools/udftools-2.0-r1.ebuild