gentoo resync : 06.05.2018

4 files changed, 81 insertions, 28 deletions

diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index ee298515f61d..4fa82f433f38 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,3 +1,4 @@
+AUX fix-manpage-generation.diff 1264 BLAKE2B 8b31a038bc0b7c3c77d4852a170981f5eba4bf690cd922d7a883d16a0ebd7a2be9df6e3b0716a78ecf6b7008d56bc3554564757ee84ec5bc56754773a6475f8d SHA512 c2d402b3830f16307ed44cd85e0d7c05b204b9b7556a754a84a13af1c7d794d976d7dc36a45d187d84be764c14f9193ca4d90b2771bcfdf715368ba32f176010
 AUX vdr-epgsearch-1.0.0_vdr-1.7.25.diff 909 BLAKE2B f8506ebd9e3a02c36fd14071b3d0326dd1a4d95c01968c358550875b2751118dad1714cbf9388ffc9a09a7dab7b43cc445fe95604478c059d9464cef4864470f SHA512 4a9bf07360c4703b32c426d04ec6a904cc689df859d67781ba0d957ffc3e32217bf97ea018c0b2b195244b592bccf67d7e12373b262492cdd9ed884939917940
 AUX vdr-epgsearch-1.0.0_vdr-1.7.33.diff 4901 BLAKE2B 97ff253d4902ccc3420377b5cc443c1bcdf31cb62cf40ddf42be8719afd09a147aa8287207e025a36663ae76ddf5f205027b227c4ffb6431d34967146f95c80e SHA512 8bcdff9978f7ea0e50e0aac6b065103ebcb3f9676e1f37b0706a6195a2ae81944dbaaa3103600654eb421570ea452c43f6c6379bad806fd94eddead866e87c31
 AUX vdr-epgsearch-1.0.0_vdr-2.1.2.diff 472 BLAKE2B fd9546d765d1df3405fafb14c6c901561fa7eabb3b09a614a9374bbbd2fbe8c3d4ef45ec45227752729543c552c8126e3fb80fbd0c9a1b0f0e9b087f48cb49a7 SHA512 04b4b448e196a7aa77a38a21c233b52f41ca93ef3e3611e92d9cd367d2a6ad9ff27defc650b65c4ee4e7a6b333e6242f8b48786698d57841837900d55ad3ca86
@@ -5,5 +6,5 @@ AUX vdr-epgsearch-1.0.1_beta5_makefile.diff 1136 BLAKE2B 3b82bfc71e75d02739f0207
 DIST vdr-epgsearch-1.0.0.tgz 667633 BLAKE2B 6a5c03b595f1f25c1f77b8e1e86f9a35a59ce20c258a196c5d828d48e139d25bf1d6c8da32d2e55fcc1576165c9f0c849e1ae8199657f062baf9ed738d97344a SHA512 3105dc847a75ad54ca854418a83db847942ba1d85f1c65a94b88310dfcdd5d614b89f0f27fd3ffc8e8c5db6c1c1e0f36e8e7a33cc71299922287f2d19dd385af
 DIST vdr-epgsearch-1.0.1_p20141227.tar.gz 472802 BLAKE2B 9ffc067c2aff29e3d79b620edf88ff7aca64ad5d1de3aa32b19fbc1889673e2439a6d65b46e2f3ff5fd3d416ff24cbafd6d41f562b3775210f0234c6990f03ab SHA512 952d58f6f03d2804f97be14779faf37c3788b42d78a6460102e2f1c74f6a58d7d68639e7e95e40f27417ce3658c0d5bf856399b6e8e8c214ea143d2865507562
 EBUILD vdr-epgsearch-1.0.0-r1.ebuild 2564 BLAKE2B efd5b036305aa8fca4486a15204cddf9a520443510968ed1751b890ef0c90c44e18dd018f500f3e19788ebf5df5274c5f919cb8276bb5f0deefc3c5f9479ea5d SHA512 19d9a030befb7d03c8eb2e817d70ab786eff287f9f9effb4f5fa8447ca62d9025c77b35c6b73eeaaf9c07936423c60c2297b2613411bb0dfbe73cbbd24487e88
-EBUILD vdr-epgsearch-1.0.1_p20141227.ebuild 2493 BLAKE2B efd5294348ca4f3147132fddce5bd7ba3977eed00859f17e4f2f2a43bbb0fb102c9bacb9e64708fad5fee59f765a1be819b1189ac47e4d2b1c097e2af45598f1 SHA512 36d6abf069c9bd7b718f77b221b43702ef047fcfba5f302d253d14e9e500e0aca7271ed068410056bdc3f1a6db784148120079a857f19760b1b17aacd0ea97a4
-MISC metadata.xml 490 BLAKE2B b4afc3665ad7e74d224ecadae3e002495c81ae2e64b10797cf363677e21c94def2049ef0ec5975367d8c0c091c80b1899b1794b067d0e70c4db6c085bd02cc42 SHA512 c112df3e2b8603a7e3f79ada4c26c6c18bdae8e6f22e66ae2a8eef924c29f11241a17053ce16eb59482fdc2753aeb6aff36c7dc235ef09042cfdc1c75564c29f
+EBUILD vdr-epgsearch-1.0.1_p20141227-r1.ebuild 2714 BLAKE2B 0d8e2f4dee82be3f80bb2d164228949f239311fe8bacfc4c9f7011ca2b5a25e2f305ccf95ed4c0ecb1742a03e111ead6983690bafa83e833ff3c55b6b59a5222 SHA512 7ba9d75c282bfb80afb8f4e2d6c10e7ad53460e9ec94a749668b8fb0cdb74d70f78cddad260bbd4c6915df25b8513fca4331d0f3cad2665fc820cb55fe94aa0f
+MISC metadata.xml 816 BLAKE2B 2a7a4b5223b30aaffd7e0300ceba04f69d411e1b4615e0fb8d1ff6afa65850f4558c065a1e3ca6a12c2526d2bf736cbc7b6aba8a9fc66b3dcef09dfa4b7ec3bc SHA512 ea3e5fac06c7e1a53b127d2ce10bbccbf97a80cadcd172100f39512772b0120f59ef9f538b779ebc6a8df6431000f1e4112a18a0300841a8e2c5065f4016b3cd
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
 }