version bump; big cleanup

(Portage version: 2.1.3.19)

12 files changed, 29 insertions, 321 deletions

diff --git a/media-plugins/vdr-mplayer/ChangeLog b/media-plugins/vdr-mplayer/ChangeLog
index 66be4d31feec..706f7e9fb47f 100644
--- a/media-plugins/vdr-mplayer/ChangeLog
+++ b/media-plugins/vdr-mplayer/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-plugins/vdr-mplayer
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.20 2007/07/17 09:25:53 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.21 2008/03/02 16:42:56 hd_brummy Exp $
+
+*vdr-mplayer-0.10.1 (02 Mar 2008)
+
+  02 Mar 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/0.9.15/01_gentoo.diff, -files/vdr-mplayer-0.9.14-gentoo.diff,
+  -files/0.9.15/02_slave_mode_default.diff,
+  -files/vdr-mplayer-0.9.14-resume.diff, -files/0.9.15/series,
+  -files/vdr-mplayer-0.9.14-slave-mode-default.diff,
+  +files/0.10.1/01_gentoo.diff, -files/0.9.15/03_vdr-1.5.1.diff,
+  -files/rc-addon.sh, -vdr-mplayer-0.9.14-r2.ebuild,
+  -vdr-mplayer-0.9.15.ebuild, -vdr-mplayer-0.9.15-r1.ebuild,
+  +vdr-mplayer-0.10.1.ebuild:
+  version bump; big cleanup
 
   17 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-mplayer-0.10.0.ebuild:
diff --git a/media-plugins/vdr-mplayer/files/0.9.15/01_gentoo.diff b/media-plugins/vdr-mplayer/files/0.9.15/01_gentoo.diff
deleted file mode 100644
index ae52fe7c71f1..000000000000
--- a/media-plugins/vdr-mplayer/files/0.9.15/01_gentoo.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-fix some path for gentoo install
-
-Joerg Bornkessel <hd_brummy@gentoo.org>
-diff -Naur mp3-0.9.15.orig/Makefile mp3-0.9.15/Makefile
---- mp3-0.9.15.orig/Makefile	2006-09-22 20:02:06.484888703 +0200
-+++ mp3-0.9.15/Makefile	2006-09-22 20:03:09.732841453 +0200
-@@ -24,14 +24,14 @@
- # in the VDR directory an set them there.
- 
- ### uncomment one of these lines, if you don't want one of the plugins
--#WITHOUT_MP3=1
-+WITHOUT_MP3=1
- #WITHOUT_MPLAYER=1
- 
- ### uncomment the following line, if you don't have libsndfile installed
--#WITHOUT_LIBSNDFILE=1
-+WITHOUT_LIBSNDFILE=1
- 
- ### uncomment the following line, if you don't have libvorbisfile installed
--#WITHOUT_LIBVORBISFILE=1
-+WITHOUT_LIBVORBISFILE=1
- 
- ### uncomment the following line, if you want OSS sound output
- #WITH_OSS_OUTPUT=1
-diff -Naur mp3-0.9.15.orig/mplayer.c mp3-0.9.15/mplayer.c
---- mp3-0.9.15.orig/mplayer.c	2006-09-22 20:02:06.504889953 +0200
-+++ mp3-0.9.15/mplayer.c	2006-09-22 20:06:46.998419703 +0200
-@@ -814,7 +814,7 @@
- {
-   if(!CheckVDRVersion(1,1,16,"mplayer")) return false;
-   i18n_name=Name();
--  MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf"));
-+  MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayer/mplayersources.conf"));
-   if(MPlaySources.Count()<1) {
-     esyslog("ERROR: you must have defined at least one source in mplayersources.conf");
-     fprintf(stderr,"No source(s) defined in mplayersources.conf\n");
diff --git a/media-plugins/vdr-mplayer/files/0.9.15/02_slave_mode_default.diff b/media-plugins/vdr-mplayer/files/0.9.15/02_slave_mode_default.diff
deleted file mode 100644
index 54a6c523b11c..000000000000
--- a/media-plugins/vdr-mplayer/files/0.9.15/02_slave_mode_default.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-set slave mode on OSD to default
-
-Joerg Bornkessel <hd_brummy@gentoo.org>
-
-diff -ru mp3-0.9.14-orig/setup-mplayer.c mp3-0.9.14/setup-mplayer.c
---- mp3-0.9.14-orig/setup-mplayer.c	2006-07-07 09:56:27.000000000 +0200
-+++ mp3-0.9.14/setup-mplayer.c	2006-07-07 09:56:35.000000000 +0200
-@@ -30,7 +30,7 @@
- 
- cMPlayerSetup::cMPlayerSetup(void)
- {
--  SlaveMode = 0;
-+  SlaveMode = 1;
-   ResumeMode = 2;
-   HideMainMenu = 0;
-   OsdPos = 0;
diff --git a/media-plugins/vdr-mplayer/files/0.9.15/03_vdr-1.5.1.diff b/media-plugins/vdr-mplayer/files/0.9.15/03_vdr-1.5.1.diff
deleted file mode 100644
index 50a14f47756b..000000000000
--- a/media-plugins/vdr-mplayer/files/0.9.15/03_vdr-1.5.1.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-http://www.vdr-portal.de/board/thread.php?postid=565407#post565407
-diff -urN mp3-0.9.15/mp3.c mp3-unstable/mp3.c
---- mp3-0.9.15/mp3.c	2006-08-30 17:39:24.000000000 +0200
-+++ mp3-unstable/mp3.c	2007-01-15 18:33:56.000000000 +0100
-@@ -342,7 +342,12 @@
- #else
-     Interface->Close();
- #endif
--    needsFastResponse=visible=bigwin=false;
-+    visible=bigwin=false;
-+#if APIVERSNUM >= 10500
-+    SetNeedsFastResponse(false);
-+#else
-+    needsFastResponse=false;
-+#endif
-     }
- }
- 
-@@ -502,7 +507,12 @@
- #endif
-       ShowStatus(true);
-       bigwin=bigWin;
--      needsFastResponse=visible=true;
-+      visible=true;
-+#if APIVERSNUM >= 10500
-+      SetNeedsFastResponse(true);
-+#else
-+      needsFastResponse=true;
-+#endif
-       fliptime=listtime=0; flipint=0; flip=-1; top=lastTop=-1; lastIndex=lastTotal=-1;
-       delete lastMode; lastMode=0;
-       }
-diff -urN mp3-0.9.15/mplayer.c mp3-unstable/mplayer.c
---- mp3-0.9.15/mplayer.c	2006-09-19 20:18:13.000000000 +0200
-+++ mp3-unstable/mplayer.c	2007-01-15 18:33:56.000000000 +0100
-@@ -232,7 +233,12 @@
- #else
-     Interface->Close();
- #endif
--    needsFastResponse=visible=modeOnly=false;
-+    visible=modeOnly=false;
-+#if APIVERSNUM >= 10500
-+    SetNeedsFastResponse(false);
-+#else
-+    needsFastResponse=false;
-+#endif
-     }
- }
- 
-@@ -303,7 +309,12 @@
-       Interface->Clear();
-       if(MPlayerSetup.OsdPos>0) Interface->Fill(0,3,Interface->Width(),MPlayerSetup.OsdPos,clrTransparent);
- #endif
--      needsFastResponse=visible=true; modeOnly=false;
-+      visible=true; modeOnly=false;
-+#if APIVERSNUM >= 10500
-+      SetNeedsFastResponse(true);
-+#else
-+      needsFastResponse=true;
-+#endif
-       lastCurrent=lastTotal=-1;
-       flush=true;
-       }
diff --git a/media-plugins/vdr-mplayer/files/0.9.15/series b/media-plugins/vdr-mplayer/files/0.9.15/series
deleted file mode 100644
index 7860a20767b2..000000000000
--- a/media-plugins/vdr-mplayer/files/0.9.15/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01_gentoo.diff
-02_slave_mode_default.diff
-03_vdr-1.5.1.diff
diff --git a/media-plugins/vdr-mplayer/files/rc-addon.sh b/media-plugins/vdr-mplayer/files/rc-addon.sh
deleted file mode 100644
index 9851d9eee139..000000000000
--- a/media-plugins/vdr-mplayer/files/rc-addon.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/files/rc-addon.sh,v 1.2 2007/04/17 12:50:07 zzam Exp $
-#
-# rc-addon plugin-startup-skript for vdr-mplayer
-#
-
-MPLAYER_PLUGIN_MOUNT="/usr/share/vdr/mplayer/bin/mount-mplayer.sh"
-MPLAYER_PLUGIN_CALL="/usr/share/vdr/mplayer/bin/mplayer.sh"
-
-plugin_pre_vdr_start() {
-
-    add_plugin_param "-m ${MPLAYER_PLUGIN_MOUNT}"
-    add_plugin_param "-M ${MPLAYER_PLUGIN_CALL}"
-				
-}
diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-gentoo.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-gentoo.diff
deleted file mode 100644
index 9b0598c73072..000000000000
--- a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-gentoo.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile	2006-01-05 00:00:41.659967250 +0100
-+++ Makefile-gentoo	2006-01-05 00:02:04.693156500 +0100
-@@ -22,14 +22,14 @@
- # in the VDR directory an set them there.
- 
- ### uncomment one of these lines, if you don't want one of the plugins
--#WITHOUT_MP3=1
-+WITHOUT_MP3=1
- #WITHOUT_MPLAYER=1
- 
- ### uncomment the following line, if you don't have libsndfile installed
--#WITHOUT_LIBSNDFILE=1
-+WITHOUT_LIBSNDFILE=1
- 
- ### uncomment the following line, if you don't have libvorbisfile installed
--#WITHOUT_LIBVORBISFILE=1
-+WITHOUT_LIBVORBISFILE=1
- 
- ### uncomment the following line, if you want OSS sound output
- #WITH_OSS_OUTPUT=1
---- mplayer.c	2005-07-31 13:23:11.000000000 +0200
-+++ mplayer-gentoo.c	2006-01-05 00:13:25.715717750 +0100
-@@ -742,7 +742,7 @@
- {
-   if(!CheckVDRVersion(1,1,16,"mplayer")) return false;
-   i18n_name=Name();
--  MPlaySources.Load(AddDirectory(ConfigDirectory(),"mplayersources.conf"));
-+  MPlaySources.Load(AddDirectory(ConfigDirectory(),"mplayer/mplayersources.conf"));
-   if(MPlaySources.Count()<1) {
-     esyslog("ERROR: you must have defined at least one source in mplayersources.conf");
-     fprintf(stderr,"No source(s) defined in mplayersources.conf\n");
diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-resume.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-resume.diff
deleted file mode 100644
index f5184fc4636b..000000000000
--- a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-resume.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Patch from http://www.vdr-portal.de/board/thread.php?postid=411371#post411371
-
-diff -u mp3-0.9.14-orig/player-mplayer.c mp3-0.9.14/player-mplayer.c
---- mp3-0.9.14-orig/player-mplayer.c	2006-06-18 23:29:35.696587731 +0200
-+++ mp3-0.9.14/player-mplayer.c	2006-06-18 23:33:09.501196623 +0200
-@@ -465,7 +465,7 @@
-               nextTime=nextPos=0;
-               d(printf("PLAYBACK STARTED\n"))
-               if(resPos>=0.0) {
--                if(!currentName || !strcmp(currentName,file->Path()))
-+                if(!currentName || !strcmp(currentName,file->FullPath()))
-                   MPlayerControl("seek %.1f 1",resPos);
-                 else
-                   d(printf("mplayer: no resume, seems to be playlist\n"))
-@@ -480,6 +480,7 @@
-             LOCK_THREAD;
-             free(currentName);
-             currentName=strdup(::index(buff,' ')+1);
-+            if(currentName[0]) currentName[strlen(currentName)-1]=0; // skip trailing dot
-             d(printf("PLAYING %s\n",currentName))
-             }
-           else if(sscanf(buff,"ANS_LENGTH=%d",&itime)==1) {
diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-slave-mode-default.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-slave-mode-default.diff
deleted file mode 100644
index dd501f43a55f..000000000000
--- a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-slave-mode-default.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru mp3-0.9.14-orig/setup-mplayer.c mp3-0.9.14/setup-mplayer.c
---- mp3-0.9.14-orig/setup-mplayer.c	2006-07-07 09:56:27.000000000 +0200
-+++ mp3-0.9.14/setup-mplayer.c	2006-07-07 09:56:35.000000000 +0200
-@@ -30,7 +30,7 @@
- 
- cMPlayerSetup::cMPlayerSetup(void)
- {
--  SlaveMode = 0;
-+  SlaveMode = 1;
-   ResumeMode = 2;
-   HideMainMenu = 0;
-   OsdPos = 0;
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild
index 417653c44312..058e5da5044f 100644
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild,v 1.2 2007/06/16 08:53:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild,v 1.1 2008/03/02 16:42:56 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
-DESCRIPTION="Video Disk Recorder Mplayer Plugin"
+DESCRIPTION="VDR Plugin: api to mplayer"
 HOMEPAGE="http://www.muempf.de/"
 SRC_URI="http://www.muempf.de/down/vdr-mp3-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.4.2"
@@ -21,20 +21,22 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/mp3-${PV}
 
-PATCHES="
-	${FILESDIR}/${PV}/01_gentoo.diff
-	${FILESDIR}/${PV}/02_slave_mode_default.diff
-	${FILESDIR}/${PV}/03_vdr-1.5.1.diff"
+PATCHES="${FILESDIR}/${PV}/01_gentoo.diff"
 
 VDR_RCADDON_FILE=${FILESDIR}/rc-addon-0.9.15.sh
 VDR_CONFD_FILE=${FILESDIR}/confd-0.9.15.sh
 
-src_install() {
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	sed -i Makefile -e "s:i18n.c:i18n.h:g"
+}
 
+src_install() {
 	vdr-plugin_src_install
 
 	insinto /etc/vdr/plugins/mplayer
-	doins   ${FILESDIR}/mplayersources.conf
+	doins   "${FILESDIR}/mplayersources.conf"
 
 	into /usr/share/vdr/mplayer
 	newbin examples/mount.sh.example mount-mplayer.sh
@@ -43,7 +45,6 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	vdr-plugin_pkg_postinst
 
 	echo
@@ -54,6 +55,8 @@ pkg_postinst() {
 		elog "Splitted ebuild!, no support for Audio files"
 		elog "To play mp3, ogg and wav files,"
 		elog "emerge media-plugins/vdr-mp3ng -pv"
+		elog "or"
+		elog "emerge media-plugins/vdr-mp3 -pv"
 		echo
 	fi
 }
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.14-r2.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.14-r2.ebuild
deleted file mode 100644
index a5e618761c7d..000000000000
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.14-r2.ebuild
+++ /dev/null
@@ -1,55 +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-mplayer/vdr-mplayer-0.9.14-r2.ebuild,v 1.5 2007/01/05 16:38:29 hd_brummy Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="Video Disk Recorder Mplayer Plugin"
-HOMEPAGE="http://www.muempf.de/"
-SRC_URI="http://www.muempf.de/down/vdr-mp3-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.2.6"
-
-RDEPEND="${DEPEND}
-		>=media-video/mplayer-sh-0.8.6-r1
-		|| ( sys-apps/eject sys-block/unieject )"
-
-S=${WORKDIR}/mp3-${PV}
-
-PATCHES="${FILESDIR}/${P}-gentoo.diff
-		${FILESDIR}/${P}-resume.diff
-		${FILESDIR}/${P}-slave-mode-default.diff"
-
-src_install() {
-
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/mplayer
-	doins   ${FILESDIR}/mplayersources.conf
-
-	into /usr/share/vdr/mplayer
-	newbin examples/mount.sh.example mount-mplayer.sh
-
-	dodoc HISTORY MANUAL README examples/{image_convert,network}.sh.example
-}
-
-pkg_postinst() {
-
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Edit all config's /etc/vdr/plugins/mplayer"
-	echo
-
-	if ! has_version "media-plugins/vdr-mp3ng" ; then
-		elog "Splitted ebuild!, no support for Audio files"
-		elog "To play mp3, ogg and wav files,"
-		elog "emerge media-plugins/vdr-mp3ng -pv"
-		echo
-	fi
-}
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild
deleted file mode 100644
index f74f2905eefc..000000000000
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild
+++ /dev/null
@@ -1,56 +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-mplayer/vdr-mplayer-0.9.15.ebuild,v 1.8 2007/05/15 12:51:41 zzam Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="Video Disk Recorder Mplayer Plugin"
-HOMEPAGE="http://www.muempf.de/"
-SRC_URI="http://www.muempf.de/down/vdr-mp3-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.2"
-
-RDEPEND="${DEPEND}
-		>=media-video/mplayer-sh-0.8.6-r1
-		|| ( sys-apps/eject sys-block/unieject )"
-
-S=${WORKDIR}/mp3-${PV}
-
-PATCHES="
-	${FILESDIR}/${PV}/01_gentoo.diff
-	${FILESDIR}/${PV}/02_slave_mode_default.diff
-	${FILESDIR}/${PV}/03_vdr-1.5.1.diff"
-
-src_install() {
-
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/mplayer
-	doins   ${FILESDIR}/mplayersources.conf
-
-	into /usr/share/vdr/mplayer
-	newbin examples/mount.sh.example mount-mplayer.sh
-
-	dodoc HISTORY MANUAL README examples/{image_convert,network}.sh.example
-}
-
-pkg_postinst() {
-
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Edit all config's /etc/vdr/plugins/mplayer"
-	echo
-
-	if ! has_version "media-plugins/vdr-mp3ng" ; then
-		elog "Splitted ebuild!, no support for Audio files"
-		elog "To play mp3, ogg and wav files,"
-		elog "emerge media-plugins/vdr-mp3ng -pv"
-		echo
-	fi
-}