bump; eapi=4; vdr-plugin-2.eclass

(Portage version: 2.1.10.11/cvs/Linux i686)

9 files changed, 20 insertions, 214 deletions

diff --git a/media-plugins/vdr-radio/ChangeLog b/media-plugins/vdr-radio/ChangeLog
index 66aebb370f6c..b53e1d02bd80 100644
--- a/media-plugins/vdr-radio/ChangeLog
+++ b/media-plugins/vdr-radio/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-radio
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/ChangeLog,v 1.22 2009/08/20 19:22:12 zzam Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/ChangeLog,v 1.23 2012/05/06 19:57:20 hd_brummy Exp $
+
+*vdr-radio-0.9.0 (06 May 2012)
+
+  06 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-radio-0.1.4.ebuild,
+  -vdr-radio-0.2.0.ebuild, -files/vdr-radio-0.2.0-vdr-1.5.1.diff,
+  -vdr-radio-0.2.1.ebuild, -vdr-radio-0.2.2.ebuild, -vdr-radio-0.2.3.ebuild,
+  -vdr-radio-0.2.5.ebuild, -files/vdr-radio-0.2.5-glibc-2.10.patch,
+  +vdr-radio-0.9.0.ebuild:
+  bump; eapi=4; vdr-plugin-2.eclass
 
 *vdr-radio-0.2.5 (20 Aug 2009)
 
