gentoo resync : 15.12.2019

4 files changed, 30 insertions, 27 deletions

diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index 9f7b14d24304..a9bbcb05c9b9 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -5,7 +5,7 @@ AUX vdradmind.conf 92 BLAKE2B 14d1abac4f0718dcf0679ffaab81f2d1867cdca3f3cf8534dd
 AUX vdradmind.service 278 BLAKE2B 58b7aca123f3dc6ac00eeed25a241cd4315b93abff33ef66a0a227623a5bfd6fb5c234166a55d66f0d4a7762ab0c9c720f8e2031bf52789a52edc3d07d61bfa2 SHA512 e862d5a54e0f9b1b8c3604933ccea840e1256fac49f1b93cd7c6446f9aa4f6b8371fbd8d8b767574efe2420c7141e7af0cd5578733311a94377db8797de32b28
 DIST vdradmin-am-3.6.10.tar.bz2 606665 BLAKE2B c475b36c840548b6e0d50b2095ce3278b0b526af856c891a25d28bb2f0cb9f950aa9979533a6b6425a2a36a594dc5d6a075fca7713eb1f59071fec854582cf5b SHA512 f7546f79b786ca383c0846656e74bd69dc9faf57fe5794ffd68776123497ec2a96c2f131801e3d5d19247ac36eaa896801e1ac9cd11291418abb518ba208e597
 DIST vdradmin-am-3.6.9.tar.bz2 562006 BLAKE2B d04d7c0c3254942a388fe0f7b9832fb83f5b6c36af8e9021da8b1e5480d0a507c14da3b55590ea3ba4f58e58c7de9f36cc2a3c5f94168be605477244f62da987 SHA512 1c84ce56da238db6ab2a2fc3d59582945440436e174b3998c21b6bcb5b99c914a195728aa24fef7de8841c3be09b6e9976497acd873e768aab5fdaacddd473d5
-EBUILD vdradmin-am-3.6.10.ebuild 4733 BLAKE2B ddbd8b56d04b2e262c1e8867df7b0c273dc4cab04f714cd3833e9340a74e9be855b8540877813bf786cc34aa038c5c50bfb5a83a9ddcdb76854999e97921b8f8 SHA512 fe8f935a54169aa261696d07e90f02958c120d610b5b11a0608f3fd6df50fb2f9d38641a28e7e5b4faa5aa604d5846d184a6d60f8b478d02cd11808be18c5b8a
-EBUILD vdradmin-am-3.6.9-r3.ebuild 4733 BLAKE2B ddbd8b56d04b2e262c1e8867df7b0c273dc4cab04f714cd3833e9340a74e9be855b8540877813bf786cc34aa038c5c50bfb5a83a9ddcdb76854999e97921b8f8 SHA512 fe8f935a54169aa261696d07e90f02958c120d610b5b11a0608f3fd6df50fb2f9d38641a28e7e5b4faa5aa604d5846d184a6d60f8b478d02cd11808be18c5b8a
-EBUILD vdradmin-am-3.6.9.ebuild 4318 BLAKE2B 442e0c96b7f7646c70b62701acb0ebc3143d5ef63bcb59e23aa0eca53521e3f0c680a612147684a313ed117ba6d632ae6296a287e1d7ee42333af2b4293d94d5 SHA512 f64a92d865b4647d70140bfd89faeeba2e926b0c4cc65a803c9a084ff11091166c11a51e3f4aafe511a146204d6194ccb7d950d83e365edab0585a06748da4dd
+EBUILD vdradmin-am-3.6.10.ebuild 4747 BLAKE2B 8b1ac0d95b21a76ed5e7bde9eb3748b5201dae971466f5fefd05c0622c6e68dd8b75e276ef820fb36f3da2e32afc352d0fba19e3296d1f64674d249687e7d2f4 SHA512 c551fa86798b7d3d48e325b3d1c12bd37f8fe5d5522254cf91eed9724381bc7940f3e050246552673e64734aa351d5ef7fa54341b1cc3e28fd6725d1c35f6e51
+EBUILD vdradmin-am-3.6.9-r3.ebuild 4730 BLAKE2B bdc97dd0b5be9bbf0977c9fd687c9260c14831278e43dbb2ea26a00cb4f494b48ba5571a03b3e049340d381df6beb2891b5c62c9752e0e6dacdda5cf5df72e0a SHA512 69a1ce6c895f45b2b738375bcf14501fb1771f72fbf794b99019398599ed9d553402abb17e7488822cf847440939afa644ab7ce81fdd9d21a2971a91c01d849a
+EBUILD vdradmin-am-3.6.9.ebuild 4315 BLAKE2B b69fc3e119c2ed3eaf70898515b9612012ab3fbd68395eb9c50b59dc8904293f3fd83988db6f0f6d97f47641f0b85787a01547d566dd26ad9b60f7024481c407 SHA512 1ab55053c9eefd90ca28a5cd7659e6da9cb56c1178a1fffff7e7b9a111ec8b1b0ad3631d29c0206c6ddf1996b2ccd7265b62ef5621269056d566930f063499c3
 MISC metadata.xml 644 BLAKE2B cc2a5a6a3850a15bbb5188a1d08f9496df43dc0a964c71cad73ff3cadaf9e4c629bdee2e80841540a0ee087f3f42c4bfd9feea53a0e0ec5e04e853ada394b5f9 SHA512 a51923afa708144a4ee6ea9b5f5ee08b90c69840218979a855f5021f2ea351838206c2d2bd6f9be52a61884ce4da3990630672d85e2a077b504351ddb202422f
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
index dd8b73c217f3..17158acefd59 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils ssl-cert systemd user
+inherit ssl-cert systemd user
 
 DESCRIPTION="WWW Admin for the Video Disk Recorder"
 HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
