snapshot 2014/12/27

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

5 files changed, 142 insertions, 15 deletions

diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog
index c5672e6b2359..dcec9c6e6e96 100644
--- a/media-plugins/vdr-epgsearch/ChangeLog
+++ b/media-plugins/vdr-epgsearch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-epgsearch
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.61 2014/01/23 10:10:10 hd_brummy Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.62 2015/02/21 20:48:07 hd_brummy Exp $
+
+*vdr-epgsearch-1.0.1_p20141227 (21 Feb 2015)
+
+  21 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-epgsearch-1.0.1_p20141227.ebuild,
+  +files/vdr-epgsearch-1.0.1_beta5_makefile.diff, metadata.xml:
+  snapshot 2014/12/27
 
   23 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
   -vdr-epgsearch-0.9.25_beta17.ebuild, -vdr-epgsearch-1.0.0.ebuild,
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 24e905702a71..b987ca82e6d2 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX vdr-epgsearch-1.0.0_vdr-1.7.25.diff 909 SHA256 718e65bed9067b0f4780aa953a2471d563d621464cb582ab84c6b478fa09446d SHA512 4a9bf07360c4703b32c426d04ec6a904cc689df859d67781ba0d957ffc3e32217bf97ea018c0b2b195244b592bccf67d7e12373b262492cdd9ed884939917940 WHIRLPOOL 0619f9b674ba4b8717702321f7ea8b27e88387a4be338b711ca15f9f0ac0814aa8cd5a68763582aa2b3be6f17a902cedfbe1619aa00ded7013e6911e431343c6
 AUX vdr-epgsearch-1.0.0_vdr-1.7.33.diff 4901 SHA256 47beccaf1baa6baf7cddec152645399a7bdd2873ef3a8b4eebf5e75d2df4af55 SHA512 8bcdff9978f7ea0e50e0aac6b065103ebcb3f9676e1f37b0706a6195a2ae81944dbaaa3103600654eb421570ea452c43f6c6379bad806fd94eddead866e87c31 WHIRLPOOL 3498c975274b5116971ce95bb89cffe7985d1c892bdad078c6786993e6f3ca6605e5f0a39c14c397842651d7694913aa63e0e223f1e1e8a167adb33f25cf9001
 AUX vdr-epgsearch-1.0.0_vdr-2.1.2.diff 472 SHA256 e696264ecaab35b3ee9bab9698ca8f644a05f699e666c5f871382aa4d1edd6e9 SHA512 04b4b448e196a7aa77a38a21c233b52f41ca93ef3e3611e92d9cd367d2a6ad9ff27defc650b65c4ee4e7a6b333e6242f8b48786698d57841837900d55ad3ca86 WHIRLPOOL 796a2f19ff20e83b3f0ca983a9fd60f987d935af836f45e7c791e45060a3ad0dc1108f7f7ac10c7e2ba6564dd32ce65f3eeccdf357c8205178f91caae2b6f39e
+AUX vdr-epgsearch-1.0.1_beta5_makefile.diff 1136 SHA256 ebd003bacade121f0ef7ec02d70ea920429fcc303f3ae2a09a12e4b8c34a71b6 SHA512 79114081c2cb17402c0e0a431204d7afbc161a90d911d0c389a90f047280ee17b8112b3f2e9d32295c1dd15ef86695935a54354211c9b28669ad925df8173b92 WHIRLPOOL ae9ec8e2266ae83e45c658f0c161b0cd2ddc83daaf76891285f5ef10a1ae62b42b701e5fcd8e91de9fe395ba288950bd08e25634ed2c1ef1be4effbf4a515f7f
 DIST vdr-epgsearch-1.0.0.tgz 667633 SHA256 989c3ce611ad2b591783dcd7e52a4b462b3352a7657c478e7a3b3c38164b4a12 SHA512 3105dc847a75ad54ca854418a83db847942ba1d85f1c65a94b88310dfcdd5d614b89f0f27fd3ffc8e8c5db6c1c1e0f36e8e7a33cc71299922287f2d19dd385af WHIRLPOOL a661d76f05739d8f411ff8c1dace9b1c059e33d04a87698578a9cecf31bdf4ebc6d41bf9fce21338bafd001f0d1d386a19b08d7a1188081d33ff6f7b9a45a979
+DIST vdr-epgsearch-1.0.1_p20141227.tar.gz 472802 SHA256 f53fd19aab6acca45f345b889eea592affcb18fe6c9e48294fda182c80a53b5f SHA512 952d58f6f03d2804f97be14779faf37c3788b42d78a6460102e2f1c74f6a58d7d68639e7e95e40f27417ce3658c0d5bf856399b6e8e8c214ea143d2865507562 WHIRLPOOL 27d905c7d4430040848c844975000d21fb64d789e230f6f8c57599278f4440b4a3435abe4260d1bc2be3f5fcec70ad9ea9baf734a43a2bd52c7fb69cae44fb98
 EBUILD vdr-epgsearch-1.0.0-r1.ebuild 2705 SHA256 441b9c750de41a711dbded1eff65dbe2d1e44d891c8d04d24380f09f1f3de089 SHA512 d6c186717aee726e76d49f90fc036af0eb3723e14a0ff53ea4042efbff7d60d26639f1e68ae479fc161b885dd45a27a5490ed54e0bb3e6c2a973dac464a5fe0b WHIRLPOOL b5f745cd1527ff223e82ac6b970b3c9024ea413e99a8671667ceea6e4f70f8ada50f4ad24595d842428681999856021220578b248fce466ee0ec955a3eefae89