diff --git a/media-plugins/vdr-radio/files/vdr-radio-0.2.0-vdr-1.5.1.diff b/media-plugins/vdr-radio/files/vdr-radio-0.2.0-vdr-1.5.1.diff
deleted file mode 100644
index c05b9c4372db..000000000000
--- a/media-plugins/vdr-radio/files/vdr-radio-0.2.0-vdr-1.5.1.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Support for VDR-1.5.x
-
-Joerg Bornkessel (hd_brummy@gentoo.org) 25 Mar 2007
-diff -Naur radio-0.2.0.orig/radioaudio.c radio-0.2.0/radioaudio.c
---- radio-0.2.0.orig/radioaudio.c	2007-03-25 20:07:23.000000000 +0200
-+++ radio-0.2.0/radioaudio.c	2007-03-25 20:09:23.000000000 +0200
-@@ -141,7 +141,11 @@
- // --- cRDSReceiver ------------------------------------------------------------
- 
- cRDSReceiver::cRDSReceiver(int Pid)
-+#if APIVERSNUM > 10500
-+:cReceiver(chan->GetChannelID(), -1, Pid, NULL, NULL, NULL)
-+#else
- :cReceiver(0, -1, Pid)
-+#endif
- {
-     if (S_Verbose >= 1)
-         printf("vdr-radio: additional RDS-Receiver starts on Pid=%d\n", Pid);
diff --git a/media-plugins/vdr-radio/files/vdr-radio-0.2.5-glibc-2.10.patch b/media-plugins/vdr-radio/files/vdr-radio-0.2.5-glibc-2.10.patch
deleted file mode 100644
index 7e80da9612da..000000000000
--- a/media-plugins/vdr-radio/files/vdr-radio-0.2.5-glibc-2.10.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur radio-0.2.4.orig/radioepg.c radio-0.2.4/radioepg.c
---- radio-0.2.4.orig/radioepg.c	2007-10-09 18:45:26.000000000 +0300
-+++ radio-0.2.4/radioepg.c	2009-08-08 22:50:46.000000000 +0300
-@@ -12,7 +12,7 @@
- int epg_premiere(const char *epgtitle, const char *epgdescr, time_t epgstart, time_t epgend) 
- {
- 	int i;
--	char *p;
-+	const char *p;
- 	char artist[RT_MEL], titel[RT_MEL], album[RT_MEL], jahr[RT_MEL];
- 	struct tm tm_store;
- 
-@@ -143,7 +143,7 @@
- int epg_kdg(const char *epgdescr, time_t epgstart, time_t epgend) 
- {
- 	int i;
--	char *p;
-+	const char *p;
- 	char artist[RT_MEL], titel[RT_MEL], album[RT_MEL], komp[RT_MEL];
- 	struct tm tm_store;
- 
-@@ -240,7 +240,7 @@
- int epg_unitymedia(const char *epgtitle, const char *epgdescr, time_t epgstart, time_t epgend) 
- {
- 	int i;
--	char *p1, *p2;
-+	const char *p1, *p2;
- 	char  titel[2*RT_MEL], artist[2*RT_MEL];
- 	struct tm tm_store;
- 
diff --git a/media-plugins/vdr-radio/vdr-radio-0.1.4.ebuild b/media-plugins/vdr-radio/vdr-radio-0.1.4.ebuild
deleted file mode 100644
index 6ca3e237e386..000000000000
--- a/media-plugins/vdr-radio/vdr-radio-0.1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/vdr-radio-0.1.4.ebuild,v 1.3 2007/10/19 12:09:38 zzam Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR plugin: show background image for radio and decode RDS Text"
-HOMEPAGE="http://vdrportal.de/board/thread.php?threadid=48687"
-SRC_URI="http://www.egal-vdr.de/plugins/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.43"
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /usr/share/vdr/radio
-	doins "${S}"/mpegstill/rtext*
-	dosym rtextOben-kleo2-live.mpg /usr/share/vdr/radio/radio.mpg
-	dosym rtextOben-kleo2-replay.mpg /usr/share/vdr/radio/replay.mpg
-}
diff --git a/media-plugins/vdr-radio/vdr-radio-0.2.0.ebuild b/media-plugins/vdr-radio/vdr-radio-0.2.0.ebuild
deleted file mode 100644
index a181fd8eb86a..000000000000
--- a/media-plugins/vdr-radio/vdr-radio-0.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/vdr-radio-0.2.0.ebuild,v 1.5 2008/04/28 10:59:19 zzam Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR plugin: show background image for radio and decode RDS Text"
-HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=58795"
-SRC_URI="http://www.egal-vdr.de/plugins/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.43"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon.sh-0.2.0"
-
-PATCHES=("${FILESDIR}/${P}-vdr-1.5.1.diff")
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /usr/share/vdr/radio
-	doins "${S}"/mpegstill/rtext*
-	dosym rtextOben-kleo2-live.mpg /usr/share/vdr/radio/radio.mpg
-	dosym rtextOben-kleo2-replay.mpg /usr/share/vdr/radio/replay.mpg
-
-	keepdir "/var/cache/vdr-radio"
-	chown -R vdr:vdr "${D}"/var/cache/vdr-radio
-}
diff --git a/media-plugins/vdr-radio/vdr-radio-0.2.1.ebuild b/media-plugins/vdr-radio/vdr-radio-0.2.1.ebuild
deleted file mode 100644
index 26cc4974361d..000000000000
--- a/media-plugins/vdr-radio/vdr-radio-0.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/vdr-radio-0.2.1.ebuild,v 1.3 2007/10/19 12:09:38 zzam Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR plugin: show background image for radio and decode RDS Text"
-HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=58795"
-SRC_URI="http://www.egal-vdr.de/plugins/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.43"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon.sh-0.2.0"
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /usr/share/vdr/radio
-	doins "${S}"/mpegstill/rtext*
-	dosym rtextOben-kleo2-live.mpg /usr/share/vdr/radio/radio.mpg
-	dosym rtextOben-kleo2-replay.mpg /usr/share/vdr/radio/replay.mpg
-
-	keepdir "/var/cache/vdr-radio"
-	chown -R vdr:vdr "${D}"/var/cache/vdr-radio
-}
diff --git a/media-plugins/vdr-radio/vdr-radio-0.2.2.ebuild b/media-plugins/vdr-radio/vdr-radio-0.2.2.ebuild
deleted file mode 100644
index 365865eb6a27..000000000000
--- a/media-plugins/vdr-radio/vdr-radio-0.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/vdr-radio-0.2.2.ebuild,v 1.2 2007/10/19 12:09:38 zzam Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR plugin: show background image for radio and decode RDS Text"
-HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=58795"
-SRC_URI="http://www.egal-vdr.de/plugins/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.43"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon.sh-0.2.0"
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /usr/share/vdr/radio
-	doins "${S}"/mpegstill/rtext*
-	dosym rtextOben-kleo2-live.mpg /usr/share/vdr/radio/radio.mpg
-	dosym rtextOben-kleo2-replay.mpg /usr/share/vdr/radio/replay.mpg
-
-	keepdir "/var/cache/vdr-radio"
-	chown -R vdr:vdr "${D}"/var/cache/vdr-radio
-}
diff --git a/media-plugins/vdr-radio/vdr-radio-0.2.5.ebuild b/media-plugins/vdr-radio/vdr-radio-0.2.5.ebuild
deleted file mode 100644
index 49b5b8787d50..000000000000
--- a/media-plugins/vdr-radio/vdr-radio-0.2.5.ebuild
+++ /dev/null
@@ -1,41 +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-radio/vdr-radio-0.2.5.ebuild,v 1.1 2009/08/20 19:22:12 zzam Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR plugin: show background image for radio and decode RDS Text"
-HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=58795"
-SRC_URI="http://www.egal-vdr.de/plugins/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-video/vdr-1.3.43"
-DEPEND="${RDEPEND}"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon.sh-0.2.0"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}"/config
-
-	insinto /usr/share/vdr/radio
-	doins mpegstill/rtext*
-	dosym rtextOben-kleo2-live.mpg /usr/share/vdr/radio/radio.mpg
-	dosym rtextOben-kleo2-replay.mpg /usr/share/vdr/radio/replay.mpg
-
-	exeinto /usr/share/vdr/radio
-	doexe scripts/radioinfo*
-
-	diropts -m 755 -o vdr -g vdr
-	keepdir "/var/cache/vdr-radio"
-}
diff --git a/media-plugins/vdr-radio/vdr-radio-0.2.3.ebuild b/media-plugins/vdr-radio/vdr-radio-0.9.0.ebuild
index b70496652055..b1d3875ed263 100644
--- a/media-plugins/vdr-radio/vdr-radio-0.2.3.ebuild
+++ b/media-plugins/vdr-radio/vdr-radio-0.9.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/vdr-radio-0.2.3.ebuild,v 1.2 2007/10/19 12:09:38 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/vdr-radio-0.9.0.ebuild,v 1.1 2012/05/06 19:57:20 hd_brummy Exp $
 
-inherit vdr-plugin eutils
+EAPI="4"
+
+inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: show background image for radio and decode RDS Text"
 HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=58795"
@@ -13,12 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.3.43"
+RDEPEND=">=media-video/vdr-1.6.0"
+DEPEND="${RDEPEND}"
 
 VDR_RCADDON_FILE="${FILESDIR}/rc-addon.sh-0.2.0"
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
 	cd "${S}"/config
 
@@ -30,6 +33,6 @@ src_install() {
 	exeinto /usr/share/vdr/radio
 	doexe scripts/radioinfo*
 
+	diropts -m 755 -o vdr -g vdr
 	keepdir "/var/cache/vdr-radio"
-	chown -R vdr:vdr "${D}"/var/cache/vdr-radio
 }