summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Dummer <martin.dummer@gmx.net>2019-11-16 17:33:46 -0800
committerDavid Seifert <soap@gentoo.org>2019-11-16 17:33:46 -0800
commit2f472c1f91d21444530ed18c29a26db3fccc40a8 (patch)
treed49dbab87d83ff0dda7d34d490ec6c4e65a41a47 /media-video/vdr/files
parentapp-misc/toilet: last-rites (diff)
downloadgentoo-2f472c1f91d21444530ed18c29a26db3fccc40a8.tar.gz
gentoo-2f472c1f91d21444530ed18c29a26db3fccc40a8.tar.bz2
gentoo-2f472c1f91d21444530ed18c29a26db3fccc40a8.zip
media-video/vdr: fix multiple QA issues
* QA issue: USE flag 'permashift_v1' uses reserved underscore character, rename USE flag 'permashift_v1' to 'permashift' * QA issue: UnnecessarySlashStrip in DESTDIR="${D%/}" * QA issue: makefile installs pre-compressed manpages Bug: https://bugs.gentoo.org/695066 Closes: https://github.com/gentoo/gentoo/pull/13588 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Martin Dummer <martin.dummer@gmx.net> Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-video/vdr/files')
-rw-r--r--media-video/vdr/files/vdr-2.2.0_gentoo.patch35
1 files changed, 21 insertions, 14 deletions
diff --git a/media-video/vdr/files/vdr-2.2.0_gentoo.patch b/media-video/vdr/files/vdr-2.2.0_gentoo.patch
index 37ffd3c7b2ca..70066f5b0c86 100644
--- a/media-video/vdr/files/vdr-2.2.0_gentoo.patch
+++ b/media-video/vdr/files/vdr-2.2.0_gentoo.patch
@@ -1,7 +1,6 @@
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
---- vdr-2.1.7.orig/Makefile 2015-01-18 12:37:45.506034673 +0100
-+++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
-@@ -116,7 +116,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -124,7 +124,7 @@
VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
@@ -10,7 +9,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
# Implicit rules:
-@@ -170,7 +170,7 @@
+@@ -179,7 +179,7 @@
PODIR = po
LOCALEDIR = locale
@@ -19,7 +18,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
I18Npot = $(PODIR)/vdr.pot
-@@ -193,7 +193,7 @@
+@@ -202,7 +202,7 @@
install-i18n: i18n
@mkdir -p $(DESTDIR)$(LOCDIR)
@@ -28,7 +27,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
# The 'include' directory (for plugins):
-@@ -255,7 +255,7 @@
+@@ -264,7 +264,7 @@
# Install the files (note that 'install-pc' must be first!):
@@ -37,16 +36,13 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
# VDR binary:
-@@ -267,12 +267,13 @@
+@@ -276,12 +276,10 @@
install-dirs:
@mkdir -p $(DESTDIR)$(VIDEODIR)
- @mkdir -p $(DESTDIR)$(CONFDIR)
- @mkdir -p $(DESTDIR)$(ARGSDIR)
- @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(ARGSDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
@mkdir -p $(DESTDIR)$(RESDIR)
install-conf:
@@ -54,14 +50,25 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
@cp -pn *.conf $(DESTDIR)$(CONFDIR)
# Documentation:
-@@ -299,8 +300,11 @@
+@@ -289,9 +287,9 @@
+ install-doc:
+ @mkdir -p $(DESTDIR)$(MANDIR)/man1
+ @mkdir -p $(DESTDIR)$(MANDIR)/man5
+- @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
+- @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
+- @gzip -c svdrpsend.1 > $(DESTDIR)$(MANDIR)/man1/svdrpsend.1.gz
++ @cp vdr.1 $(DESTDIR)$(MANDIR)/man1/
++ @cp vdr.5 $(DESTDIR)$(MANDIR)/man5/
++ @cp svdrpsend.1 $(DESTDIR)$(MANDIR)/man1/
+
+ # Plugins:
+
+@@ -308,8 +306,9 @@
# Includes:
install-includes: include-dir
- @mkdir -p $(DESTDIR)$(INCDIR)
- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
+ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
+ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
+ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr