gentoo resync : 10.04.2018

4 files changed, 13 insertions, 52 deletions

diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 48d2295820e4..39f2865084d8 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -4,7 +4,7 @@ DIST xmltv-0.5.67.tar.bz2 1188778 BLAKE2B a463529739c777411e0066baafb55d027f30ac
 DIST xmltv-0.5.68.tar.bz2 1200116 BLAKE2B 3dcf6140c8eea5bcb729d8159b0e698f0716aff6e46175412a9087f156be5d9a400b4efb96c3566c17bbf352354671fe54d6c5bccd6ef878102a8c98b5749af8 SHA512 bf21837d3804058c6cbfeb0e75af57e5d6e3cd35da40c96291c951bdadc3b4dbfa64c8145a4e2129713b65e7540e1d5da08fe6fbab4c7561ec448f2ce07acbd5
 DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
 EBUILD xmltv-0.5.57.ebuild 5401 BLAKE2B 0c4ca8aa05463ca5d41790431d844adefddad12def480b846b5a04273d8c7b3ff67d698af343d81eedc384c15fae90f093441972d3ed516944d2eb074a305b83 SHA512 881ec922d61a10fe6911e0fd9f6d3dcc15e58ba4ed480cf6eb79dddaf73d5b46fda6c0e084e83681a9ab4ea544bfc3c97722e9de2b8bd225008c50abe3b24e35
-EBUILD xmltv-0.5.67.ebuild 6412 BLAKE2B 4243e3b07cd309fafa2b80a638ba06c934498c49553067eb46d87a76e7bf6a98009710a3c5e297f261b83a38e2fc07ecb21720aaeea587f33de60a318fd211b8 SHA512 dff1d33659be05a6aa2a02db20df66ceac10ac2d6f14f29a071e700be59ad93fd2af5cbcd561387af88e43b77a97f24660365e878dac8cc25ec37b226a1de004
-EBUILD xmltv-0.5.68.ebuild 6719 BLAKE2B 53aedba579a68deda5abd38587708af93bfcd7ff85180097b089dd250b802fc280bb76f2ed0ead591fe8a6c5356d27e0fe29dd76f66342175c84d98ae2d20c42 SHA512 44b24f18ce10ef1a6c578045a134b90abbcfbcfcc9af5381dd84047c2a87f2ce57b0a696096ed3d4402cf8b20769dd36e1bddb7f73cfca6da37f808c6f98eda5
-EBUILD xmltv-0.5.70.ebuild 5716 BLAKE2B a44d3b66c3a5def7d45d5383f484a28fcbbac2bfe7c48fdcd7de526d21b002f4ef820e091cef01508091c87ee71886bc3d336030af3b3d3344453576a0df48ea SHA512 b89eb6e531be3d77e6a3d5aa7cd7949fc940c5a1d4e196c0568bc841f3f64d7b68a99935218711ce9c081044bda4052300737f019c5c3ae08dd211ae3a3e4ef7
+EBUILD xmltv-0.5.67.ebuild 5971 BLAKE2B 3c5a941937f5d6fcb10bcd6762c53fd6bc7ad4b6caa83f568b15ac5f5b444e0293bdb9ecaf7d6d8cf3bdc712db5079ac293d8d0c3133ea7d0ac5a8374636643d SHA512 7b4b31e15a636959ebbf6c5190249524cf3f06cf6223651835e0b9035d84d750ef187d7abd36cd2a7338c52ba694146d332e64d26a96121b84187f79d87f774a
+EBUILD xmltv-0.5.68.ebuild 6280 BLAKE2B 8f089f19c0de98bbc11b4d3e12c448b747734d64c0b40aca835987341c93ba2c402b2fc473da3444abc7cf08045b98c7a1667940ff74859126bda010bd72a682 SHA512 b3df365bd447cd5380f00c17e569f33f3177d587c2dac357a6f2b658444298f77daa66d757450c3dae354a52455e28f18f9afc2d188e47e9401151350cec7cd5
+EBUILD xmltv-0.5.70.ebuild 5270 BLAKE2B f3fa105e78cad4a4d7efa5a1bb95b2bae3aa1c1c4a3b43cbb5da139bde0c6ff05ead8e2ec1ad10457383c2c66741b751d5357b320b304bb88f54e148860634b3 SHA512 83c242900b8a1329a4b544e59117f12b6e383d4736c5bb422e60f6ee62c1fd1553795bb4b27676cb4bd758f2c9a1c5a9b9a0f77805be8a59430d07d1f8eb33d1
 MISC metadata.xml 3113 BLAKE2B 1b85dc12e84ff83cf2a703a2a4d6467a8f3cf59368d602957b3acf1962e22aa4fd89234aa7a7f9e0839295bb83755c7b0ef44529cac948afa20427fd72f8a1ac SHA512 c77c3598460917c623132854c822d8c9924910632964dc80a7bba2abf24530cb796f70eaf0cb0007869759a2a033baf6c0e5d6473cdb7a4b817e431ff11be1a6
