version bump; stable x86 amd64

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

4 files changed, 109 insertions, 10 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/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 9bdb7ef3f628..204391da0cbb 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -7,17 +7,19 @@ DIST vdr-epgsearch-0.9.23.tgz 667755 RMD160 83b2cec99ed18fd0b21e85bd9cf16b38d759
 DIST vdr-epgsearch-0.9.24.tgz 599266 RMD160 391578356319974411a15c6df4e122d05f2d12f4 SHA1 b38c534bb8b1cc719c6fce87d7d0ab93ee4f872f SHA256 cb19e271a6acddff43ba4db796e73a42081fed3869d22c0ce4cce16967380423
 DIST vdr-epgsearch-0.9.25.beta16.tgz 781214 RMD160 4b9909656eb54a47daff32377b975932561c2579 SHA1 3a11209369bccf607014b9807a19ab6d1760236f SHA256 a2919c00effe06178c7e44d1ed116ed87385d2b59fccbb658b3dbec6e7d03f62
 DIST vdr-epgsearch-0.9.25.beta17.tgz 780599 RMD160 5c54efd9fdbdf179717bfacfc7b89df18de28531 SHA1 7f9da736d71cc8ff5ebc896421253be13daf2522 SHA256 856f2a2c8ccaa60ddad04587464f08d7b7e673ff3b307a1b3e1f7aa53e09e0ba
+DIST vdr-epgsearch-0.9.25.beta20.tgz 788925 RMD160 ef3af3d48db6f4d44b2af2c70787e58b874f04e9 SHA1 c5e2797033a0d6eeb811a742634a6908e7fd7934 SHA256 c97dee5793c8356bcf4d405c9e97d1c328ce17641bf713a488683480d73b3704
 EBUILD vdr-epgsearch-0.9.23.ebuild 1425 RMD160 6eb74f0def647067706ef266a2a1e376eb872b06 SHA1 4003bbed819c2646ec49d6ee403bf97da503410f SHA256 838f5deba37e8b9aedc3d361947b2af2aa2ab3c907923e8074d0864697e0788d
 EBUILD vdr-epgsearch-0.9.24-r2.ebuild 1886 RMD160 13a7f41bae08b944c61052895227db26dc3d2548 SHA1 53527899e8415acac39257f71fe5a28a4d3de0bf SHA256 99c0c7beb8aa0bf54962d106f7e968657c8cefd3e1927d12fee7a8ad6073474a
 EBUILD vdr-epgsearch-0.9.25_beta16.ebuild 2183 RMD160 3e90dbe0617b75f6acd142da6b444883bb863900 SHA1 6356ee428f8f4b4b7b6f04e844fa710bb3c3db5a SHA256 603f78d5834c8421b7d638bad6b32e507ae45117d59f466ab86a2244725f0455
-EBUILD vdr-epgsearch-0.9.25_beta17.ebuild 2138 RMD160 c5806fb5dafb3bf7e5fbac3176cbc9ffb6164769 SHA1 3365005909bd264901759324fe90081bda15e546 SHA256 4a385578a708fa7cd4226df34466531b9c079985e98b465492f7184ab36db5e1
-MISC ChangeLog 9015 RMD160 b0728856573fb211033d8b64d78355e6ba281d90 SHA1 63733668f4f9e02fa668c732f37636e966abe372 SHA256 b4aebd7dbbe1677a8048e1f9be494aebf1cfcf46c981801edf74768d34d0eece
+EBUILD vdr-epgsearch-0.9.25_beta17.ebuild 2136 RMD160 5b8927ab28a2d862784f5aa25890127faa21054c SHA1 4b1acc45b5a3aeb44566a9b216987f390fc3dced SHA256 8e71624c5045995a1aff4e33636187b88b9b9be5a5e8277c3ada29b5d4c9c57b
+EBUILD vdr-epgsearch-0.9.25_beta20.ebuild 2138 RMD160 58d19609ce03a05eb2c350035d7d492efc6600b2 SHA1 cf3b53be81ccf8017c21cd9f7589b4d9fcea0dd0 SHA256 ea920b55134ba5af99010b92a0c3dae869b91d4678da38ca7312a3923c6f66a6
+MISC ChangeLog 9223 RMD160 daaefb5d62a1050a7e8f078cf3df3ef2860e8740 SHA1 205599fee47dfe7d9e9affc066723b79f0607d66 SHA256 4c1255de178a6f17ed0cbd0b2bc26c320fcba9f216f91f6078c6fb0bfff5b789
 MISC metadata.xml 423 RMD160 ffbb30742555fbcd39919829b7ce199e68072664 SHA1 7d35aca3ae43a0f0897f506a486c371727c44d91 SHA256 4306b9a475db49970298cb67b2870255ab3906c778c9275c3ae2c345dfc433b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFMlTPUdn07HTTCgIoRAtzTAJ9u+j/nMKmVuzS9kF3/fyP9QrCBwgCfZfs8
-Kr+njWk1qnWvvjQODJcH//E=
-=jKGi
+iD8DBQFNNcASdn07HTTCgIoRAh87AJ9IN6fKvJDIYenjS2NoNFHIhT3skgCgr63s
+hyT9UmVULYdSEaD1v9jhpxY=
+=IK4d
 -----END PGP SIGNATURE-----
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
+}