-MISC ChangeLog 11643 SHA256 b8c7e20f139cbb5967f9f75aa5e0c3cfbb3e0bfb8fbd11e20e52d5ca8b4c316c SHA512 fec8dd9becce36c877e8b9ed5d7bb5cad143e9ffb1c7dfdd9fcfdcb9271a4f02600912d0587dbf5afcafd59f1aa669463c55f019d5e54579bffa74ace7735dea WHIRLPOOL 3acb763943c2a54c7c2867ef687b97396edc2dfcd3df8ece79ac054234f18977f64298d2fa2302584d5eec5455d4b4b89560b7ed4eb09451ee5d1a3b264a496c
-MISC metadata.xml 423 SHA256 4306b9a475db49970298cb67b2870255ab3906c778c9275c3ae2c345dfc433b5 SHA512 6f80b68ca7eb1e31c4b1e6f7ae129d6304148748e98b9c31affaec1af69d132b4d2583edfa1b0e1b1caedfc015c2bb2d844cfa080bef981c1d192961f5c15223 WHIRLPOOL 3eafe225e5ac698cdf7ed893590f38c1a333ad7d1b5501292a3224e6f3e3c0d0c42aa8f9215c80e8a971135fde178f8b24d937f1fe83a0585a2fa08edf4805ce
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
-
-iD8DBQFS4OqOdn07HTTCgIoRCIcFAKC7l9nvJh6wYFZMIj/kOS/VdGNAmgCffo/V
-zgoPtrR8fgRj/BP4DDumrKI=
-=MVnC
------END PGP SIGNATURE-----
+EBUILD vdr-epgsearch-1.0.1_p20141227.ebuild 2641 SHA256 0852ef035d5ba4520fc7fbc4ed757aa041c5025213ea21e3ab5c8ae46437eb5a SHA512 7e12de113eadc9ad62c267f71162f0af318e62ec1f3b1005a83abbbb3cd6f66e29e342aab9abbf28f7e4f1c6ea50e3c3128c6bb3c741769f133f5203398f15fa WHIRLPOOL 59af1f919801100a1864ab558e8df0581b9d2b38782f7d53a119b1473433f809cce2782c73e1021924c4cd756e724d4c79f91673dc12fce1a8b626df1e336711
+MISC ChangeLog 11872 SHA256 18349eaa62e47afc51ae34ba9ef86b1f29d2c2e72010a8391161360c94718c83 SHA512 d130c4c31cff47d7da523ba28b0bbf5a01e2bddfc504f131b709d73d48f5a6266a24390df1bde3978c8733ca1fd2b8134b977eaba5de036ec4125545e63bf9c3 WHIRLPOOL 0890700927d013e2401b765f06b5971b05b6ef156f9f8493fb61ff123b7e979c0dda1bbbc78bd64986efab357db0ae21965b16429e1d312d24d9218297528164
+MISC metadata.xml 545 SHA256 b2362225203faf94fc5f61243ad1af894f58a8490d3f36040fcb2d096e0f7d08 SHA512 c66e998c1ddd954e0ab1083eef7576fee76c92ae9608a4cf346a8dcf5e65fad120eb108c762b2b0a3103dce17b041a6d257ac4de444803ce2cf2929925f0adf6 WHIRLPOOL d6258af5c9e7c3341661897faf63311b74a97aa2362269c8b9a68db3bc94df5c485480ddb43df6a0a1ca04b6ed66f74c882c7174aa12cc7d09902cc00944204a
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.1_beta5_makefile.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.1_beta5_makefile.diff
new file mode 100644
index 000000000000..25e27e958a4a
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.1_beta5_makefile.diff
@@ -0,0 +1,25 @@
+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/metadata.xml b/media-plugins/vdr-epgsearch/metadata.xml
index 04cf09a1d8a2..256c7092e6cf 100644
--- a/media-plugins/vdr-epgsearch/metadata.xml
+++ b/media-plugins/vdr-epgsearch/metadata.xml
@@ -9,6 +9,9 @@
 <longdescription lang="en">
 </longdescription>
 <use>
+	<flag name="conflictcheckonly">ToDo</flag>
+	<flag name="epgsearchonly">ToDo</flag>
+	<flag name="quicksearch">ToDo</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.ebuild
new file mode 100644
index 000000000000..2a7a685ff97a
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild,v 1.1 2015/02/21 20:48:07 hd_brummy Exp $
+
+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 linguas_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 linguas_de; then
+		doman -i18n=de man/de/*.gz
+	fi
+}