diff --git a/media-tv/xmltv/xmltv-0.5.67.ebuild b/media-tv/xmltv/xmltv-0.5.67.ebuild
index 88c25a36cb27..72f25d804cfd 100644
--- a/media-tv/xmltv/xmltv-0.5.67.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.67.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,20 +17,6 @@ IUSE="ar ch_search dk dtvla es_laguiatv eu_dotmedia eu_egon eu_epg fi fi_sv
 fr fr_kazer hr huro il is it na_dd na_dtv na_tvmedia nl no_gf pt pt_meo se_swedb
 se_tvzon tr uk_atlas uk_bleb uk_rt uk_tvguide tv_check tv_combiner tv_pick_cgi"
 
-# NOTE: you can customize the xmltv installation by
-#       defining USE FLAGS (custom ones in
-#	/etc/portage/package.use for example).
-#
-#	Do "equery u media-tv/xmltv" for the complete
-#	list of the flags you can set, with description.
-
-# EXAMPLES:
-# enable just North American grabber
-#  in /etc/portage/package.use : media-tv/xmltv na_dd
-#
-# enable graphical front-end, Italy grabber
-#  in /etc/portage/package.use : media-tv/xmltv tv_check it
-
 RDEPEND=">=dev-perl/libwww-perl-5.65
 	>=dev-perl/XML-Parser-2.34
 	>=dev-perl/XML-Twig-3.10
@@ -193,17 +179,18 @@ src_install() {
 
 	perl-module_src_install
 
-	for i in `grep -rl "${D}" "${D}"` ; do
+	local i
+	for i in $(grep -rl "${D}" "${D}"); do
 		sed -e "s:${D}::g" -i "${i}" || die
 	done
 
-	if use tv_pick_cgi ; then
+	if use tv_pick_cgi; then
 		dobin choose/tv_pick/tv_pick_cgi
 	fi
 }
 
 pkg_postinst() {
-	if use tv_pick_cgi ; then
+	if use tv_pick_cgi; then
 		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
 		elog "to where the ScriptAlias directive is configured."
 	fi
diff --git a/media-tv/xmltv/xmltv-0.5.68.ebuild b/media-tv/xmltv/xmltv-0.5.68.ebuild
index 083ccfa8de93..d98f182a38ef 100644
--- a/media-tv/xmltv/xmltv-0.5.68.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.68.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
@@ -17,20 +17,6 @@ IUSE="ar ch_search dk dtvla es_laguiatv eu_dotmedia eu_egon eu_epg fi fi_sv
 fr fr_kazer hr huro il is it na_dd na_dtv na_tvmedia nl no_gf pt pt_meo se_swedb
 se_tvzon tr uk_atlas uk_bleb uk_rt uk_tvguide sd_json tv_check tv_combiner tv_pick_cgi"
 
-# NOTE: you can customize the xmltv installation by
-#       defining USE FLAGS (custom ones in
-#	/etc/portage/package.use for example).
-#
-#	Do "equery u media-tv/xmltv" for the complete
-#	list of the flags you can set, with description.
-
-# EXAMPLES:
-# enable just North American grabber
-#  in /etc/portage/package.use : media-tv/xmltv na_dd
-#
-# enable graphical front-end, Italy grabber
-#  in /etc/portage/package.use : media-tv/xmltv tv_check it
-
 RDEPEND=">=dev-perl/libwww-perl-5.65
 	>=dev-perl/XML-Parser-2.34
 	>=dev-perl/XML-Twig-3.10
@@ -201,6 +187,7 @@ src_install() {
 
 	perl-module_src_install
 
+	local i
 	for i in $(grep -rl "${D}" "${D}"); do
 		sed -e "s:${D}::g" -i "${i}" || die
 	done
diff --git a/media-tv/xmltv/xmltv-0.5.70.ebuild b/media-tv/xmltv/xmltv-0.5.70.ebuild
index b137f72ef360..dd339abb1baa 100644
--- a/media-tv/xmltv/xmltv-0.5.70.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.70.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils perl-module
+inherit perl-module
 
 DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
 HOMEPAGE="http://xmltv.org"
@@ -17,20 +17,6 @@ IUSE="ar ch_search dk dtvla es_laguiatv eu_dotmedia eu_epg fi fi_sv
 fr fr_kazer huro il is it na_dd na_dtv na_tvmedia nl no_gf pt_meo se_swedb
 se_tvzon tr uk_bleb uk_tvguide tv_check tv_combiner tv_pick_cgi zz_sdjson"
 
-# NOTE: you can customize the xmltv installation by
-#       defining USE FLAGS (custom ones in
-#	/etc/portage/package.use for example).
-#
-#	Do "equery u media-tv/xmltv" for the complete
-#	list of the flags you can set, with description.
-
-# EXAMPLES:
-# enable just North American grabber
-#  in /etc/portage/package.use : media-tv/xmltv na_dd
-#
-# enable graphical front-end, Italy grabber
-#  in /etc/portage/package.use : media-tv/xmltv tv_check it
-
 RDEPEND=">=dev-perl/libwww-perl-5.65
 	>=dev-perl/XML-Parser-2.34
 	>=dev-perl/XML-Twig-3.10
@@ -178,6 +164,7 @@ src_install() {
 
 	perl-module_src_install
 
+	local i
 	for i in $(grep -rl "${D}" "${D}"); do
 		sed -e "s:${D}::g" -i "${i}" || die
 	done