new beta

Package-Manager: portage-2.1.7.16/cvs/Linux i686

4 files changed, 122 insertions, 7 deletions

diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog
index 15ed42bb23bb..abebb21dd4cf 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.44 2009/07/17 06:51:05 zzam Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.45 2010/02/07 13:48:22 hd_brummy Exp $
+
+*vdr-epgsearch-0.9.25_beta16 (07 Feb 2010)
+
+  07 Feb 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-epgsearch-0.9.25_beta16.ebuild,
+  +files/vdr-epgsearch-0.9.25_beta16_missing-include.diff:
+  new beta
 
 *vdr-epgsearch-0.9.25_beta14 (17 Jul 2009)
 
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 1786f8829062..55951df2c7cf 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -2,12 +2,14 @@
 Hash: SHA1
 
 AUX vdr-epgsearch-0.9.24-langinfo.diff 401 RMD160 94f91c56102e207ebb3a4760f744d4c1b7fb4d1c SHA1 6c2dcf1a94a71aba3d4cc8c790508773513af3ce SHA256 60d47ae9006c3733b51ad2ae6705cd42e132b46c1ae4019e72ae404d5cf7e8df
+AUX vdr-epgsearch-0.9.25_beta16_missing-include.diff 402 RMD160 3f78fbb36962bbbf7804a4c9ad749396a3b543ab SHA1 c748e57e276824ad5c4f8d1509e46a8c8bd93843 SHA256 8063e7769f21b38dda7ce9504424dde487aa3f7ebfefb73f27ec7809128501ef
 DIST vdr-epgsearch-0.9.23.tgz 667755 RMD160 83b2cec99ed18fd0b21e85bd9cf16b38d759c1da SHA1 eb1d6304b7b6b8e831f3572c7ce038d0e3961396 SHA256 794af7bb0fef51f46ff5a7b6fdf38f0b7d1a84ec8ab469bf1dc3f5273fb441b4
 DIST vdr-epgsearch-0.9.24.tgz 599266 RMD160 391578356319974411a15c6df4e122d05f2d12f4 SHA1 b38c534bb8b1cc719c6fce87d7d0ab93ee4f872f SHA256 cb19e271a6acddff43ba4db796e73a42081fed3869d22c0ce4cce16967380423
 DIST vdr-epgsearch-0.9.25.beta11.tgz 727022 RMD160 8e0021be985078c22fb8c39bf3669ba8a9d0dc0c SHA1 7614cae93e2c512a9beb353efc1f76d8e40b826f SHA256 c18af04ee057b19cc8023f371c3e723b7382f50445acb80f54e3a94d7bbc00f1
 DIST vdr-epgsearch-0.9.25.beta12.tgz 727481 RMD160 b235ca418d7ecaa6b840bb142eee023d16b9a3f4 SHA1 6ac41290dec0396d8f3532309209bda6787b96cf SHA256 a3018c6c02c5698501854bf7694240177eeb253690b8ef40c0aa9696cc8740aa
 DIST vdr-epgsearch-0.9.25.beta13.tgz 726993 RMD160 1663b30d084fc8904b7c8e5cef5402f24e933c0b SHA1 d3b34ddd2535e605f9ca14915a0691015277f98a SHA256 84c805f8dc42ed2b7bca2828de25c25cfc0422cac4a8fc119c6b827894c71e99
 DIST vdr-epgsearch-0.9.25.beta14.tgz 730379 RMD160 cef691ee8e83f9fc8bb93847324a3044ec36633e SHA1 6fc5d14a395015926b8ac65cc6eb453913b5ba77 SHA256 2e9a803add11c66e7de2b438587ec9756894e2edbb38012b7f348e04f4a87063
+DIST vdr-epgsearch-0.9.25.beta16.tgz 781214 RMD160 4b9909656eb54a47daff32377b975932561c2579 SHA1 3a11209369bccf607014b9807a19ab6d1760236f SHA256 a2919c00effe06178c7e44d1ed116ed87385d2b59fccbb658b3dbec6e7d03f62
 EBUILD vdr-epgsearch-0.9.23.ebuild 1425 RMD160 6eb74f0def647067706ef266a2a1e376eb872b06 SHA1 4003bbed819c2646ec49d6ee403bf97da503410f SHA256 838f5deba37e8b9aedc3d361947b2af2aa2ab3c907923e8074d0864697e0788d
 EBUILD vdr-epgsearch-0.9.24-r1.ebuild 1805 RMD160 7131a72429d75d6cd530cb5421ff0020212df31b SHA1 f4b27e952d32e894e36c3b41abce479e0111af55 SHA256 012b16915e37adba800c29269e21b1c3a5f91b20ede91752bf38c6efb4d2b028
 EBUILD vdr-epgsearch-0.9.24-r2.ebuild 1886 RMD160 13a7f41bae08b944c61052895227db26dc3d2548 SHA1 53527899e8415acac39257f71fe5a28a4d3de0bf SHA256 99c0c7beb8aa0bf54962d106f7e968657c8cefd3e1927d12fee7a8ad6073474a
