summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gentoo.org>2020-07-12 10:31:36 +0300
committerAndrew Savchenko <bircoph@gentoo.org>2020-07-12 11:20:43 +0300
commit3a6ae3463132ba3791bae78df6ecf0aa2a05ba88 (patch)
tree1d7730f9786bcc25616172bc8ecfc29f3ead7a07 /net-proxy
parentacct-user/privoxy: new user for net-proxy/privoxy (diff)
downloadgentoo-3a6ae3463132ba3791bae78df6ecf0aa2a05ba88.tar.gz
gentoo-3a6ae3463132ba3791bae78df6ecf0aa2a05ba88.tar.bz2
gentoo-3a6ae3463132ba3791bae78df6ecf0aa2a05ba88.zip
net-proxy/privoxy: simplify /var/run removal
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch11
-rw-r--r--net-proxy/privoxy/privoxy-3.0.28.ebuild3
2 files changed, 2 insertions, 12 deletions
diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch b/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch
deleted file mode 100644
index f9f2afb4ff3b..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- privoxy-3.0.28-stable/GNUmakefile.in.orig 2020-07-11 12:03:38.784441229 +0300
-+++ privoxy-3.0.28-stable/GNUmakefile.in 2020-07-11 12:04:16.148597612 +0300
-@@ -846,7 +846,7 @@
- $(CHMOD) $(DIR_MODE) $(MKDIR)
- @$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) \
- $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
-- $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
-+ $(DESTDIR)$(LOG_DEST)
- @# Install the executable binary, strip if invoked as install-strip
- @test -n "$(STRIP)" &&\
- $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
diff --git a/net-proxy/privoxy/privoxy-3.0.28.ebuild b/net-proxy/privoxy/privoxy-3.0.28.ebuild
index 30ee789ff1ea..efb5ce555c45 100644
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28.ebuild
@@ -43,7 +43,6 @@ S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
PATCHES=(
"${FILESDIR}"/${PN}-3.0.19-gentoo.patch
- "${FILESDIR}"/${P}-no-var-run.patch
)
pkg_pretend() {
@@ -117,6 +116,8 @@ src_install() {
dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
newbin tools/uagen.pl privoxy-uagen.pl
fi
+
+ rmdir "${ED}/var/run" || die
}
pkg_postinst() {