eapi=3; cleanup

(Portage version: 2.1.9.25/cvs/Linux i686)

8 files changed, 13 insertions, 257 deletions

diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog
index b8f9ac67723c..024ff0ae4c6a 100644
--- a/media-plugins/vdr-epgsearch/ChangeLog
+++ b/media-plugins/vdr-epgsearch/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-epgsearch
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.49 2011/01/20 15:20:20 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.50 2011/01/28 20:36:04 hd_brummy Exp $
+
+  28 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-epgsearch-0.9.23.ebuild, -vdr-epgsearch-0.9.24-r2.ebuild,
+  -files/vdr-epgsearch-0.9.24-langinfo.diff,
+  -vdr-epgsearch-0.9.25_beta16.ebuild, vdr-epgsearch-0.9.25_beta17.ebuild,
+  vdr-epgsearch-0.9.25_beta20-r1.ebuild,
+  -files/vdr-epgsearch-0.9.25_beta16_missing-include.diff:
+  eapi=3; cleanup
 
 *vdr-epgsearch-0.9.25_beta20-r1 (20 Jan 2011)
 
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-0.9.24-langinfo.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-0.9.24-langinfo.diff
deleted file mode 100644
index 0cfbae4a92c3..000000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-0.9.24-langinfo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN epgsearch-0.9.24_orig/epgsearch.c epgsearch-0.9.24/epgsearch.c
---- epgsearch-0.9.24_orig/epgsearch.c	2008-05-01 14:30:37.000000000 +0200
-+++ epgsearch-0.9.24/epgsearch.c	2008-06-15 10:12:04.000000000 +0200
-@@ -31,6 +31,7 @@
- #include <vdr/status.h>
- #include <vdr/epg.h>
- #include <getopt.h>
-+#include <langinfo.h>
- #include "menu_event.h"
- #include "menu_main.h"
- #include "menu_whatson.h"
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
deleted file mode 100644
index ebe02683bd72..000000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-0.9.25_beta16_missing-include.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-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.23.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild
deleted file mode 100644
index 434202cff88f..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild
+++ /dev/null
@@ -1,58 +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.23.ebuild,v 1.5 2009/03/21 17:43:18 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder epgsearch plugin"
-HOMEPAGE="http://winni.vdr-developer.org/epgsearch"
-SRC_URI="http://winni.vdr-developer.org/epgsearch/downloads/${P}.tgz"
-
-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/'
-}
-
-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.24-r2.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24-r2.ebuild
deleted file mode 100644
index 4c294ece5d3c..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24-r2.ebuild
+++ /dev/null
@@ -1,79 +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-r2.ebuild,v 1.3 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/'
-
-	# 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_beta16.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta16.ebuild
deleted file mode 100644
index 01ef3884be8f..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta16.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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.2 2010/04/18 12:21:30 maekke 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
-}
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 819b189ab5f6..096b351102fb 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,8 +1,8 @@
 # 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.2 2011/01/18 16:29:44 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta17.ebuild,v 1.3 2011/01/28 20:36:04 hd_brummy Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit vdr-plugin
 
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20-r1.ebuild
index 26215ff26756..ef439395d054 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20-r1.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20-r1.ebuild
@@ -1,8 +1,8 @@
 # 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-r1.ebuild,v 1.1 2011/01/20 15:20:20 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20-r1.ebuild,v 1.2 2011/01/28 20:36:04 hd_brummy Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit vdr-plugin