@@ -16,12 +18,14 @@ EBUILD vdr-epgsearch-0.9.25_beta11.ebuild 1847 RMD160 0e512d8da8e48e554fe07df999
 EBUILD vdr-epgsearch-0.9.25_beta12.ebuild 2121 RMD160 794dcbfcb34fb9ce2154ae6eee1c27fc1e87447f SHA1 d532149ce77711579b656fc3a0cd2172287bbf7c SHA256 25e5a7991921099e30bb55723f3ab76017da8eee803afe8a36ecdbcde59b3bcb
 EBUILD vdr-epgsearch-0.9.25_beta13.ebuild 2121 RMD160 a075dbeb5a8752c2eab73e21b18c1d0ced5cd33e SHA1 3555f2d2c1a4bb93241f4dd10c5e37428a0c5cf4 SHA256 75102b2ba0c735f019e9be14b7566c30d7d038149102aa866e7c3e4e3e90d626
 EBUILD vdr-epgsearch-0.9.25_beta14.ebuild 2121 RMD160 c328cc506975c6b3e2cf6cbb94c77cf33c5d3812 SHA1 d224b659565c0516ecb22fc5cb2de24c2b685dcd SHA256 b2ce7c9dc03ebcc63d0402ca9d9bb547af0901302f31b2ea50a036610d8aa224
-MISC ChangeLog 8317 RMD160 b6ff46fa68e2e48d1f8b969b0a16e9e64330d615 SHA1 b3bf0b77c2931377bb17ffa4c431550a2ca11e50 SHA256 e34cabcc62613c6aede198aa558314393ebe9fd6b27ee0d4b8da6facce25b946
+EBUILD vdr-epgsearch-0.9.25_beta16.ebuild 2187 RMD160 fa1af3de698f1e552cde033988dd20faf70eb878 SHA1 77f776f49cfedaf9f2fa0d3735141e981a9d7f83 SHA256 3cbc4f2ba5621ce1fc9ed021fac5fb6aec07457d79a59d6d13d59a3eb04f3def
+MISC ChangeLog 8531 RMD160 914f4106f1c66939f5bbe9f866955f4984545557 SHA1 e9d09b06f7183e84f3abdcbfc6713713900bde6e SHA256 4c1cde1c739d5c6e225e543578dc90bc37bad32477545dfd2cac486f37a5b7a0
 MISC metadata.xml 423 RMD160 ffbb30742555fbcd39919829b7ce199e68072664 SHA1 7d35aca3ae43a0f0897f506a486c371727c44d91 SHA256 4306b9a475db49970298cb67b2870255ab3906c778c9275c3ae2c345dfc433b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkpgH2EACgkQt2vP6XvVdOfmhQCdHBoSQitnjk7Jev70GZD65R/Z
-UasAoJYE0LVVZBo4ZV95r8Rngba8GwCE
-=409W
+iD8DBQFLbsR0dn07HTTCgIoRAk0OAJ4wLOiRU7PSxJuoFoE/DkNFWaO/9QCfeW5h
+VLusjwxTb6lO8WfZiqyRqmg=
+=fo0A
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-0.9.25_beta16_missing-include.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-0.9.25_beta16_missing-include.diff
new file mode 100644
index 000000000000..ebe02683bd72
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-0.9.25_beta16_missing-include.diff
@@ -0,0 +1,11 @@
+diff -Naur epgsearch-0.9.25.beta16.orig/recstatus.c epgsearch-0.9.25.beta16/recstatus.c
+--- epgsearch-0.9.25.beta16.orig/recstatus.c	2010-02-07 14:35:07.000000000 +0100
++++ epgsearch-0.9.25.beta16/recstatus.c	2010-02-07 14:36:42.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include "recdone.h"
+ #include "conflictcheck_thread.h"
+ #include "epgsearchcfg.h"
++#include <math.h>
+ 
+ #define ALLOWED_BREAK_INSECS 2
+ 
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta16.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta16.ebuild
new file mode 100644
index 000000000000..22d7383705b6
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta16.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2010 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_beta16.ebuild,v 1.1 2010/02/07 13:48:22 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
+
+	epatch "${FILESDIR}/${P}_missing-include.diff"
+}
+
+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
+}