net-analyzer/rrdtool: Fix rrdcached.socket

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/677368
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch b/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch
new file mode 100644 (file)
index 0000000..5dd2145
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch
@@ -0,0 +1,25 @@
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
+ 
+ if HAVE_SYSTEMD
+ systemdsystemunit_DATA = \
+-      etc/rrdcached.socket \
+-      etc/rrdcached.service
++      rrdcached.socket \
++      rrdcached.service
+ endif
+\ No newline at end of file
+--- a/etc/Makefile.in
++++ b/etc/Makefile.in
+@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
+       rrdcached.socket.in rrdcached.service.in
+ 
+ @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
+-@HAVE_SYSTEMD_TRUE@   etc/rrdcached.socket \
+-@HAVE_SYSTEMD_TRUE@   etc/rrdcached.service
++@HAVE_SYSTEMD_TRUE@   rrdcached.socket \
++@HAVE_SYSTEMD_TRUE@   rrdcached.service
+ 
+ all: all-am
+ 

diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
index 41552b5c687b87dce3342a9d0406756c1fdfbe2c..fea91bb10cfa8144fd7dc9ec99965639f436d975 100644 (file)
--- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
        "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
        "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
+       "${FILESDIR}"/${PN}-1.7.1-rrdcached.socket.patch
 
 )
 S=${WORKDIR}/${MY_P}