From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- media-plugins/vdr-epgsearch/Manifest | 6 -- .../files/vdr-epgsearch-1.x.makefile.patch | 25 ------ .../vdr-epgsearch-2.4.0_p20200402_clang.patch | 33 -------- .../vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild | 84 ------------------- .../vdr-epgsearch-2.4.0_p20200402-r1.ebuild | 96 ---------------------- 5 files changed, 244 deletions(-) delete mode 100644 media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.x.makefile.patch delete mode 100644 media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch delete mode 100644 media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild delete mode 100644 media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402-r1.ebuild (limited to 'media-plugins/vdr-epgsearch') diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest index 50f6628c02ba..0cd2e5709090 100644 --- a/media-plugins/vdr-epgsearch/Manifest +++ b/media-plugins/vdr-epgsearch/Manifest @@ -1,11 +1,5 @@ -AUX vdr-epgsearch-1.x.makefile.patch 1136 BLAKE2B 3b82bfc71e75d02739f02071afb9cdc7d6fc0c0f0d7169b8f02a360c2b493d829f141dd586ce7d7f9a854f4b76423191e3f1b7a8df29b0c42beb037ff9cf9729 SHA512 79114081c2cb17402c0e0a431204d7afbc161a90d911d0c389a90f047280ee17b8112b3f2e9d32295c1dd15ef86695935a54354211c9b28669ad925df8173b92 AUX vdr-epgsearch-2.4.0_docsrc2man-no-gzip.patch 419 BLAKE2B 6958af0bf911d01b15c3b7e47593af4c8d692574996a20a7e90736eafe008582e2d66253a57948ba686a2d48858793b23d1d1721686d715831d2ba82f5154a58 SHA512 43fa2e191badcb80542454ecb4ce3c15fd28c77685839b33327d5e22f43bc641cfc3ee2b9fd1c49dcca4e95b6d9df35b42c84b8481a4b8fa53df105cc37e4618 AUX vdr-epgsearch-2.4.0_makefile.patch 1524 BLAKE2B 48ccd25c22e242d9c2f42c40afe621a15032a990c2da5fe7893554502249ee90ca2462338b153a0ef647831b83cd8be35c53655958ee67a23b68e4b0fb7869ae SHA512 2c67a764ffa98135495374905f771cbb3e20d2829a11abc1f8a061c6cc414a7bd9b1e2de05efcf01c47e2b09a2ccf8d42868555af603b3c146b7033c383645b5 -AUX vdr-epgsearch-2.4.0_p20200402_clang.patch 1186 BLAKE2B 85dc9f066a907635c6335e671fff1741c0cec1816f7b35ee5103f4d97b021f499ddd3d27a67f3b97783e464bb64b4c54932bfc48309e38d6715207faf5228995 SHA512 fb87ae50b7997fa3e429448f47f15190e11dd6da215b16582b8a8689c1b039295f61998b4d7116b97a1d5090ea2edb36d8ae6eec3e6328fb384feaccf399100c -DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4 -DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065 DIST vdr-epgsearch-2.4.1.tar.gz 481899 BLAKE2B ab0325fbab73d3c6e6753b926ca0cde6ec971fd42f7b8badf4b306671bf3380c5784262fe1f24e6ce57fef1903ef533b450ea03c346242b5a72f26eeba8a6bd9 SHA512 031ee227a5d45bbf1344cc8195dfd38d23ff23303d55c8492e7b2f86f1f53402a68e6500888bf847cd3506ebc2cfbb73aef2b8b0d6ef98f210631642de1d1f9c -EBUILD vdr-epgsearch-2.2.0.ebuild 2304 BLAKE2B f5c4f3fbe477295ebb203d7edefcda859af50f76ed7ec7e18e814661e9c8cd037bf961f6f10874d1d59952e2ec34dc5f6cffcdd96c0227adef6c7c643a5a4c75 SHA512 e6ffcc191385616ba709499b80a9c54d9041648c3a2ea02c95cec877f84e0d949c47f5d9aa2d19e8b52a12387edf4b0f38f54ae9f10a6be2b1b2b1b1f14bf7ee -EBUILD vdr-epgsearch-2.4.0_p20200402-r1.ebuild 2490 BLAKE2B d80bcfba86e4c19d3d6f1267d4b40b122faeccc59c7a5591488f2ea441f334df61a6496819997cad1fbfc92d6ba5fdce8595a46415942b10e67b3c1d409f594d SHA512 4cfe6ff1ba86a8bacbd3ec249815c4bc105046aa35b8d1befd9d6e8a9764527b7fb6c743c110c51f56132391371e83fb0b8486997d7973b4a43ce0e9bc5c34da EBUILD vdr-epgsearch-2.4.1.ebuild 2457 BLAKE2B fde7cbce73e96a46f7d103b49a139b67d5b128dcfacff9af6ce46269e0e989c1af41d7c9fb480b1d3a2dce54dd2f1a9fb9c077e88ef40898b9512e1f3f20ac3c SHA512 14d83048abe5d38e037bc9ddefd62c5e938fc6d61286857f0d1adfe585a262fa2688d36d0669462075b9735f6135f29b52ed916c0f4ac9fee0137e9bb032d697 MISC metadata.xml 847 BLAKE2B e67649c170474efc2fd1840910423a98ce1791646d2864fcc793ee7936769547863173beaf5cf17494f865feb05f0d7e22924d22aa96dcc68da3a971acc296ca SHA512 78774a9d0364b2eb18eee3afde63b5d9ee21aa246e95b98f7707cc2b58ac613a4e792ff8b736e135f1b5d9252d01bac16f59d673b382c758b5d6663793172e11 diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.x.makefile.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.x.makefile.patch deleted file mode 100644 index 25e27e958a4a..000000000000 --- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.x.makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.orig/Makefile vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42/Makefile ---- vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.orig/Makefile 2015-02-21 21:01:08.926052710 +0100 -+++ vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42/Makefile 2015-02-21 21:03:42.768052710 +0100 -@@ -255,9 +255,9 @@ - docs: - ./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 -+# 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 - - install-$(PLUGIN): libvdr-$(PLUGIN).so - install -D libvdr-$(PLUGIN).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) -@@ -272,7 +272,7 @@ - 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) - cp -n conf/* $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN) - - install-doc: diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch deleted file mode 100644 index 98e642593a4e..000000000000 --- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -when compiling with CC="clang" CXX="clang++" it aborts with - - -createcats.c:71:42: error: ordered comparison between pointer and zero ('char *' and 'int') - if (fgets(buffer, sizeof(buffer), f) > 0) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ - -This patch fixes it. - -Signed-off-by: Martin Dummer ( 2021-02-16 ) - ---- a/epgsearchext.c 2021-02-14 02:29:17.347224714 +0100 -+++ b/epgsearchext.c 2021-02-14 09:12:46.606509411 +0100 -@@ -1424,7 +1424,7 @@ - int line = 0; - char buffer[MAXPARSEBUFFER]; - result = true; -- while (fgets(buffer, sizeof(buffer), f) > 0) { -+ while (fgets(buffer, sizeof(buffer), f) != NULL) { - line++; - char *p = strchr(buffer, '#'); - if (p == buffer) *p = 0; ---- a/createcats.c 2021-02-14 09:18:05.146499999 +0100 -+++ b/createcats.c 2021-02-14 09:18:25.974499384 +0100 -@@ -68,7 +68,7 @@ - - char *cReadLine::Read(FILE *f) - { -- if (fgets(buffer, sizeof(buffer), f) > 0) { -+ if (fgets(buffer, sizeof(buffer), f) != NULL) { - int l = strlen(buffer) - 1; - if (l >= 0 && buffer[l] == '\n') - buffer[l] = 0; diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild deleted file mode 100644 index ebf6ebe1eb32..000000000000 --- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit vdr-plugin-2 - -DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions" -HOMEPAGE="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git" -SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+conflictcheckonly +epgsearchonly pcre +quicksearch tre" - -DEPEND="=media-video/vdr-2.2* - pcre? ( dev-libs/libpcre ) - tre? ( dev-libs/tre )" -RDEPEND="${DEPEND}" -QA_FLAGS_IGNORED="usr/lib/vdr/plugins/libvdr-.* usr/lib64/vdr/plugins/libvdr-.* usr/bin/createcats" - -REQUIRED_USE="?? ( pcre tre )" - -S="${WORKDIR}/vdr-plugin-${VDRPLUGIN}-${PV}" - -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 || die - - eapply "${FILESDIR}/vdr-epgsearch-1.x.makefile.patch" - - use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die - use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die - use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die - - vdr-plugin-2_src_prepare - - fix_vdr_libsi_include conflictcheck.c - - # install conf-file disabled - sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die - - # Get rid of the broken symlinks - rm -f README{,.DE} MANUAL || die -} - -src_compile() { - BUILD_PARAMS="SENDMAIL=/usr/sbin/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* - - gunzip -f man/en/*.gz || die - doman man/en/*.[0-9] - - gunzip -f man/de/*.gz || die - doman -i18n=de man/de/*.[0-9] -} diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402-r1.ebuild deleted file mode 100644 index 042aa1670c62..000000000000 --- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -GIT_COMMIT_ID="d8cff1a251ef2b54f1de3f8e6ea55a838eeb73c3" -SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz -> ${P}.tar.gz" - -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=" - sys-apps/groff - dev-lang/perl" - -PATCHES=( - "${FILESDIR}/${PN}-2.4.0_makefile.patch" - "${FILESDIR}/${PN}-2.4.0_docsrc2man-no-gzip.patch" - "${FILESDIR}/${P}_clang.patch" -) - -QA_FLAGS_IGNORED=" - usr/lib/vdr/plugins/libvdr-.* - usr/lib64/vdr/plugins/libvdr-.* - usr/bin/createcats" -S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}" - -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" - - if ! use conflictcheckonly; then - sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile" - fi - - if ! use epgsearchonly; then - sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile" - fi - - if ! use quicksearch; then - sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile" - fi - - 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/sbin/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() { - 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/* -} -- cgit v1.2.3