summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff45
-rw-r--r--media-plugins/vdr-epgsearch/metadata.xml18
-rw-r--r--media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild (renamed from media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild)41
3 files changed, 78 insertions, 26 deletions
diff --git a/media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff b/media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff
new file mode 100644
index 000000000000..9e1047c8c001
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff
@@ -0,0 +1,45 @@
+--- a/docsrc2man.sh 2018-04-25 23:19:05.623375324 +0200
++++ b/docsrc2man.sh 2018-04-25 23:19:35.519934631 +0200
+@@ -37,23 +37,6 @@
+ done
+
+ rm "$DOCSRC"/$LANGUAGE/*~ 2>/dev/null
+- gzip -f man/$LANGUAGE/*.[0-9]
+-
+-done
+-
+-echo
+-
+-for LANGUAGE in $(ls "$DOCSRC"/); do
+-
+- [ ! -d "$DOCSRC/$LANGUAGE" ] && continue
+- mkdir -p doc/$LANGUAGE
+- rm doc/$LANGUAGE/* 2>/dev/null
+-
+- for i in man/$LANGUAGE/*.gz; do
+- echo -ne "create doc file from man page: ($LANGUAGE) $(basename "$i")..."
+- zcat "$i" | nroff -man - | col -xbp > "doc/$LANGUAGE/$(basename "$i" ".gz").txt"
+- echo " done"
+- done
+
+ done
+
+--- a/Makefile 2018-04-25 23:32:59.042967016 +0200
++++ b/Makefile 2018-04-25 23:33:35.535649724 +0200
+@@ -276,16 +276,6 @@
+ cp -n conf/* $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)
+
+ install-doc:
+- mkdir -p $(DESTDIR)$(MANDIR)/man1
+- mkdir -p $(DESTDIR)$(MANDIR)/man4
+- mkdir -p $(DESTDIR)$(MANDIR)/man5
+- mkdir -p $(DESTDIR)$(MANDIR)/de/man1
+- mkdir -p $(DESTDIR)$(MANDIR)/de/man5
+- cp man/en/*1.gz $(DESTDIR)$(MANDIR)/man1/
+- cp man/en/*4.gz $(DESTDIR)$(MANDIR)/man4/
+- cp man/en/*5.gz $(DESTDIR)$(MANDIR)/man5/
+- cp man/de/*1.gz $(DESTDIR)$(MANDIR)/de/man1/
+- cp man/de/*5.gz $(DESTDIR)$(MANDIR)/de/man5/
+
+ install-bin: createcats
+ mkdir -p $(DESTDIR)$(BINDIR)
diff --git a/media-plugins/vdr-epgsearch/metadata.xml b/media-plugins/vdr-epgsearch/metadata.xml
index 09e439aec936..44d42030c0ca 100644
--- a/media-plugins/vdr-epgsearch/metadata.xml
+++ b/media-plugins/vdr-epgsearch/metadata.xml
@@ -1,14 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<maintainer type="person">
+ <email>martin.dummer@gmx.net</email>
+ <name>Martin Dummer</name>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<maintainer type="project">
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
+ <email>vdr@gentoo.org</email>
+ <name>Gentoo VDR Project</name>
</maintainer>
<use>
- <flag name="conflictcheckonly">ToDo</flag>
- <flag name="epgsearchonly">ToDo</flag>
- <flag name="quicksearch">ToDo</flag>
+ <flag name="conflictcheckonly">install the "conflictcheckonly" vdr-plugin</flag>
+ <flag name="epgsearchonly">install the "epgsearchonly" vdr-plugin</flag>
+ <flag name="quicksearch">install the "quicksearch" vdr-plugin</flag>
<flag name="tre">Add support for unlimited fuzzy searching with help of <pkg>dev-libs/tre</pkg> library</flag>
</use>
</pkgmetadata>
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
index fedaa7a512bb..c3d70846e484 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit vdr-plugin-2
@@ -30,37 +30,38 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+conflictcheckonly +epgsearchonly l10n_de pcre +quicksearch tre"
+REQUIRED_USE="?? ( pcre tre )"
DEPEND="media-video/vdr
pcre? ( dev-libs/libpcre )
tre? ( dev-libs/tre )"
RDEPEND="${DEPEND}"
-REQUIRED_USE="pcre? ( !tre )
- tre? ( !pcre )"
-
src_prepare() {
# make detection in vdr-plugin-2.eclass for new Makefile handling happy
- echo "# SOFILE" >> Makefile
+ echo "# SOFILE" >> Makefile || die "cannot write to Makefile"
# remove untranslated .po files
- rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+ rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die "cannot remove .po files"
- epatch "${FILESDIR}/vdr-epgsearch-1.0.1_beta5_makefile.diff"
+ local PATCHES=(
+ "${FILESDIR}/vdr-epgsearch-1.0.1_beta5_makefile.diff"
+ "${FILESDIR}/fix-manpage-generation.diff"
+ )
- use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile
- use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile
- use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile
+ use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile"
+ use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile"
+ use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile"
vdr-plugin-2_src_prepare
fix_vdr_libsi_include conflictcheck.c
# install conf-file disabled
- sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf
+ sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die "cannot modify epgsearchmenu.conf"
- # Get rid of the broken symlinks
- rm -f README{,.DE} MANUAL
+ # Get rid of the broken symlink
+ rm README || die "cannot remove broken symlink"
}
src_compile() {
@@ -80,20 +81,18 @@ src_compile() {
}
src_install() {
+ DOCS=( conf/*.templ HISTORY* README.Translators )
vdr-plugin-2_src_install
- diropts "-m755 -o vdr -g vdr"
+ diropts -m 755 -o vdr -g vdr
+ insopts -m 644 -o vdr -g vdr
keepdir /etc/vdr/plugins/epgsearch
insinto /etc/vdr/plugins/epgsearch
+ doins conf/*
- doins conf/epgsearchmenu.conf
- doins conf/epgsearchconflmail.templ conf/epgsearchupdmail.templ
-
- nonfatal dodoc conf/*.templ HISTORY*
-
- doman man/en/*.gz
+ doman man/en/*
if use l10n_de; then
- doman -i18n=de man/de/*.gz
+ doman -i18n=de man/de/*
fi
}