version bump; stable x86 amd64

(Portage version: 2.1.9.25/cvs/Linux i686)

3 files changed, 102 insertions, 5 deletions

diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog
index c8b98969342d..3ed8ee21af21 100644
--- a/media-plugins/vdr-epgsearch/ChangeLog
+++ b/media-plugins/vdr-epgsearch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-epgsearch
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.47 2010/09/18 21:47:20 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.48 2011/01/18 16:29:44 hd_brummy Exp $
+
+*vdr-epgsearch-0.9.25_beta20 (18 Jan 2011)
+
+  18 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-epgsearch-0.9.25_beta17.ebuild, +vdr-epgsearch-0.9.25_beta20.ebuild:
+  version bump; stable x86 amd64
 
 *vdr-epgsearch-0.9.25_beta17 (18 Sep 2010)
 
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta17.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta17.ebuild
index 87ae76d03320..819b189ab5f6 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta17.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta17.ebuild,v 1.1 2010/09/18 21:47:20 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta17.ebuild,v 1.2 2011/01/18 16:29:44 hd_brummy Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ esac
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pcre tre"
 
 DEPEND=">=media-video/vdr-1.3.45
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20.ebuild
new file mode 100644
index 000000000000..1a90347a1674
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20.ebuild,v 1.1 2011/01/18 16:29:44 hd_brummy Exp $
+
+EAPI="2"
+
+inherit vdr-plugin
+
+DESCRIPTION="Video Disk Recorder epgsearch plugin"
+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-}"
+		;;
+	*)
+		SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/${P}.tgz"
+		;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pcre tre"
+
+DEPEND=">=media-video/vdr-1.3.45
+	pcre? ( dev-libs/libpcre )
+	tre? ( dev-libs/tre )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	cd "${S}"
+	fix_vdr_libsi_include conflictcheck.c
+
+	# disable automagic deps
+	sed -i Makefile -e '/^AUTOCONFIG=/s/^/#/'
+
+	if use pcre; then
+		einfo "Using pcre for regexp searches"
+		sed -i Makefile -e 's/^#HAVE_PCREPOSIX/HAVE_PCREPOSIX/'
+	fi
+
+	if use tre; then
+		einfo "Using tre for unlimited fuzzy searches"
+		sed -i Makefile -e 's/^#HAVE_LIBTRE/HAVE_LIBTRE/'
+	fi
+
+	# install conf-file disabled
+	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf
+}
+
+src_install() {
+	vdr-plugin_src_install
+	cd "${S}"
+	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
+
+	dodoc conf/*.templ
+
+	emake install-doc MANDIR="${D}/usr/share/man"
+	dodoc MANUAL
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
+		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
+		cd "${ROOT}"/etc/vdr/plugins
+		local f
+		local moved=""
+		for f in epgsearch*.* .epgsearch*; do
+			[[ -e ${f} ]] || continue
+			mv "${f}" "${ROOT}/etc/vdr/plugins/epgsearch"
+			moved="${moved} ${f}"
+		done
+		elog "These files were moved:${moved}"
+	fi
+}