clean up; eapi=4; vdr-plugin-2.eclass; missing xgettext handling added, thanks to E.Seifert on bug 414247

(Portage version: 2.1.11.9/cvs/Linux i686)

6 files changed, 315 insertions, 50 deletions

diff --git a/media-plugins/vdr-vcd/ChangeLog b/media-plugins/vdr-vcd/ChangeLog
index 1572716c2794..df8c1aa67751 100644
--- a/media-plugins/vdr-vcd/ChangeLog
+++ b/media-plugins/vdr-vcd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-vcd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/ChangeLog,v 1.11 2009/05/07 15:23:34 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/ChangeLog,v 1.12 2012/11/02 19:14:44 hd_brummy Exp $
+
+*vdr-vcd-0.9-r1 (02 Nov 2012)
+
+  02 Nov 2012; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-vcd-0.7.ebuild,
+  -vdr-vcd-0.8.ebuild, vdr-vcd-0.9.ebuild, +vdr-vcd-0.9-r1.ebuild,
+  +files/vdr-vcd-0.9_xgettext.diff:
+  clean up; eapi=4; vdr-plugin-2.eclass; missing xgettext handling added,
+  thanks to E.Seifert on bug 414247
 
   07 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-vcd-0.9.ebuild,
   +files/vdr-vcd-0.9_vdr-1.7.2.diff:
diff --git a/media-plugins/vdr-vcd/files/vdr-vcd-0.9_xgettext.diff b/media-plugins/vdr-vcd/files/vdr-vcd-0.9_xgettext.diff
new file mode 100644
index 000000000000..6228cc7319fe
--- /dev/null
+++ b/media-plugins/vdr-vcd/files/vdr-vcd-0.9_xgettext.diff
@@ -0,0 +1,271 @@
+https://bugs.gentoo.org/show_bug.cgi?id=414247
+fixed missing xgettext
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2012/11/02 )
+diff -Naur vcd-0.9.old/Makefile vcd-0.9/Makefile
+--- vcd-0.9.old/Makefile	2008-01-16 16:29:39.000000000 +0100
++++ vcd-0.9/Makefile	2012-10-30 14:06:02.163762996 +0100
+@@ -53,7 +53,7 @@
+ 
+ ### The object files (add further files here):
+ 
+-OBJS = $(PLUGIN).o functions.o i18n.o menu.o player.o viewer.o setup.o menucontrol.o psd.o psdcontrol.o
++OBJS = $(PLUGIN).o functions.o menu.o player.o viewer.o setup.o menucontrol.o psd.o psdcontrol.o
+ 
+ ### Implicit rules:
+ 
+@@ -69,9 +69,34 @@
+ 
+ -include $(DEPFILE)
+ 
++### Internationalization (I18N):
++
++PODIR     = po
++LOCALEDIR = $(VDRDIR)/locale
++I18Npo    = $(wildcard $(PODIR)/*.po)
++I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
++I18Npot   = $(PODIR)/$(PLUGIN).pot
++
++%.mo: %.po
++	msgfmt -c -o $@ $<
++
++$(I18Npot): $(wildcard *.c)
++	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<dev@erichseifert.de>' -o $@ $^
++
++%.po: $(I18Npot)
++	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
++	@touch $@
++
++$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
++	@mkdir -p $(dir $@)
++	cp $< $@
++
++.PHONY: i18n
++i18n: $(I18Nmsgs)
++
+ ### Targets:
+ 
+-all: libvdr-$(PLUGIN).so
++all: libvdr-$(PLUGIN).so i18n
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+@@ -86,4 +111,5 @@
+ 	@echo Distribution package created as $(PACKAGE).tgz
+ 
+ clean:
++	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+ 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+diff -Naur vcd-0.9.old/menu.c vcd-0.9/menu.c
+--- vcd-0.9.old/menu.c	2008-01-20 17:59:46.000000000 +0100
++++ vcd-0.9/menu.c	2012-10-30 14:04:10.837681821 +0100
+@@ -26,7 +26,7 @@
+ 
+ #include <vdr/interface.h>
+ #include <vdr/status.h>
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "menu.h"
+ #include "functions.h"
+ #include "setup.h"
+diff -Naur vcd-0.9.old/menucontrol.c vcd-0.9/menucontrol.c
+--- vcd-0.9.old/menucontrol.c	2008-01-16 13:43:39.000000000 +0100
++++ vcd-0.9/menucontrol.c	2012-10-30 14:03:43.051660837 +0100
+@@ -26,7 +26,7 @@
+ 
+ #include <vdr/interface.h>
+ #include <vdr/status.h>
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "menu.h"
+ #include "functions.h"
+ #include "setup.h"
+diff -Naur vcd-0.9.old/po/de_DE.po vcd-0.9/po/de_DE.po
+--- vcd-0.9.old/po/de_DE.po	1970-01-01 01:00:00.000000000 +0100
++++ vcd-0.9/po/de_DE.po	2012-10-30 14:08:28.409871746 +0100
+@@ -0,0 +1,62 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls@tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Klaus Schmidinger <kls@tvdr.de>, 2000
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.7.27\n"
++"Report-Msgid-Bugs-To: <dev@erichseifert.de>\n"
++"POT-Creation-Date: 2012-10-30 14:10+0200\n"
++"PO-Revision-Date: 2012-10-30 14:10+0200\n"
++"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
++"Language-Team: <vdr@linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++msgid "VideoCD"
++msgstr "VideoCD"
++
++msgid "No VideoCD detected"
++msgstr "Keine VideoCD erkannt"
++
++msgid "Eject"
++msgstr "Auswerfen"
++
++msgid "Key$Play"
++msgstr ""
++
++msgid "Tracks"
++msgstr "Tracks"
++
++msgid "SPI"
++msgstr "SPI"
++
++msgid "Jump: "
++msgstr ""
++
++msgid "VCD"
++msgstr "VCD"
++
++msgid "Setup.VCD$Drive speed"
++msgstr "Laufwerkgeschwindigkeit"
++
++msgid "Setup.VCD$Broken mode"
++msgstr "Nicht standardkonform"
++
++msgid "Setup.VCD$Hide main menu entry"
++msgstr "Hauptmenüeintrag ausblenden"
++
++msgid "Setup.VCD$Play tracks continuously"
++msgstr "Tracks nacheinander abspielen"
++
++msgid "Setup.VCD$Autostart replay"
++msgstr "Wiedergabe automatisch starten"
++
++msgid "Setup.VCD$Play sequence replay"
++msgstr "Wiedergabe nach Sequenz"
++
++msgid "No disc inserted"
++msgstr "Keine CD eingelegt"
+diff -Naur vcd-0.9.old/po/it_IT.po vcd-0.9/po/it_IT.po
+--- vcd-0.9.old/po/it_IT.po	1970-01-01 01:00:00.000000000 +0100
++++ vcd-0.9/po/it_IT.po	2012-10-30 14:08:28.414871756 +0100
+@@ -0,0 +1,64 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls@tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Alberto Carraro <bertocar@tin.it>, 2001
++# Antonio Ospite <ospite@studenti.unina.it>, 2003
++# Sean Carlos <seanc@libero.it>, 2005
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.7.27\n"
++"Report-Msgid-Bugs-To: <dev@erichseifert.de>\n"
++"POT-Creation-Date: 2012-10-30 14:10+0200\n"
++"PO-Revision-Date: 2012-10-30 14:10+0200\n"
++"Last-Translator: Sean Carlos <seanc@libero.it>\n"
++"Language-Team: <vdr@linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++msgid "VideoCD"
++msgstr "VideoCD"
++
++msgid "No VideoCD detected"
++msgstr "Nessun VideoCD trovato"
++
++msgid "Eject"
++msgstr "Eject"
++
++msgid "Key$Play"
++msgstr ""
++
++msgid "Tracks"
++msgstr "Tracce"
++
++msgid "SPI"
++msgstr "SPI"
++
++msgid "Jump: "
++msgstr ""
++
++msgid "VCD"
++msgstr "VCD"
++
++msgid "Setup.VCD$Drive speed"
++msgstr "Velocità lettore"
++
++msgid "Setup.VCD$Broken mode"
++msgstr "Mod. non standard"
++
++msgid "Setup.VCD$Hide main menu entry"
++msgstr "Nascondi voce nel menu principale"
++
++msgid "Setup.VCD$Play tracks continuously"
++msgstr "Riproduci tracce in modo continuo"
++
++msgid "Setup.VCD$Autostart replay"
++msgstr "Riproduzione automatica all'avvio"
++
++msgid "Setup.VCD$Play sequence replay"
++msgstr "Riproduci in sequenza"
++
++msgid "No disc inserted"
++msgstr "Nessun disco inserito"
+diff -Naur vcd-0.9.old/psd.c vcd-0.9/psd.c
+--- vcd-0.9.old/psd.c	2008-01-20 17:59:59.000000000 +0100
++++ vcd-0.9/psd.c	2012-10-30 14:02:55.840626223 +0100
+@@ -21,7 +21,7 @@
+  */
+ 
+ 
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "psd.h"
+ #include "psdcontrol.h"
+ 
+diff -Naur vcd-0.9.old/psdcontrol.c vcd-0.9/psdcontrol.c
+--- vcd-0.9.old/psdcontrol.c	2008-01-16 13:30:53.000000000 +0100
++++ vcd-0.9/psdcontrol.c	2012-10-30 14:02:42.015616358 +0100
+@@ -27,7 +27,7 @@
+ 
+ #include <vdr/interface.h>
+ #include <vdr/status.h>
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "functions.h"
+ #include "setup.h"
+ #include "psdcontrol.h"
+diff -Naur vcd-0.9.old/setup.c vcd-0.9/setup.c
+--- vcd-0.9.old/setup.c	2008-01-15 16:27:44.000000000 +0100
++++ vcd-0.9/setup.c	2012-10-30 14:02:26.782605650 +0100
+@@ -22,7 +22,7 @@
+ 
+ #include <vdr/menuitems.h>
+ #include "setup.h"
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ 
+ cVcdSetupData VcdSetupData;
+ 
+diff -Naur vcd-0.9.old/vcd.c vcd-0.9/vcd.c
+--- vcd-0.9.old/vcd.c	2008-01-16 13:33:17.000000000 +0100
++++ vcd-0.9/vcd.c	2012-10-30 14:01:52.628580657 +0100
+@@ -25,7 +25,7 @@
+ #include <vdr/interface.h>
+ #include <vdr/plugin.h>
+ #include "functions.h"
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "menu.h"
+ #include "menucontrol.h"
+ #include "psdcontrol.h"
+@@ -100,7 +100,6 @@
+ 
+ bool cPluginVcd::Start(void)
+ {
+-  RegisterI18n(Phrases);
+   if (option_vcd)
+      vcd = new cVcd(option_vcd);
+   else
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.7.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.7.ebuild
deleted file mode 100644
index 8db6f608f6e1..000000000000
--- a/media-plugins/vdr-vcd/vdr-vcd-0.7.ebuild
+++ /dev/null
@@ -1,28 +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-vcd/vdr-vcd-0.7.ebuild,v 1.7 2008/04/23 14:25:16 zzam Exp $
-
-inherit eutils vdr-plugin
-
-DESCRIPTION="VDR plugin: play video cds"
-
-HOMEPAGE="http://vdr.heiligenmann.de/vdr/"
-SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz
-		mirror://vdrfiles/${PN}/vcd-0.7.patch"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.18"
-
-PATCHES=("${DISTDIR}/vcd-0.7.patch")
-
-src_unpack() {
-	vdr-plugin_src_unpack
-	cd "${S}"
-	if has_version ">=media-video/vdr-1.5"; then
-		epatch "${FILESDIR}/${P}-vdr-1.5.diff"
-	fi
-}
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.8.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.8.ebuild
deleted file mode 100644
index 2f79be873356..000000000000
--- a/media-plugins/vdr-vcd/vdr-vcd-0.8.ebuild
+++ /dev/null
@@ -1,17 +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-vcd/vdr-vcd-0.8.ebuild,v 1.1 2007/12/16 13:43:58 hd_brummy Exp $
-
-inherit eutils vdr-plugin
-
-DESCRIPTION="VDR plugin: play video cds"
-
-HOMEPAGE="http://www.heiligenmann.de/"
-SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.18"
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild
new file mode 100644
index 000000000000..6328d34ee97b
--- /dev/null
+++ b/media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild,v 1.1 2012/11/02 19:14:44 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: play video cds"
+
+HOMEPAGE="http://www.heiligenmann.de/"
+SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.5.9"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}_xgettext.diff"
+		"${FILESDIR}/${P}_vdr-1.7.2.diff" )
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# Patch Makefile, as VDRDIR is no well known variable name
+	# to stop spare -I in gcc cmdline
+	sed -e 's:$(VDRINC):$(VDRDIR)/include:' -i Makefile
+}
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9.ebuild
index 28d8519ef341..7c8af9dc9b26 100644
--- a/media-plugins/vdr-vcd/vdr-vcd-0.9.ebuild
+++ b/media-plugins/vdr-vcd/vdr-vcd-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 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-vcd/vdr-vcd-0.9.ebuild,v 1.5 2009/05/07 15:23:34 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/vdr-vcd-0.9.ebuild,v 1.6 2012/11/02 19:14:44 hd_brummy Exp $
 
 inherit eutils vdr-plugin
 
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND=">=media-video/vdr-1.4.7"
 RDEPEND="${DEPEND}"
 
-PATCHES="${FILESDIR}/${P}_vdr-1.7.2.diff"
+PATCHES=( "${FILESDIR}/${P}_vdr-1.7.2.diff" )
 
 src_unpack() {
 	vdr-plugin_src_unpack unpack