version bump

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

8 files changed, 24 insertions, 421 deletions

diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog
index 591fc7d2d69c..c8b98969342d 100644
--- a/media-plugins/vdr-epgsearch/ChangeLog
+++ b/media-plugins/vdr-epgsearch/ChangeLog
@@ -1,6 +1,15 @@
 # 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.46 2010/04/18 12:21:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.47 2010/09/18 21:47:20 hd_brummy Exp $
+
+*vdr-epgsearch-0.9.25_beta17 (18 Sep 2010)
+
+  18 Sep 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-epgsearch-0.9.24.ebuild, -vdr-epgsearch-0.9.24-r1.ebuild,
+  -vdr-epgsearch-0.9.25_beta11.ebuild, -vdr-epgsearch-0.9.25_beta12.ebuild,
+  -vdr-epgsearch-0.9.25_beta13.ebuild, -vdr-epgsearch-0.9.25_beta14.ebuild,
+  +vdr-epgsearch-0.9.25_beta17.ebuild:
+  version bump
 
   18 Apr 2010; Markus Meier <maekke@gentoo.org>
   vdr-epgsearch-0.9.25_beta16.ebuild:
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 527f64f6f3b2..9bdb7ef3f628 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -5,26 +5,19 @@ AUX vdr-epgsearch-0.9.24-langinfo.diff 401 RMD160 94f91c56102e207ebb3a4760f744d4
 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
+DIST vdr-epgsearch-0.9.25.beta17.tgz 780599 RMD160 5c54efd9fdbdf179717bfacfc7b89df18de28531 SHA1 7f9da736d71cc8ff5ebc896421253be13daf2522 SHA256 856f2a2c8ccaa60ddad04587464f08d7b7e673ff3b307a1b3e1f7aa53e09e0ba
 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
-EBUILD vdr-epgsearch-0.9.24.ebuild 1648 RMD160 c2611a5621e16f9177642847ed7e1870ce4b77d7 SHA1 2614eae04e07db20f1516c31d83413f0269b8721 SHA256 20297276e720735d6840012a7ab1fcb0100b973fbcced63b3f8e17503c503865
-EBUILD vdr-epgsearch-0.9.25_beta11.ebuild 1847 RMD160 0e512d8da8e48e554fe07df99955a48b8017a0af SHA1 2745df5010f111bea642489c8b9df1aa0fcb38fe SHA256 7c6ff16dbe8ae644e3dac8a0a51fc11ecfaf911368b5db158ec9768bc889d449
-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
 EBUILD vdr-epgsearch-0.9.25_beta16.ebuild 2183 RMD160 3e90dbe0617b75f6acd142da6b444883bb863900 SHA1 6356ee428f8f4b4b7b6f04e844fa710bb3c3db5a SHA256 603f78d5834c8421b7d638bad6b32e507ae45117d59f466ab86a2244725f0455
-MISC ChangeLog 8641 RMD160 5946bb12e968e5383f7414e533d7e2b94681c827 SHA1 bf4f6a4ee31714d2b63b66e935b7d5565aecb137 SHA256 c2a2d75c6b1e6d8c5f90191b0a910693cb1d2121f11a272aeb20e77db5b70d2d
+EBUILD vdr-epgsearch-0.9.25_beta17.ebuild 2138 RMD160 c5806fb5dafb3bf7e5fbac3176cbc9ffb6164769 SHA1 3365005909bd264901759324fe90081bda15e546 SHA256 4a385578a708fa7cd4226df34466531b9c079985e98b465492f7184ab36db5e1
+MISC ChangeLog 9015 RMD160 b0728856573fb211033d8b64d78355e6ba281d90 SHA1 63733668f4f9e02fa668c732f37636e966abe372 SHA256 b4aebd7dbbe1677a8048e1f9be494aebf1cfcf46c981801edf74768d34d0eece
 MISC metadata.xml 423 RMD160 ffbb30742555fbcd39919829b7ce199e68072664 SHA1 7d35aca3ae43a0f0897f506a486c371727c44d91 SHA256 4306b9a475db49970298cb67b2870255ab3906c778c9275c3ae2c345dfc433b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkvK+P0ACgkQkKaRLQcq0GKFaACfdwBqEPf7cpyVFBsBIhwHjJhX
-w7gAn21QEqOsO1i11DDixQskcA5uonN8
-=2r1H
+iD8DBQFMlTPUdn07HTTCgIoRAtzTAJ9u+j/nMKmVuzS9kF3/fyP9QrCBwgCfZfs8
+Kr+njWk1qnWvvjQODJcH//E=
+=jKGi
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24-r1.ebuild
deleted file mode 100644
index 917063e94291..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 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.24-r1.ebuild,v 1.2 2009/03/21 17:43:18 zzam Exp $
-
-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"
-
-DEPEND=">=media-video/vdr-1.3.45
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-PATCHES=("${FILESDIR}/${P}-langinfo.diff")
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-	fix_vdr_libsi_include conflictcheck.c
-
-	use pcre && sed -i Makefile -e 's/^#HAVE_PCREPOSIX/HAVE_PCREPOSIX/'
-}
-
-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
-}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild
deleted file mode 100644
index b0a760fc1a7e..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 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.24.ebuild,v 1.4 2009/03/21 17:43:18 zzam Exp $
-
-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"
-
-DEPEND=">=media-video/vdr-1.3.45
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-PATCHES=("${FILESDIR}/${P}-langinfo.diff")
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-	fix_vdr_libsi_include conflictcheck.c
-
-	use pcre && sed -i Makefile -e 's/^#HAVE_PCREPOSIX/HAVE_PCREPOSIX/'
-}
-
-src_install() {
-	vdr-plugin_src_install
-	diropts "-m755 -o vdr -g vdr"
-	keepdir /etc/vdr/plugins/epgsearch
-
-	cd "${S}"
-	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
-}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta11.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta11.ebuild
deleted file mode 100644
index 7cf95227ece4..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2009 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_beta11.ebuild,v 1.1 2009/03/21 16:02:06 zzam Exp $
-
-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"
-
-DEPEND=">=media-video/vdr-1.3.45
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-	fix_vdr_libsi_include conflictcheck.c
-
-	use pcre && sed -i Makefile -e 's/^#HAVE_PCREPOSIX/HAVE_PCREPOSIX/'
-
-	# 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
-}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta12.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta12.ebuild
deleted file mode 100644
index 19a500730b39..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta12.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2009 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_beta12.ebuild,v 1.1 2009/03/25 11:11:36 zzam Exp $
-
-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_unpack() {
-	vdr-plugin_src_unpack
-
-	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
-}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta13.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta13.ebuild
deleted file mode 100644
index 4c428b3cb58f..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta13.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2009 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_beta13.ebuild,v 1.1 2009/04/11 10:07:16 zzam Exp $
-
-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_unpack() {
-	vdr-plugin_src_unpack
-
-	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
-}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta14.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta17.ebuild
index 8fd28577e2f6..87ae76d03320 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta14.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta17.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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_beta14.ebuild,v 1.1 2009/07/17 06:51:05 zzam Exp $
+# $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 $
+
+EAPI="2"
 
 inherit vdr-plugin
 
@@ -28,8 +30,8 @@ DEPEND=">=media-video/vdr-1.3.45
 	tre? ( dev-libs/tre )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	vdr-plugin_src_unpack
+src_prepare() {
+	vdr-plugin_src_prepare
 
 	cd "${S}"
 	fix_vdr_libsi_include conflictcheck.c