commit: 2f472c1f91d21444530ed18c29a26db3fccc40a8
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sun Nov 17 01:33:46 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 01:33:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f472c1f
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 <AT> gmx.net>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-video/vdr/files/vdr-2.2.0_gentoo.patch | 35 +++++++-----
media-video/vdr/metadata.xml | 12 ++++-
media-video/vdr/vdr-2.2.0-r3.ebuild | 4 +-
.../{vdr-2.2.0-r3.ebuild => vdr-2.2.0-r4.ebuild} | 62 +++++++++++-----------
4 files changed, 63 insertions(+), 50 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 37ffd3c7b2c..70066f5b0c8 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
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 8ebb4b08a51..246bd87c200 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
+ <maintainer type="person">
+ <email>[email protected]</email>
+ <name>Martin Dummer</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>[email protected]</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<maintainer type="project">
<email>[email protected]</email>
<name>Gentoo VDR Project</name>
@@ -19,8 +27,8 @@
<flag name="menuorg">Enables support for the
<pkg>media-plugins/vdr-menuorg</pkg></flag>
<flag name="menuselection">adds support for menu hotkeys of
double digits</flag>
<flag name="naludump">Removes NALU fill data from h.264-Streams
of TS files</flag>
- <flag name="permashift">permanent timeshift by recording live
TV on hard disk, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag>
- <flag name="permashift_v1">permanent timeshift by recording
live TV on RAM, need plugin >=mediaplugins/vdr-permashift-1</flag>
+ <flag name="permashift">permanent timeshift by recording live
TV into RAM, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag>
+ <flag name="permashift_v1">permanent timeshift by recording
live TV into RAM, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag>
<flag name="pinplugin">Support for
<pkg>media-plugins/vdr-pin</pkg></flag>
<flag name="resumereset">rreset resume of EOF</flag>
<flag name="rotor">Enable support for plugin vdr-rotor for
dish-positioner.</flag>
diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild
b/media-video/vdr/vdr-2.2.0-r3.ebuild
index 8dad304a1d8..dfbfd553e10 100644
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild
@@ -260,7 +260,7 @@ src_install() {
# directory
emake install \
VIDEODIR="/" \
- DESTDIR="${D%/}" install || die "emake install failed"
+ DESTDIR="${D}" install
keepdir "${PLUGIN_LIBDIR}"
@@ -283,7 +283,7 @@ src_install() {
doins "${FILESDIR}"/channel_alternative.conf
fi
- chown -R vdr:vdr "${D%/}/${CONF_DIR}"
+ chown -R vdr:vdr "${D}/${CONF_DIR}"
}
pkg_postinst() {
diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild
b/media-video/vdr/vdr-2.2.0-r4.ebuild
similarity index 82%
copy from media-video/vdr/vdr-2.2.0-r3.ebuild
copy to media-video/vdr/vdr-2.2.0-r4.ebuild
index 8dad304a1d8..27229bab9fa 100644
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
mainmenuhooks menuorg menuselection resumereset
ttxtsubs"
# names of the use-flags
@@ -15,8 +15,6 @@ EXT_PATCH_FLAGS_RENAMED=""
# names ext-patch uses internally, here only used for maintainer checks
EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
-IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS}
${EXT_PATCH_FLAGS_RENAMED}"
-
MY_PV="${PV%_p*}"
MY_P="${PN}-${MY_PV}"
S="${WORKDIR}/${MY_P}"
@@ -26,34 +24,33 @@ EXT_P="extpng-${P}-gentoo-edition-v1"
DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for
DVB"
HOMEPAGE="http://www.tvdr.de/";
SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
- https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2";
+ mirror://gentoo/${EXT_P}.patch.bz2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS}
${EXT_PATCH_FLAGS_RENAMED}"
-COMMON_DEPEND="virtual/jpeg:*
+COMMON_DEPEND="
+ virtual/jpeg:*
sys-libs/libcap
>=media-libs/fontconfig-2.4.2
>=media-libs/freetype-2"
-
DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
+ >=virtual/linuxtv-dvb-headers-5.3"
RDEPEND="${COMMON_DEPEND}
dev-lang/perl
>=media-tv/gentoo-vdr-scripts-2.7
media-fonts/corefonts
bidi? ( dev-libs/fribidi )
systemd? ( sys-apps/systemd )"
+BDEPEND="sys-devel/gettext"
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
CAPS="# Capabilities of the vdr-executable for use by startscript etc."
pkg_setup() {
-
use debug && append-flags -g
PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
@@ -71,12 +68,12 @@ add_cap() {
enable_patch() {
local arg ARG_UPPER
for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
+ ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]')
+ echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to
Make.config"
# codesnippet to bring the extpng defines into the vdr.pc
CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
+ echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot
write to defines.tmp"
+ cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
|| die "cannot write to defines.tmp"
export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
done
}
@@ -86,7 +83,7 @@ extensions_add_make_conf()
# copy all ifdef for extensions-patch to Make.config
sed -e '1,/need to touch the following:/d' \
-e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
+ Make.config.template >> Make.config || die "cannot write to
Make.config"
}
extensions_all_defines() {
@@ -94,7 +91,7 @@ extensions_all_defines() {
sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
Make.config.template \
| sort \
- | tr '[:upper:]' '[:lower:]'
+ | tr '[:upper:]' '[:lower:]' || die "error in function
extensions_all_defines"
}
lang_po() {
@@ -111,16 +108,16 @@ src_configure() {
}
src_prepare() {
- # apply maintainace-patches
+ # apply maintenance-patches
ebegin "Changing paths for gentoo"
- local DVBDIR=/usr/include
+ local DVBDIR="/usr/include"
local i
for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
[[ -d ${i} ]] || continue
if [[ -f ${i}/linux/dvb/dmx.h ]]; then
einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
+ DVBDIR="${i}"
break
fi
done
@@ -136,7 +133,7 @@ src_prepare() {
die "DVB headers too old"
fi
- cat > Make.config <<-EOT
+ cat > Make.config <<-EOT || die "cannot write to Make.config"
#
# Generated by ebuild ${PF}
#
@@ -168,6 +165,7 @@ src_prepare() {
# Now apply extensions patch
eapply "${WORKDIR}/${EXT_P}.patch"
+ sed -e 's/PERMASHIFT_V1/PERMASHIFT/g' -i "${S}"/*.[ch]
"${S}"/Make.config* || die "sed failed"
# This allows us to start even if some plugin does not exist
# or is not loadable.
@@ -180,10 +178,10 @@ src_prepare() {
# (or have them already hard enabled)
local IGNORE_PATCHES="pluginmissing"
- extensions_all_defines > "${T}"/new.IUSE
+ extensions_all_defines > "${T}"/new.IUSE || die "cannot
write to new.IUSE"
echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME
\
$IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
+ tr ' ' '\n' |sort > "${T}"/old.IUSE || die
"cannot write to old.IUSE"
local DIFFS=$(diff -u "${T}"/old.IUSE
"${T}"/new.IUSE|grep '^[+-][^+-]')
if [[ -z ${DIFFS} ]]; then
einfo "EXT_PATCH_FLAGS are up to date."
@@ -208,7 +206,7 @@ src_prepare() {
# add defined use-flags compile options to vdr.pc
sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES)
\$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
+ -i Makefile || die "sed fails on Makefile"
ebegin "Make depend"
emake .dependencies >/dev/null
@@ -226,7 +224,7 @@ src_prepare() {
sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
-e "s:ifdef BIDI:ifeq (\$(BIDI),1):" \
-e "s:ifdef SDNOTIFY:ifeq (\$(SDNOTIFY),1):" \
- -i "${S}"/Makefile
+ -i "${S}"/Makefile || die "sed fails on Makefile"
eapply_user
@@ -260,7 +258,7 @@ src_install() {
# directory
emake install \
VIDEODIR="/" \
- DESTDIR="${D%/}" install || die "emake install failed"
+ DESTDIR="${ED}" install
keepdir "${PLUGIN_LIBDIR}"
@@ -283,7 +281,7 @@ src_install() {
doins "${FILESDIR}"/channel_alternative.conf
fi
- chown -R vdr:vdr "${D%/}/${CONF_DIR}"
+ chown -R vdr:vdr "${ED}/${CONF_DIR}" || die "chown failed"
}
pkg_postinst() {
