commit: afd411669aff0bb7fb9585099d94d7af5f4769ca Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Fri Sep 26 19:45:32 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 00:28:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afd41166
media-plugins/vdr-epgsearch: add 2.4.4 introduce subslot dependency on media-video/vdr Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Part-of: https://github.com/gentoo/gentoo/pull/43943 Closes: https://github.com/gentoo/gentoo/pull/43943 Signed-off-by: Sam James <sam <AT> gentoo.org> media-plugins/vdr-epgsearch/Manifest | 1 + ...epgsearch-2.4.4-Makefile-fix-WITHOUT-vars.patch | 30 ++++++++ .../files/vdr-epgsearch-2.4.4-Makefile.patch | 37 +++++++++ .../vdr-epgsearch-2.4.4_docsrc2man-no-gzip.patch | 22 ++++++ media-plugins/vdr-epgsearch/metadata.xml | 39 +++++----- .../vdr-epgsearch/vdr-epgsearch-2.4.4.ebuild | 88 ++++++++++++++++++++++ 6 files changed, 199 insertions(+), 18 deletions(-) diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest index 0728c012ece3..a49bdbded56c 100644 --- a/media-plugins/vdr-epgsearch/Manifest +++ b/media-plugins/vdr-epgsearch/Manifest @@ -1 +1,2 @@ DIST vdr-epgsearch-2.4.1.tar.gz 481899 BLAKE2B ab0325fbab73d3c6e6753b926ca0cde6ec971fd42f7b8badf4b306671bf3380c5784262fe1f24e6ce57fef1903ef533b450ea03c346242b5a72f26eeba8a6bd9 SHA512 031ee227a5d45bbf1344cc8195dfd38d23ff23303d55c8492e7b2f86f1f53402a68e6500888bf847cd3506ebc2cfbb73aef2b8b0d6ef98f210631642de1d1f9c +DIST vdr-epgsearch-2.4.4.tar.gz 486758 BLAKE2B 908485f3c8dddbd8504961216b2e1bce7e1092a2c2708344686387282d7371cfbce13b70c069500eb73806e2cacff28bb77c49ba547351a9de030cb760d34d88 SHA512 635b126972eee600ba61f9072a5731857fe527da608c131b30b70dbe1b46c7f63e70b1d78c511aa978536badaef9aaa0a696f2d0790cba7c663aa1c5b2a98153 diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.4-Makefile-fix-WITHOUT-vars.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.4-Makefile-fix-WITHOUT-vars.patch new file mode 100644 index 000000000000..5091352bb2f9 --- /dev/null +++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.4-Makefile-fix-WITHOUT-vars.patch @@ -0,0 +1,30 @@ +--- a/Makefile ++++ b/Makefile +@@ -128,14 +128,18 @@ + ### The object files (add further files here): + + ALL = libvdr-$(PLUGIN).so createcats ++INSTALL-LIB = install-$(PLUGIN) + ifeq ($(WITHOUT_EPGSEARCHONLY), 0) + ALL += libvdr-$(PLUGIN2).so ++ INSTALL-LIB += install-$(PLUGIN2) + endif + ifeq ($(WITHOUT_CONFLICTCHECKONLY), 0) + ALL += libvdr-$(PLUGIN3).so ++ INSTALL-LIB += install-$(PLUGIN3) + endif + ifeq ($(WITHOUT_QUICKSEARCH), 0) + ALL += libvdr-$(PLUGIN4).so ++ INSTALL-LIB += install-$(PLUGIN4) + endif + + OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o epgsearchsvdrp.o epgsearchtools.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchactions.o menu_searchedit.o menu_searchresults.o menu_searchtemplate.o menu_switchtimers.o menu_templateedit.o menu_timersdone.o menu_whatson.o noannounce.o pending_notifications.o rcfile.o recdone.o recdone_thread.o recstatus.o searchtimer_thread.o services.o switchtimer.o switchtimer_thread.o templatefile.o timer_thread.o timerdone.o timerstatus.o uservars.o varparser.o +@@ -335,7 +339,7 @@ + + install: install-lib install-i18n install-conf install-doc install-bin + +-install-lib: install-$(PLUGIN) install-$(PLUGIN2) install-$(PLUGIN3) install-$(PLUGIN4) ++install-lib: $(INSTALL-LIB) + + dist: docs clean + @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.4-Makefile.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.4-Makefile.patch new file mode 100644 index 000000000000..43bd26cf76ec --- /dev/null +++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.4-Makefile.patch @@ -0,0 +1,37 @@ +--- a/Makefile ++++ b/Makefile +@@ -285,9 +285,6 @@ + $(DEPFILE_stmp): + ./docsrc2man.sh + ./docsrc2html.sh +- ln -sf ./doc/en/epgsearch.4.txt MANUAL +- ln -sf ./doc/en/epgsearch.1.txt README +- ln -sf ./doc/de/epgsearch.1.txt README.DE + @rm -f $(DEPFILE_stmp) + @date > $(DEPFILE_stmp) + +@@ -310,7 +307,7 @@ + $(Q)install -D libvdr-$(PLUGIN4).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN4).so.$(APIVERSION) + + install-conf: +- mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)/conf.d ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN) + @for i in conf/*; do\ + if ! [ -e $(DESTDIR)$(CONFDIR)/plugins/$$i ] ; then\ + cp -p $$i $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN);\ +@@ -333,7 +330,7 @@ + mkdir -p $(DESTDIR)$(BINDIR) + cp createcats $(DESTDIR)$(BINDIR) + +-install: install-lib install-i18n install-conf install-doc install-bin ++install: install-lib install-i18n install-conf install-bin + + install-lib: install-$(PLUGIN) install-$(PLUGIN2) install-$(PLUGIN3) install-$(PLUGIN4) + +@@ -366,3 +363,6 @@ + @-rm -rf doc html man + @-rm -f MANUAL README README.DE + @-rm -f $(DEPFILE_stmp) $(DEPFILE_DOC) ++ ++# make detection in vdr-plugin-2.eclass for new Makefile handling happy ++# SOFILE diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.4_docsrc2man-no-gzip.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.4_docsrc2man-no-gzip.patch new file mode 100644 index 000000000000..465aa285c93e --- /dev/null +++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.4_docsrc2man-no-gzip.patch @@ -0,0 +1,22 @@ +--- a/docsrc2man.sh ++++ b/docsrc2man.sh +@@ -55,7 +55,6 @@ + function man_gz () { + if [ $PRINT_DEPS -eq 0 ]; then + rm "$DOCSRC"/$1/*~ 2>/dev/null +- gzip -f man/$1/*.[0-9] + fi + } + +@@ -78,9 +77,9 @@ + mkdir -p doc/$LANGUAGE + rm doc/$LANGUAGE/* 2>/dev/null + +- for i in man/$LANGUAGE/*.gz; do ++ for i in man/$LANGUAGE/*; do + echo -ne "create doc file from man page: ($LANGUAGE) $(basename "$i")..." +- zcat "$i" | preconv | nroff -man - | col -xbp > "doc/$LANGUAGE/$(basename "$i" ".gz").txt" ++ cat "$i" | preconv | nroff -man - | col -xbp > "doc/$LANGUAGE/$(basename "$i").txt" + echo " done" + done + diff --git a/media-plugins/vdr-epgsearch/metadata.xml b/media-plugins/vdr-epgsearch/metadata.xml index 4d854e865aac..786e660f8f15 100644 --- a/media-plugins/vdr-epgsearch/metadata.xml +++ b/media-plugins/vdr-epgsearch/metadata.xml @@ -1,22 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="person" proxied="yes"> - <email>[email protected]</email> - <name>Martin Dummer</name> -</maintainer> -<maintainer type="project" proxied="proxy"> - <email>[email protected]</email> - <name>Proxy Maintainers</name> -</maintainer> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo VDR Project</name> -</maintainer> -<use> - <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> + <maintainer type="person" proxied="yes"> + <email>[email protected]</email> + <name>Martin Dummer</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>[email protected]</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo VDR Project</name> + </maintainer> + <use> + <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> + <upstream> + <remote-id type="github">vdr-projects/vdr-plugin-epgsearch</remote-id> + </upstream> </pkgmetadata> diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.4.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.4.ebuild new file mode 100644 index 000000000000..6d4f5de39bc9 --- /dev/null +++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.4.ebuild @@ -0,0 +1,88 @@ +# Copyright 2024-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit vdr-plugin-2 + +DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions" +HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html https://github.com/vdr-projects/vdr-plugin-epgsearch"; +SRC_URI="https://github.com/vdr-projects/vdr-plugin-epgsearch/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/vdr-plugin-epgsearch-${PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre" +REQUIRED_USE="?? ( pcre tre )" + +DEPEND=" + >=media-video/vdr-2.4:= + pcre? ( dev-libs/libpcre ) + tre? ( dev-libs/tre )" +RDEPEND="${DEPEND}" +BDEPEND=" + acct-user/vdr + sys-apps/groff + dev-lang/perl" + +PATCHES=( + "${FILESDIR}/${P}-Makefile-fix-WITHOUT-vars.patch" + "${FILESDIR}/${P}-Makefile.patch" + "${FILESDIR}/${P}_docsrc2man-no-gzip.patch" +) + +QA_FLAGS_IGNORED=" + usr/lib/vdr/plugins/libvdr-.* + usr/lib64/vdr/plugins/libvdr-.* + usr/bin/createcats" + +src_prepare() { + # 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 untranslated .po files" + + 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" +} + +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 + if ! use conflictcheckonly; then + BUILD_PARAMS+=" WITHOUT_CONFLICTCHECKONLY=1" + fi + if ! use epgsearchonly; then + BUILD_PARAMS+=" WITHOUT_EPGSEARCHONLY=1" + fi + if ! use quicksearch; then + BUILD_PARAMS+=" WITHOUT_QUICKSEARCH=1" + fi + + vdr-plugin-2_src_compile +} + +src_install() { + local 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/* + doman -i18n=de man/de/* +}
