[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/files/, net-misc/apt-cacher-ng/

[Jeroen Roovers]

commit:     61a8ef12e3fcbd7b4393d2983b04892cd45c36b0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 13:18:21 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue May 26 13:19:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61a8ef12

net-misc/apt-cacher-ng: Fix expire-caller.pl, disable by default

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 ...cacher-ng-3.5_p1.ebuild => apt-cacher-ng-3.5_p1-r1.ebuild} |  5 +++--
 net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild           |  5 +++--
 .../apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch   | 11 +++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild 
b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
similarity index 96%
rename from net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild
rename to net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
index 4061fff1f9c..97eab60040b 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
 "
 PATCHES=(
        "${FILESDIR}"/${PN}-3.3.1-flags.patch
+       "${FILESDIR}"/${PN}-3.5-perl-syntax.patch
        "${WORKDIR}"/debian/patches/debian-changes
 )
 S=${WORKDIR}/${P/_*}
@@ -121,8 +122,8 @@ src_install() {
 
        # perl daily cron script
        dosbin scripts/expire-caller.pl
-       exeinto /etc/cron.daily
-       newexe "${FILESDIR}"/cron.daily ${PN}
+       insinto /etc/cron.daily
+       doins "${FILESDIR}"/cron.daily ${PN}
 
        # default configuration
        insinto /etc/${PN}

diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild 
b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
index 402b95991ac..9740af934f3 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
        tcpd? ( sys-apps/tcp-wrappers )
 "
 PATCHES=(
+       "${FILESDIR}"/${PN}-3.5-perl-syntax.patch
        "${FILESDIR}"/${PN}-9999999-flags.patch
 )
 S=${WORKDIR}/${P/_*}
@@ -113,8 +114,8 @@ src_install() {
 
        # perl daily cron script
        dosbin scripts/expire-caller.pl
-       exeinto /etc/cron.daily
-       newexe "${FILESDIR}"/cron.daily ${PN}
+       insinto /etc/cron.daily
+       doins "${FILESDIR}"/cron.daily ${PN}
 
        # default configuration
        insinto /etc/${PN}

diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch 
b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch
new file mode 100644
index 00000000000..32421a07eef
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch
@@ -0,0 +1,11 @@
+--- a/scripts/expire-caller.pl
++++ b/scripts/expire-caller.pl
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl
+ #
+ 
+-print STDERR "WARNING: this script is considered deprecated. It may still 
work but could print incorrect results!\n"
++print STDERR "WARNING: this script is considered deprecated. It may still 
work but could print incorrect results!\n";
+ 
+ use strict;
+ use Socket;