cleanup; vdr-plugin-2.eclass

(Portage version: 2.1.10.11/cvs/Linux i686)

17 files changed, 22 insertions, 703 deletions

diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog
index 8b5a29e7bea2..fbf230df731a 100644
--- a/media-plugins/vdr-burn/ChangeLog
+++ b/media-plugins/vdr-burn/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-plugins/vdr-burn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.54 2012/04/07 02:06:09 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.55 2012/06/30 18:45:04 hd_brummy Exp $
+
+  30 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-burn-0.1.0_pre22_p1.ebuild, -files/vdr-burn-0.1.0_pre22_p1-gentoo.diff,
+  -files/vdr-burn-0.1.0_pre22_p1-makefile.diff,
+  -files/vdr-burn-0.1.0_pre22_setdefaults-V2.diff,
+  -vdr-burn-0.2.0_beta1.ebuild, -vdr-burn-0.2.0_beta5-r1.ebuild,
+  vdr-burn-0.2.0.ebuild, -files/vdr-burn-0.2.0_beta1-gentoo-paths.diff,
+  -files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff,
+  -files/vdr-burn-0.2.0_beta1-makefile.diff,
+  -files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff,
+  -files/vdr-burn-0.2.0_beta1_ldflags.diff,
+  -files/vdr-burn-0.2.0_beta5_gentoo-path.diff,
+  -files/vdr-burn-0.2.0_beta5_ldflags.diff,
+  -files/vdr-burn-0.2.0_beta5_makefile.diff,
+  -files/vdr-burn-0.2.0_beta5_setdefaults.diff:
+  cleanup; vdr-plugin-2.eclass
 
   07 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-burn-0.2.0.ebuild,
   +files/vdr-1.7.27.diff:
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-gentoo.diff b/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-gentoo.diff
deleted file mode 100644
index 475767d21701..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-gentoo.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: burn-0.1.0-pre22-ff1/burn.c
-===================================================================
---- burn-0.1.0-pre22-ff1.orig/burn.c
-+++ burn-0.1.0-pre22-ff1/burn.c
-@@ -87,14 +87,14 @@ namespace vdr_burn
- 
- 	bool plugin::Start()
- 	{
--		m_configPath = ConfigDirectory(PLUGIN_NAME);
-+		m_configPath = "/usr/share/vdr/burn";
- 
- 		manager::start();
- 		logger_vdr::start();
- #if APIVERSNUM < 10507
- 		RegisterI18n( i18n::get_phrases() );
- #endif
--		gdwrapper::setup::set_font_path( m_configPath + "/fonts" );
-+		gdwrapper::setup::set_font_path( "/usr/share/fonts/ttf-bitstream-vera" );
- 		if ( !skin_list::get().load( get_config_path() ) )
- 			return false;
- 
-Index: burn-0.1.0-pre22-ff1/vdrburn-dvd.sh
-===================================================================
---- burn-0.1.0-pre22-ff1.orig/vdrburn-dvd.sh
-+++ burn-0.1.0-pre22-ff1/vdrburn-dvd.sh
-@@ -78,9 +78,8 @@ case $1 in
- 			CUT="-cut $MPEG_DATA_PATH/px.cut"
- 		fi
- 
--		$JAVA_HOME/bin/java -Djava.awt.headless=true \
--				-jar $PROJECTX_HOME/ProjectX.jar \
--				-ini $CONFIG_PATH/ProjectX.ini \
-+		/usr/bin/projectx_nogui \
-+				-ini /usr/share/vdr/burn/projectx-vdr.ini \
- 				$CUT \
- 				-demux -out "$MPEG_DATA_PATH" -name vdrsync \
- 				$(ls "$MPEG_TMP_PATH/convert/"[0-9][0-9][0-9]*.*)
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-makefile.diff b/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-makefile.diff
deleted file mode 100644
index d066b85abe0b..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-makefile.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: burn-0.1.0-pre21/Makefile
-===================================================================
---- burn-0.1.0-pre21.orig/Makefile
-+++ burn-0.1.0-pre21/Makefile
-@@ -133,7 +133,7 @@ all: libvdr-$(PLUGIN).so burn-buffers i1
- 
- SUBDIRS:
- 	@for dir in $(SUBDIRS); do \
--		make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
-+		$(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
- 	done
- 
- libvdr-$(PLUGIN).so: $(OBJS) SUBDIRS Makefile
-@@ -165,7 +165,7 @@ clean:
- 	@-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ burn-buffers \
- 		scan-test test t/*.o
- 	@for dir in $(SUBDIRS); do \
--		make -C $$dir clean ; \
-+		$(MAKE) -C $$dir clean ; \
- 	done
- 
- ### Implicit rules:
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_setdefaults-V2.diff b/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_setdefaults-V2.diff
deleted file mode 100644
index 4039d1a43a48..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_setdefaults-V2.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-will set a always missconfigured part to a default setup 
-remove the config part (RemovePath, RequantTyp)
-from osd plugin setup 
-
-12 Mar 2009 ,Joerg Bornkessel <hd_brummy@gentoo.org>
-
-diff -Naur burn-0.1.0-pre21.orig/setup.c burn-0.1.0-pre21/setup.c
---- burn-0.1.0-pre21.orig/setup.c	2009-03-12 03:33:46.387393024 +0100
-+++ burn-0.1.0-pre21/setup.c	2009-03-12 03:37:56.204037636 +0100
-@@ -83,11 +83,11 @@
- 	//!--- plugin_setup -----------------------------------------------------------
- 
- 	plugin_setup::plugin_setup():
--			PROCTOOLS_INIT_PROPERTY( RemovePath,          false ),
-+			PROCTOOLS_INIT_PROPERTY( RemovePath,          true ),
- 			PROCTOOLS_INIT_PROPERTY( CustomDiskSize,      200 ),
- 			PROCTOOLS_INIT_PROPERTY( BurnSpeed,           0 ),
- 			PROCTOOLS_INIT_PROPERTY( DemuxType,           demuxtype_vdrsync ),
--			PROCTOOLS_INIT_PROPERTY( RequantType,         requanttype_metakine ),
-+			PROCTOOLS_INIT_PROPERTY( RequantType,         requanttype_transcode ),
- 			PROCTOOLS_INIT_PROPERTY( PreserveLogFiles,    false ),
- 			PROCTOOLS_INIT_PROPERTY( DefaultLanguage,     0 ),
- 			PROCTOOLS_INIT_PROPERTY( MainMenuStatus,      true ),
-@@ -115,7 +115,7 @@
- 			PROCTOOLS_INIT_PROPERTY( SkinIndex,           0 ),
- 			PROCTOOLS_INIT_PROPERTY( ChaptersMode,        chaptersmode_10 ),
- 			PROCTOOLS_INIT_PROPERTY( StoreMode,           storemode_burn ),
--			PROCTOOLS_INIT_PROPERTY( DmhArchiveMode,      true ),
-+			PROCTOOLS_INIT_PROPERTY( DmhArchiveMode,      false ),
- 			PROCTOOLS_INIT_PROPERTY( DiskSize,            disksize_singlelayer ),
- 			PROCTOOLS_INIT_PROPERTY( CutOnDemux,          false ),
- 			PROCTOOLS_INIT_PROPERTY( SkipTitlemenu,       true ),
-@@ -199,9 +199,9 @@
- 		m_defaults = job_defaults();
- 
- 		Add( new menu::text_item( tr("--- Common settings --------------------------------------------------") ) );
--		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
-+//		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
- 		Add( new menu::list_edit_item( tr("Demux using"), m_setup.DemuxType, demuxtype_strings ) );
--		Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
-+//		Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
- 		Add( new menu::number_edit_item( tr("Burn speed"), m_setup.BurnSpeed, 0, 32, tr("unlimited") ) );
- 		Add( new menu::bool_edit_item( tr("Preserve logfiles"), m_setup.PreserveLogFiles ) );
- 		Add( new menu::list_edit_item( tr("Spare language code"), m_setup.DefaultLanguage, track_info::get_language_codes(), false ) );
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-paths.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-paths.diff
deleted file mode 100644
index ebb27bd131fe..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-paths.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: burn-0.2.0-beta1/burn.c
-===================================================================
---- burn-0.2.0-beta1.orig/burn.c
-+++ burn-0.2.0-beta1/burn.c
-@@ -96,11 +96,11 @@ namespace vdr_burn
- 
- 	bool plugin::Start()
- 	{
--		m_configPath = ConfigDirectory(PLUGIN_NAME);
-+		m_configPath = "/usr/share/vdr/burn";
- 
- 		manager::start();
- 		logger_vdr::start();
--		gdwrapper::setup::set_font_path( m_configPath + "/fonts" );
-+		gdwrapper::setup::set_font_path( "/usr/share/fonts/ttf-bitstream-vera" );
- 		if ( !skin_list::get().load( get_config_path() ) )
- 			return false;
- 
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff
deleted file mode 100644
index 3f31bedd4cbd..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: burn-0.2.0-beta1/vdrburn-dvd.sh
-===================================================================
---- burn-0.2.0-beta1.orig/vdrburn-dvd.sh
-+++ burn-0.2.0-beta1/vdrburn-dvd.sh
-@@ -111,9 +111,8 @@ case $1 in
- 			CUT="-cut $MPEG_DATA_PATH/px.cut"
- 		fi
- 
--		$JAVA_HOME/bin/java -Djava.awt.headless=true \
--				-jar $PROJECTX_HOME/ProjectX.jar \
--				-ini $CONFIG_PATH/ProjectX.ini \
-+		/usr/bin/projectx_nogui \
-+				-ini /usr/share/vdr/burn/projectx-vdr.ini \
- 				$TTXT_OPTS \
- 				$CUT -id $USED_TRACKS \
- 				-demux -out "$MPEG_DATA_PATH" -name vdrsync \
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-makefile.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-makefile.diff
deleted file mode 100644
index 20c2f80fb780..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-makefile.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: burn-0.2.0-beta1/Makefile
-===================================================================
---- burn-0.2.0-beta1.orig/Makefile
-+++ burn-0.2.0-beta1/Makefile
-@@ -136,7 +136,7 @@ all: libvdr-$(PLUGIN).so burn-buffers i1
- 
- SUBDIRS:
- 	@for dir in $(SUBDIRS); do \
--		make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
-+		$(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
- 	done
- 
- libvdr-$(PLUGIN).so: $(OBJS) SUBDIRS Makefile
-@@ -169,7 +169,7 @@ clean:
- 	@-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ burn-buffers \
- 		scan-test test t/*.o
- 	@for dir in $(SUBDIRS); do \
--		make -C $$dir clean ; \
-+		$(MAKE) -C $$dir clean ; \
- 	done
- 
- ### Implicit rules:
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff
deleted file mode 100644
index 1f6e80fd837c..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-will set a always missconfigured part to a default setup 
-remove the config part (RemovePath, RequantTyp)
-from osd plugin setup 
-
-12 Mar 2009 ,Joerg Bornkessel <hd_brummy@gentoo.org>
-
-Index: burn-0.2.0-beta1/setup.c
-===================================================================
---- burn-0.2.0-beta1.orig/setup.c
-+++ burn-0.2.0-beta1/setup.c
-@@ -88,11 +88,11 @@ bool cBurnParameters::ProcessArgs(int ar
- 	//!--- plugin_setup -----------------------------------------------------------
- 
- 	plugin_setup::plugin_setup():
--			PROCTOOLS_INIT_PROPERTY( RemovePath,          false ),
-+			PROCTOOLS_INIT_PROPERTY( RemovePath,          true ),
- 			PROCTOOLS_INIT_PROPERTY( CustomDiskSize,      200 ),
- 			PROCTOOLS_INIT_PROPERTY( BurnSpeed,           0 ),
- 			PROCTOOLS_INIT_PROPERTY( DemuxType,           demuxtype_vdrsync ),
--			PROCTOOLS_INIT_PROPERTY( RequantType,         requanttype_metakine ),
-+			PROCTOOLS_INIT_PROPERTY( RequantType,         requanttype_transcode ),
- 			PROCTOOLS_INIT_PROPERTY( PreserveLogFiles,    false ),
- 			PROCTOOLS_INIT_PROPERTY( DefaultLanguage,     0 ),
- 			PROCTOOLS_INIT_PROPERTY( MainMenuStatus,      true ),
-@@ -120,7 +120,7 @@ bool cBurnParameters::ProcessArgs(int ar
- 			PROCTOOLS_INIT_PROPERTY( SkinIndex,           0 ),
- 			PROCTOOLS_INIT_PROPERTY( ChaptersMode,        chaptersmode_10 ),
- 			PROCTOOLS_INIT_PROPERTY( StoreMode,           storemode_burn ),
--			PROCTOOLS_INIT_PROPERTY( DmhArchiveMode,      true ),
-+			PROCTOOLS_INIT_PROPERTY( DmhArchiveMode,      false ),
- 			PROCTOOLS_INIT_PROPERTY( DiskSize,            disksize_singlelayer ),
- 			PROCTOOLS_INIT_PROPERTY( CutOnDemux,          false ),
- 			PROCTOOLS_INIT_PROPERTY( SkipTitlemenu,       true ),
-@@ -204,9 +204,9 @@ bool cBurnParameters::ProcessArgs(int ar
- 		m_defaults = job_defaults();
- 
- 		Add( new menu::text_item( tr("--- Common settings --------------------------------------------------") ) );
--		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
-+//		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
- 		Add( new menu::list_edit_item( tr("Demux using"), m_setup.DemuxType, demuxtype_strings ) );
--		Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
-+//		Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
- 		Add( new menu::number_edit_item( tr("Burn speed"), m_setup.BurnSpeed, 0, 32, tr("unlimited") ) );
- 		Add( new menu::bool_edit_item( tr("Preserve logfiles"), m_setup.PreserveLogFiles ) );
- 		Add( new menu::list_edit_item( tr("Spare language code"), m_setup.DefaultLanguage, track_info::get_language_codes(), false ) );
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1_ldflags.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1_ldflags.diff
deleted file mode 100644
index 1e5e4dc1bdcc..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1_ldflags.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur burn-0.2.0-beta1.orig/Makefile burn-0.2.0-beta1/Makefile
---- burn-0.2.0-beta1.orig/Makefile	2010-12-02 18:05:06.000000000 +0100
-+++ burn-0.2.0-beta1/Makefile	2010-12-02 18:05:35.000000000 +0100
-@@ -145,7 +145,7 @@
- 	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- burn-buffers: buffers.o
--	$(CXX) $(CXXFLAGS) $< -o $@
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $< -o $@
- 
- scan-test: $(OBJS) proctools scan-test.o
- 	$(CXX) $(CXXFLAGS) scan-test.o $(OBJS) -o $@ \
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff
deleted file mode 100644
index 81f1e4311f04..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-some path adaption to gentoo
-
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Feb 2011)
-diff -Naur burn-0.2.0-beta5.orig/burn.c burn-0.2.0-beta5/burn.c
---- burn-0.2.0-beta5.orig/burn.c	2011-02-02 01:04:23.000000000 +0100
-+++ burn-0.2.0-beta5/burn.c	2011-02-02 01:10:36.000000000 +0100
-@@ -96,11 +96,11 @@
- 
- 	bool plugin::Start()
- 	{
--		m_configPath = ConfigDirectory(PLUGIN_NAME);
-+		m_configPath = "/usr/share/vdr/burn";
- 
- 		manager::start();
- 		logger_vdr::start();
--		gdwrapper::setup::set_font_path( m_configPath + "/fonts" );
-+		gdwrapper::setup::set_font_path( "/usr/share/fonts/ttf-bitstream-vera" );
- 		if ( !skin_list::get().load( get_config_path() ) )
- 			return false;
- 
-diff -Naur burn-0.2.0-beta5.orig/vdrburn-dvd.sh burn-0.2.0-beta5/vdrburn-dvd.sh
---- burn-0.2.0-beta5.orig/vdrburn-dvd.sh	2011-02-02 01:04:23.000000000 +0100
-+++ burn-0.2.0-beta5/vdrburn-dvd.sh	2011-02-02 01:07:21.000000000 +0100
-@@ -113,9 +113,8 @@
- 			CUT="-cut $MPEG_DATA_PATH/px.cut"
- 		fi
- 
--		$JAVA_HOME/bin/java -Djava.awt.headless=true \
--				-jar $PROJECTX_HOME/ProjectX.jar \
--				-ini $CONFIG_PATH/ProjectX.ini \
-+				/usr/bin/projectx_nogui \
-+				-ini /usr/share/vdr/burn/projectx-vdr.ini \
- 				$TTXT_OPTS \
- 				$CUT -id $USED_TRACKS \
- 				-demux -out "$MPEG_DATA_PATH" -name vdrsync \
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_ldflags.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_ldflags.diff
deleted file mode 100644
index 1e5e4dc1bdcc..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_ldflags.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur burn-0.2.0-beta1.orig/Makefile burn-0.2.0-beta1/Makefile
---- burn-0.2.0-beta1.orig/Makefile	2010-12-02 18:05:06.000000000 +0100
-+++ burn-0.2.0-beta1/Makefile	2010-12-02 18:05:35.000000000 +0100
-@@ -145,7 +145,7 @@
- 	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- burn-buffers: buffers.o
--	$(CXX) $(CXXFLAGS) $< -o $@
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $< -o $@
- 
- scan-test: $(OBJS) proctools scan-test.o
- 	$(CXX) $(CXXFLAGS) scan-test.o $(OBJS) -o $@ \
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff
deleted file mode 100644
index 99c29aa4d7f9..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-fix for fails to build with parallel make
-
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Feb 2011)
-diff -Naur burn-0.2.0-beta5.orig/Makefile burn-0.2.0-beta5/Makefile
---- burn-0.2.0-beta5.orig/Makefile	2011-02-02 01:32:42.000000000 +0100
-+++ burn-0.2.0-beta5/Makefile	2011-02-02 01:34:20.000000000 +0100
-@@ -9,6 +9,9 @@
- #
- PLUGIN = burn
- 
-+# Enable DMH Archive
-+#ENABLE_DMH_ARCHIVE = 1
-+
- ### The version number of this plugin (taken from the main source file):
- 
- VERSION = $(shell grep 'const char\* plugin::VERSION *=' $(PLUGIN).c | awk '{ print $$5 }' | sed -e 's/[";]//g')
-@@ -144,7 +147,7 @@
- 
- SUBDIRS:
- 	@for dir in $(SUBDIRS); do \
--		make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
-+		$(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
- 	done
- 
- libvdr-$(PLUGIN).so: $(OBJS) SUBDIRS Makefile
-@@ -176,7 +179,7 @@
- 	@-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ burn-buffers \
- 		scan-test test t/*.o
- 	@for dir in $(SUBDIRS); do \
--		make -C $$dir clean ; \
-+		$(MAKE) -C $$dir clean ; \
- 	done
- 
- ### Implicit rules:
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff
deleted file mode 100644
index c0973eec2e80..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-set default settings
-unset gentoo unsupportede packages (m2vrequantizer)
-disable unneeded menuentrys
-
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Feb 2011)
-diff -Naur burn-0.2.0-beta5.orig/setup.c burn-0.2.0-beta5/setup.c
---- burn-0.2.0-beta5.orig/setup.c	2011-02-02 01:16:48.000000000 +0100
-+++ burn-0.2.0-beta5/setup.c	2011-02-02 01:22:35.000000000 +0100
-@@ -88,11 +88,11 @@
- 	//!--- plugin_setup -----------------------------------------------------------
- 
- 	plugin_setup::plugin_setup():
--			PROCTOOLS_INIT_PROPERTY( RemovePath,          false ),
-+			PROCTOOLS_INIT_PROPERTY( RemovePath,          true ),
- 			PROCTOOLS_INIT_PROPERTY( CustomDiskSize,      200 ),
- 			PROCTOOLS_INIT_PROPERTY( BurnSpeed,           0 ),
- 			PROCTOOLS_INIT_PROPERTY( DemuxType,           demuxtype_projectx ),
--			PROCTOOLS_INIT_PROPERTY( RequantType,         requanttype_metakine ),
-+			PROCTOOLS_INIT_PROPERTY( RequantType,         requanttype_transcode ),
- 			PROCTOOLS_INIT_PROPERTY( PreserveLogFiles,    false ),
- 			PROCTOOLS_INIT_PROPERTY( DefaultLanguage,     0 ),
- 			PROCTOOLS_INIT_PROPERTY( MainMenuStatus,      true ),
-@@ -217,9 +217,9 @@
- 		m_defaults = job_defaults();
- 
- 		Add( new menu::text_item( tr("--- Common settings --------------------------------------------------") ) );
--		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
-+//		Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
- 		Add( new menu::list_edit_item( tr("Demux using"), m_setup.DemuxType, demuxtype_strings ) );
--		Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
-+//		Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
- 		Add( new menu::number_edit_item( tr("Burn speed"), m_setup.BurnSpeed, 0, 32, tr("unlimited") ) );
- 		Add( new menu::bool_edit_item( tr("Preserve logfiles"), m_setup.PreserveLogFiles ) );
- 		Add( new menu::list_edit_item( tr("Spare language code"), m_setup.DefaultLanguage, track_info::get_language_codes(), false ) );
diff --git a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre22_p1.ebuild b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre22_p1.ebuild
deleted file mode 100644
index 87ac155fb6b2..000000000000
--- a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre22_p1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.1.0_pre22_p1.ebuild,v 1.3 2011/01/28 17:53:27 hd_brummy Exp $
-
-EAPI="3"
-
-inherit vdr-plugin eutils
-
-MY_P="${P/_/-}"
-MY_P="${MY_P/_p/-ff}"
-
-S="${WORKDIR}/${MY_P#vdr-}"
-
-DESCRIPTION="VDR: DVD Burn Plugin"
-HOMEPAGE="http://www.vdrportal.de/board/thread.php?threadid=87788"
-SRC_URI="http://firefly.vdr-developer.org/patches/${MY_P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="projectx"
-RESTRICT="test"
-
-PATCHES=("${FILESDIR}/vdr-burn-0.1.0_pre22_p1-makefile.diff"
-	"${FILESDIR}/vdr-burn-0.1.0_pre22_p1-gentoo.diff"
-	"${FILESDIR}/vdr-burn-0.1.0_pre22_setdefaults-V2.diff")
-
-DEPEND=">=media-video/vdr-1.6
-		>=dev-libs/libcdio-0.71
-		media-libs/gd[png,truetype,jpeg]"
-
-RDEPEND="${DEPEND}
-		>=media-video/dvdauthor-0.6.10
-		>=media-video/mjpegtools-1.6.2[png]
-		>=media-video/vdrsync-0.1.3_pre1-r5
-		media-video/transcode
-		media-fonts/ttf-bitstream-vera
-		media-video/vdrtools-genindex
-		virtual/eject
-		virtual/cdrtools
-		>=app-cdr/dvd+rw-tools-5.21
-		projectx? ( >=media-video/projectx-0.90.4.00-r3 )"
-
-# depends that are not rdepend
-DEPEND="${DEPEND}
-		>=dev-libs/boost-1.32.0"
-
-VDR_CONFD_FILE="${FILESDIR}/confd"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon.sh"
-
-pkg_setup() {
-	local error=0
-
-	if use projectx && [[ ! -d /usr/share/java-config-2 ]] ; then
-		eerror
-		eerror "ProjectX need an upgraded version of your Java install"
-		eerror "Please upgrade your Java/Java-config install"
-		eerror "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml"
-		eerror
-		die "Requirements not satisfied"
-	fi
-
-	vdr-plugin_pkg_setup
-}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-	sed -i Makefile \
-		-e 's#^TMPDIR = .*$#TMPDIR = /tmp#' \
-		-e 's#^ISODIR=.*$#ISODIR=/var/vdr/video/dvd-images#'
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	dobin "${S}"/burn-buffers
-	dobin "${S}"/*.sh
-
-	insinto /usr/share/vdr/burn
-	doins "${S}"/burn/menu-silence.mp2
-	newins "${S}"/burn/menu-button.png menu-button-default.png
-	newins "${S}"/burn/menu-bg.png menu-bg-default.png
-	dosym menu-bg-default.png /usr/share/vdr/burn/menu-bg.png
-	dosym menu-button-default.png /usr/share/vdr/burn/menu-button.png
-
-	use projectx && newins "${S}"/burn/ProjectX.ini projectx-vdr.ini
-
-	fowners -R vdr:vdr /usr/share/vdr/burn
-
-	(
-		diropts -ovdr -gvdr
-		keepdir /usr/share/vdr/burn/counters
-	)
-}
-
-pkg_preinst() {
-	if [[ -d ${ROOT}/etc/vdr/plugins/burn && ( ! -L ${ROOT}/etc/vdr/plugins/burn ) ]]; then
-		einfo "Moving /etc/vdr/plugins/burn away"
-		mv "${ROOT}"/etc/vdr/plugins/burn "${ROOT}"/etc/vdr/plugins/burn_old
-	fi
-}
-
-pkg_postinst() {
-
-	local DMH_FILE="${ROOT}/usr/share/vdr/burn/counters/standard"
-	if [[ ! -e "${DMH_FILE}" ]]; then
-		echo 0001 > "${DMH_FILE}"
-		chown vdr:vdr "${DMH_FILE}"
-	fi
-
-	vdr-plugin_pkg_postinst
-
-	einfo
-	einfo "This ebuild comes only with the standard template"
-	einfo "'emerge vdr-burn-templates' for more templates"
-	einfo "To change the templates, use the vdr-image plugin"
-
-	if [[ -e ${ROOT}/etc/vdr/reccmds/reccmds.burn.conf ]]; then
-		eerror
-		eerror "Please remove the following unneeded file:"
-		eerror "\t/etc/vdr/reccmds/reccmds.burn.conf"
-		eerror
-	fi
-}
diff --git a/media-plugins/vdr-burn/vdr-burn-0.2.0.ebuild b/media-plugins/vdr-burn/vdr-burn-0.2.0.ebuild
index ee95a9cb4bf0..35f5210a90bf 100644
--- a/media-plugins/vdr-burn/vdr-burn-0.2.0.ebuild
+++ b/media-plugins/vdr-burn/vdr-burn-0.2.0.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.2.0.ebuild,v 1.3 2012/04/07 02:06:09 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.2.0.ebuild,v 1.4 2012/06/30 18:45:04 hd_brummy Exp $
 
 EAPI="4"
 
-inherit vdr-plugin
+inherit vdr-plugin-2
 
 VERSION="832" # every bump, new version!
 
-#RESTRICT="test"
-
 DESCRIPTION="VDR Plugin: burn records on DVD"
 HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-burn"
 SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
@@ -39,7 +37,7 @@ DEPEND="${DEPEND}
 S="${WORKDIR}/${P#vdr-}"
 
 src_prepare() {
-	vdr-plugin_src_prepare
+	vdr-plugin-2_src_prepare
 
 	epatch "${FILESDIR}/${P}_gentoo-path.diff"
 	epatch "${FILESDIR}/${P}_setdefaults.diff"
@@ -62,7 +60,7 @@ src_prepare() {
 }
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
 	dobin "${S}"/*.sh
 
@@ -98,7 +96,7 @@ pkg_postinst() {
 		chown vdr:vdr "${DMH_FILE}"
 	fi
 
-	vdr-plugin_pkg_postinst
+	vdr-plugin-2_pkg_postinst
 
 	einfo
 	einfo "This ebuild comes only with the standard template"
diff --git a/media-plugins/vdr-burn/vdr-burn-0.2.0_beta1.ebuild b/media-plugins/vdr-burn/vdr-burn-0.2.0_beta1.ebuild
deleted file mode 100644
index add25afc1ff7..000000000000
--- a/media-plugins/vdr-burn/vdr-burn-0.2.0_beta1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.2.0_beta1.ebuild,v 1.4 2011/01/28 17:53:27 hd_brummy Exp $
-
-EAPI="3"
-
-inherit vdr-plugin eutils
-
-MY_P="${P/_/-}"
-
-S="${WORKDIR}/${MY_P#vdr-}"
-
-DESCRIPTION="VDR: DVD Burn Plugin"
-HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=93998"
-SRC_URI="http://firefly.vdr-developer.org/patches/${MY_P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+projectx"
-RESTRICT="test"
-
-DEPEND=">=media-video/vdr-1.6
-		>=dev-libs/libcdio-0.71
-		media-libs/gd[png,truetype,jpeg]"
-
-RDEPEND="${DEPEND}
-		>=media-video/dvdauthor-0.6.10
-		>=media-video/mjpegtools-1.6.2[png]
-		>=media-video/vdrsync-0.1.3_pre1-r5
-		media-video/transcode
-		media-fonts/ttf-bitstream-vera
-		media-video/vdrtools-genindex
-		virtual/eject
-		virtual/cdrtools
-		>=app-cdr/dvd+rw-tools-5.21
-		projectx? ( >=media-video/projectx-0.90.4.00_p32 )"
-
-# depends that are not rdepend
-DEPEND="${DEPEND}
-		>=dev-libs/boost-1.32.0"
-
-VDR_CONFD_FILE="${FILESDIR}/confd"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon.sh"
-
-pkg_setup() {
-	local error=0
-
-	if use projectx && [[ ! -d /usr/share/java-config-2 ]] ; then
-		eerror
-		eerror "ProjectX need an upgraded version of your Java install"
-		eerror "Please upgrade your Java/Java-config install"
-		eerror "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml"
-		eerror
-		die "Requirements not satisfied"
-	fi
-
-	vdr-plugin_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.diff"
-	epatch "${FILESDIR}/${P}-gentoo-projectx.diff"
-	epatch "${FILESDIR}/${P}-gentoo-paths.diff"
-	epatch "${FILESDIR}/${P}-setdefaults-V2.diff"
-	epatch "${FILESDIR}/${P}_ldflags.diff"
-
-	vdr-plugin_src_prepare
-
-	cd "${S}"
-	sed -i Makefile \
-		-e 's#^TMPDIR = .*$#TMPDIR = /tmp#' \
-		-e 's#^ISODIR=.*$#ISODIR=/var/vdr/video/dvd-images#'
-	fix_vdr_libsi_include scanner.c
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	dobin "${S}"/burn-buffers
-	dobin "${S}"/*.sh
-
-	insinto /usr/share/vdr/burn
-	doins "${S}"/burn/menu-silence.mp2
-	newins "${S}"/burn/menu-button.png menu-button-default.png
-	newins "${S}"/burn/menu-bg.png menu-bg-default.png
-	dosym menu-bg-default.png /usr/share/vdr/burn/menu-bg.png
-	dosym menu-button-default.png /usr/share/vdr/burn/menu-button.png
-
-	use projectx && newins "${S}"/burn/ProjectX.ini projectx-vdr.ini
-
-	fowners -R vdr:vdr /usr/share/vdr/burn
-
-	(
-		diropts -ovdr -gvdr
-		keepdir /usr/share/vdr/burn/counters
-	)
-}
-
-pkg_preinst() {
-	if [[ -d ${ROOT}/etc/vdr/plugins/burn && ( ! -L ${ROOT}/etc/vdr/plugins/burn ) ]]; then
-		einfo "Moving /etc/vdr/plugins/burn away"
-		mv "${ROOT}"/etc/vdr/plugins/burn "${ROOT}"/etc/vdr/plugins/burn_old
-	fi
-}
-
-pkg_postinst() {
-
-	local DMH_FILE="${ROOT}/usr/share/vdr/burn/counters/standard"
-	if [[ ! -e "${DMH_FILE}" ]]; then
-		echo 0001 > "${DMH_FILE}"
-		chown vdr:vdr "${DMH_FILE}"
-	fi
-
-	vdr-plugin_pkg_postinst
-
-	einfo
-	einfo "This ebuild comes only with the standard template"
-	einfo "'emerge vdr-burn-templates' for more templates"
-	einfo "To change the templates, use the vdr-image plugin"
-
-	if [[ -e ${ROOT}/etc/vdr/reccmds/reccmds.burn.conf ]]; then
-		eerror
-		eerror "Please remove the following unneeded file:"
-		eerror "\t/etc/vdr/reccmds/reccmds.burn.conf"
-		eerror
-	fi
-}
diff --git a/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5-r1.ebuild b/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5-r1.ebuild
deleted file mode 100644
index 2a01211c56a5..000000000000
--- a/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.2.0_beta5-r1.ebuild,v 1.2 2012/02/15 21:21:52 hd_brummy Exp $
-
-EAPI="3"
-
-inherit vdr-plugin versionator
-
-VERSION="437" # every bump, new version!
-
-RESTRICT="test"
-
-MY_P="${PN}-$(replace_version_separator 3 -)"
-
-DESCRIPTION="VDR Plugin: burn records on DVD"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-burn"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${MY_P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="dvdarchive"
-
-DEPEND=">=media-video/vdr-1.6
-		media-libs/gd[png,truetype,jpeg]"
-RDEPEND="${DEPEND}
-		>=dev-libs/libcdio-0.71
-		>=media-video/dvdauthor-0.6.10
-		>=media-video/mjpegtools-1.6.2[png]
-		media-video/transcode
-		media-fonts/ttf-bitstream-vera
-		virtual/eject
-		>=app-cdr/dvd+rw-tools-5.21
-		>=media-video/projectx-0.90.4.00_p32
-		dvdarchive? ( media-video/vdrtools-genindex )"
-
-# depends that are not rdepend
-DEPEND="${DEPEND}
-		>=dev-libs/boost-1.32.0"
-
-S="${WORKDIR}/${MY_P#vdr-}"
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	epatch "${FILESDIR}/${P}_gentoo-path.diff"
-	epatch "${FILESDIR}/${P}_setdefaults.diff"
-	epatch "${FILESDIR}/${P}_makefile.diff"
-	epatch "${FILESDIR}/${P}_ldflags.diff"
-
-	use dvdarchive && sed -i Makefile \
-		-e "s:#ENABLE_DMH_ARCHIVE:ENABLE_DMH_ARCHIVE:"
-
-	sed -i Makefile \
-		-e 's:^TMPDIR = .*$:TMPDIR = /tmp:' \
-		-e 's:^ISODIR=.*$:ISODIR=/var/vdr/video/dvd-images:'
-
-	fix_vdr_libsi_include scanner.c
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	dobin "${S}"/burn-buffers
-	dobin "${S}"/*.sh
-
-	insinto /usr/share/vdr/burn
-	doins "${S}"/burn/menu-silence.mp2
-	newins "${S}"/burn/menu-button.png menu-button-default.png
-	newins "${S}"/burn/menu-bg.png menu-bg-default.png
-	dosym menu-bg-default.png /usr/share/vdr/burn/menu-bg.png
-	dosym menu-button-default.png /usr/share/vdr/burn/menu-button.png
-
-	newins "${S}"/burn/ProjectX.ini projectx-vdr.ini
-
-	fowners -R vdr:vdr /usr/share/vdr/burn
-
-	(
-		diropts -ovdr -gvdr
-		keepdir /usr/share/vdr/burn/counters
-	)
-}
-
-pkg_preinst() {
-	if [[ -d ${ROOT}/etc/vdr/plugins/burn && ( ! -L ${ROOT}/etc/vdr/plugins/burn ) ]]; then
-		einfo "Moving /etc/vdr/plugins/burn away"
-		mv "${ROOT}"/etc/vdr/plugins/burn "${ROOT}"/etc/vdr/plugins/burn_old
-	fi
-}
-
-pkg_postinst() {
-
-	local DMH_FILE="${ROOT}/usr/share/vdr/burn/counters/standard"
-	if [[ ! -e "${DMH_FILE}" ]]; then
-		echo 0001 > "${DMH_FILE}"
-		chown vdr:vdr "${DMH_FILE}"
-	fi
-
-	vdr-plugin_pkg_postinst
-
-	einfo
-	einfo "This ebuild comes only with the standard template"
-	einfo "'emerge vdr-burn-templates' for more templates"
-	einfo "To change the templates, use the vdr-image plugin"
-
-	if [[ -e ${ROOT}/etc/vdr/reccmds/reccmds.burn.conf ]]; then
-		eerror
-		eerror "Please remove the following unneeded file:"
-		eerror "\t/etc/vdr/reccmds/reccmds.burn.conf"
-		eerror
-	fi
-}