@@ -18,6 +18,7 @@ DEPEND="dev-lang/perl
 	dev-perl/Template-Toolkit
 	dev-perl/libwww-perl
 	dev-perl/URI
+	dev-perl/CGI
 	dev-perl/Locale-gettext
 	virtual/perl-IO-Compress
 	ipv6? ( dev-perl/IO-Socket-INET6 )
@@ -35,7 +36,7 @@ VDRADMIN_USER=vdradmin
 VDRADMIN_GROUP=vdradmin
 
 create_ssl_cert() {
-	# The ssl-cert eclass is not flexible enough so do some steps manually
+	# The ssl-cert eclass is not flexible enough, so do some steps manually
 	SSL_ORGANIZATION="${SSL_ORGANIZATION:-vdradmin-am}"
 	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
 
@@ -57,8 +58,10 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	sed -i vdradmind.pl \
-		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g" || die
+		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g"
 
 	if use ipv6; then
 		sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ipv6:" \
@@ -105,27 +108,27 @@ src_install() {
 
 pkg_preinst() {
 	install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
-		"${D}"${ETC_DIR}/vdradmind.conf || die
+		"${ED}"${ETC_DIR}/vdradmind.conf || die
 
-	if [[ -f "${ROOT}"${ETC_DIR}/vdradmind.conf ]]; then
-		cp "${ROOT}"${ETC_DIR}/vdradmind.conf \
-			"${D}"${ETC_DIR}/vdradmind.conf || die
+	if [[ -f "${EROOT}"${ETC_DIR}/vdradmind.conf ]]; then
+		cp "${EROOT}"${ETC_DIR}/vdradmind.conf \
+			"${ED}"${ETC_DIR}/vdradmind.conf || die
 	else
 		elog
 		elog "Creating a new config-file."
 		echo
 
-		cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
-			VDRCONFDIR = "${ROOT%/}"/etc/vdr
-			VIDEODIR = "${ROOT%/}"/var/vdr/video
-			EPG_FILENAME = "${ROOT%/}"/var/vdr/video/epg.data
-			EPGIMAGES = "${ROOT%/}"/var/vdr/video/epgimages
+		cat <<-EOF > "${ED}"${ETC_DIR}/vdradmind.conf
+			VDRCONFDIR = "${EROOT}"/etc/vdr
+			VIDEODIR = "${EROOT}"/var/vdr/video
+			EPG_FILENAME = "${EROOT}"/var/vdr/video/epg.data
+			EPGIMAGES = "${EROOT}"/var/vdr/video/epgimages
 			PASSWORD = gentoo-vdr
 			USERNAME = gentoo-vdr
 		EOF
 		# Feed it with newlines
 		yes "" \
-			| "${D}"/usr/bin/vdradmind --cfgdir "${D}"${ETC_DIR} --config \
+			| "${ED}"/usr/bin/vdradmind --cfgdir "${ED}"${ETC_DIR} --config \
 			|sed -e 's/: /: \n/g'
 
 		[[ ${PIPESTATUS[1]} == "0" ]] \
@@ -144,22 +147,22 @@ pkg_postinst() {
 	if use ipv6; then
 		elog
 		elog "To make use of the ipv6 protocol"
-		elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+		elog "you need to enable it in ${EROOT}/etc/conf.d/vdradmin"
 	fi
 
 	if use ssl; then
 		elog
 		elog "To use ssl connection to your vdr"
-		elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+		elog "you need to enable it in ${EROOT}/etc/conf.d/vdradmin"
 
-		if [[ ! -f "${ROOT}"${CERTS_DIR}/server-cert.pem || \
-			! -f "${ROOT}"${CERTS_DIR}/server-key.pem ]]; then
+		if [[ ! -f "${EROOT}"${CERTS_DIR}/server-cert.pem || \
+			! -f "${EROOT}"${CERTS_DIR}/server-key.pem ]]; then
 			create_ssl_cert
 			local base=$(get_base 1)
 			install -D -m 0400 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
-				"${base}".key "${ROOT}"${CERTS_DIR}/server-key.pem || die
+				"${base}".key "${EROOT}"${CERTS_DIR}/server-key.pem || die
 			install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
-				"${base}".crt "${ROOT}"${CERTS_DIR}/server-cert.pem || die
+				"${base}".crt "${EROOT}"${CERTS_DIR}/server-cert.pem || die
 		fi
 	fi
 
@@ -173,5 +176,5 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	"${ROOT}"/usr/bin/vdradmind -c
+	"${EROOT}"/usr/bin/vdradmind -c
 }
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild
index dd8b73c217f3..64aadf4d8c1d 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
index bc4de53ee76e..5809bec4db56 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"