From e4762549ddfe5d9a8eb912ecaab3a77cde845fbe Mon Sep 17 00:00:00 2001 From: Martin Dummer Date: Thu, 26 Apr 2018 00:52:24 +0200 Subject: media-plugins/vdr-epgsearch: no "doman" with *.gz files, EAPI=6 Remove usage of "doman" with pre-compressed files Update the ebuild to EAPI=6 metadata.xml: Add proper use flag description Closes: https://bugs.gentoo.org/619954 Package-Manager: Portage-2.3.31, Repoman-2.3.9 --- .../files/fix-manpage-generation.diff | 45 ++++++++++ media-plugins/vdr-epgsearch/metadata.xml | 18 ++-- .../vdr-epgsearch-1.0.1_p20141227-r1.ebuild | 98 +++++++++++++++++++++ .../vdr-epgsearch-1.0.1_p20141227.ebuild | 99 ---------------------- 4 files changed, 156 insertions(+), 104 deletions(-) create mode 100644 media-plugins/vdr-epgsearch/files/fix-manpage-generation.diff create mode 100644 media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild delete mode 100644 media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild 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 @@ + + martin.dummer@gmx.net + Martin Dummer + + + proxy-maint@gentoo.org + Proxy Maintainers + -vdr@gentoo.org -Gentoo VDR Project + vdr@gentoo.org + Gentoo VDR Project - ToDo - ToDo - ToDo + install the "conflictcheckonly" vdr-plugin + install the "epgsearchonly" vdr-plugin + install the "quicksearch" vdr-plugin Add support for unlimited fuzzy searching with help of dev-libs/tre library diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild new file mode 100644 index 000000000000..c3d70846e484 --- /dev/null +++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit vdr-plugin-2 + +DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions" +HOMEPAGE="http://winni.vdr-developer.org/epgsearch" + +case ${P#*_} in + rc*|beta*) + MY_P="${P/_/.}" + SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/beta/${MY_P}.tgz" + S="${WORKDIR}/${MY_P#vdr-}" + ;; + p*) + GIT_COMMIT_ID="a908daa4c5c6edd6c560ed96939358b4352e9b42" + GIT_COMMIT_DATE="20141227" + SRC_URI="http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}" + ;; + *) + SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/${P}.tgz" + ;; +esac + +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}" + +src_prepare() { + # make detection in vdr-plugin-2.eclass for new Makefile handling happy + 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 || die "cannot remove .po files" + + 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 || 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 || die "cannot modify epgsearchmenu.conf" + + # Get rid of the broken symlink + rm README || die "cannot remove broken symlink" +} + +src_compile() { + BUILD_PARAMS="SENDMAIL=/usr/bin/sendmail AUTOCONFIG=0" + + if use pcre; then + BUILD_PARAMS+=" REGEXLIB=pcre" + einfo "Using pcre for regexp searches" + fi + + if use tre; then + BUILD_PARAMS+=" REGEXLIB=tre" + einfo "Using tre for unlimited fuzzy searches" + fi + + vdr-plugin-2_src_compile +} + +src_install() { + DOCS=( conf/*.templ HISTORY* README.Translators ) + vdr-plugin-2_src_install + + 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/* + + doman man/en/* + + if use l10n_de; then + doman -i18n=de man/de/* + fi +} 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.ebuild deleted file mode 100644 index fedaa7a512bb..000000000000 --- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit vdr-plugin-2 - -DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions" -HOMEPAGE="http://winni.vdr-developer.org/epgsearch" - -case ${P#*_} in - rc*|beta*) - MY_P="${P/_/.}" - SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/beta/${MY_P}.tgz" - S="${WORKDIR}/${MY_P#vdr-}" - ;; - p*) - GIT_COMMIT_ID="a908daa4c5c6edd6c560ed96939358b4352e9b42" - GIT_COMMIT_DATE="20141227" - SRC_URI="http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}" - ;; - *) - SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/${P}.tgz" - ;; -esac - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+conflictcheckonly +epgsearchonly l10n_de pcre +quicksearch 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 - - # 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 - - epatch "${FILESDIR}/vdr-epgsearch-1.0.1_beta5_makefile.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 - - vdr-plugin-2_src_prepare - - fix_vdr_libsi_include conflictcheck.c - - # install conf-file disabled - sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf - - # Get rid of the broken symlinks - rm -f README{,.DE} MANUAL -} - -src_compile() { - BUILD_PARAMS="SENDMAIL=/usr/bin/sendmail AUTOCONFIG=0" - - if use pcre; then - BUILD_PARAMS+=" REGEXLIB=pcre" - einfo "Using pcre for regexp searches" - fi - - if use tre; then - BUILD_PARAMS+=" REGEXLIB=tre" - einfo "Using tre for unlimited fuzzy searches" - fi - - vdr-plugin-2_src_compile -} - -src_install() { - vdr-plugin-2_src_install - - diropts "-m755 -o vdr -g vdr" - keepdir /etc/vdr/plugins/epgsearch - insinto /etc/vdr/plugins/epgsearch - - doins conf/epgsearchmenu.conf - doins conf/epgsearchconflmail.templ conf/epgsearchupdmail.templ - - nonfatal dodoc conf/*.templ HISTORY* - - doman man/en/*.gz - - if use l10n_de; then - doman -i18n=de man/de/*.gz - fi -} -- cgit v1.2.3-65-gdbad