snapshot 2014/12/27

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)

4 files changed, 137 insertions, 2 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/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
+}