cleanup; vdr-plugin-2.eclass

(Portage version: 2.1.10.11/cvs/Linux i686)

4 files changed, 9 insertions, 120 deletions

diff --git a/media-plugins/vdr-beep/ChangeLog b/media-plugins/vdr-beep/ChangeLog
index 4e2ee55073a1..27583f93e137 100644
--- a/media-plugins/vdr-beep/ChangeLog
+++ b/media-plugins/vdr-beep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-beep
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/ChangeLog,v 1.5 2012/01/15 19:53:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/ChangeLog,v 1.6 2012/06/30 17:51:45 hd_brummy Exp $
+
+  30 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-beep-0.1.0.ebuild,
+  vdr-beep-0.1.2.ebuild, -files/vdr-beep-0.1.2-Makefile.patch:
+  cleanup; vdr-plugin-2.eclass
 
 *vdr-beep-0.1.2 (15 Jan 2012)
 
diff --git a/media-plugins/vdr-beep/files/vdr-beep-0.1.2-Makefile.patch b/media-plugins/vdr-beep/files/vdr-beep-0.1.2-Makefile.patch
deleted file mode 100644
index e892f6247ed2..000000000000
--- a/media-plugins/vdr-beep/files/vdr-beep-0.1.2-Makefile.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From b000932bf4c89a02a59a0bd24555217b2bdbf651 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Sun, 15 Jan 2012 20:43:11 +0100
-Subject: [PATCH] Makefile improvements
-
----
- Makefile |   20 ++++++++++++--------
- 1 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e9e926d..a87b118 100644
---- a/Makefile
-+++ b/Makefile
-@@ -23,6 +23,8 @@
- 
- PLUGIN = beep
- 
-+WANT_I18N=1
-+
- ### The version number of this plugin (taken from the main source file):
- 
- VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-@@ -30,13 +32,14 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS += -fPIC
- 
- ### The directory environment:
- 
--VDRDIR = ../../..
--LIBDIR = ../../lib
--TMPDIR = /tmp
-+VDRDIR ?= ../../..
-+LIBDIR ?= ../../lib
-+TMPDIR ?= /tmp
- 
- ### Allow user defined options to overwrite defaults:
- 
-@@ -77,7 +80,7 @@ $(DEPFILE): Makefile
- -include $(DEPFILE)
- 
- ### Internationalization (I18N):
--
-+ifdef WANT_I18N
- PODIR     = po
- LOCALEDIR = $(VDRDIR)/locale
- I18Npo    = $(wildcard $(PODIR)/*.po)
-@@ -97,6 +100,7 @@ $(I18Npot): $(wildcard *.c)
- $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
- 	@mkdir -p $(dir $@)
- 	cp $< $@
-+endif
- 
- .PHONY: i18n
- i18n: $(I18Nmsgs)
-@@ -106,19 +110,19 @@ i18n: $(I18Nmsgs)
- all: libvdr-$(PLUGIN).so i18n
- 
- libvdr-$(PLUGIN).so: $(OBJS)
--	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
- 	@mkdir -p $(LIBDIR)
- 	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- dist: clean
- 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
- 	@mkdir $(TMPDIR)/$(ARCHIVE)
--	@cp -a * $(TMPDIR)/$(ARCHIVE)	
-+	@cp -a * $(TMPDIR)/$(ARCHIVE)
- 	@chmod 644 -R $(TMPDIR)/$(ARCHIVE)/*
- 	@find $(TMPDIR)/$(ARCHIVE) -type d -exec chmod 755 {} \;
- 	@find $(TMPDIR)/$(ARCHIVE) -name "*.sh" -exec chmod a+x {} \;
- 	@chown root.root -R $(TMPDIR)/$(ARCHIVE)/*
--	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE) 
-+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
- 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
- 	@echo Distribution package created as $(PACKAGE).tgz
- 
--- 
-1.7.3.4
-
diff --git a/media-plugins/vdr-beep/vdr-beep-0.1.0.ebuild b/media-plugins/vdr-beep/vdr-beep-0.1.0.ebuild
deleted file mode 100644
index f524bbe455b9..000000000000
--- a/media-plugins/vdr-beep/vdr-beep-0.1.0.ebuild
+++ /dev/null
@@ -1,20 +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-beep/vdr-beep-0.1.0.ebuild,v 1.3 2012/01/15 19:53:33 idl0r Exp $
-
-EAPI="3"
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Use the PC speaker to signalize some events (shutdown, cut done etc.)"
-HOMEPAGE="http://www.deltab.de/content/view/25/62/"
-SRC_URI="mirror://vdrfiles/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND=">=media-video/vdr-1.6.0
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/vdr-beep/vdr-beep-0.1.2.ebuild b/media-plugins/vdr-beep/vdr-beep-0.1.2.ebuild
index 38ab6e6c2e82..1ba6e1c9359d 100644
--- a/media-plugins/vdr-beep/vdr-beep-0.1.2.ebuild
+++ b/media-plugins/vdr-beep/vdr-beep-0.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/vdr-beep-0.1.2.ebuild,v 1.1 2012/01/15 19:53:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/vdr-beep-0.1.2.ebuild,v 1.2 2012/06/30 17:51:45 hd_brummy Exp $
 
 EAPI="4"
 
-inherit vdr-plugin eutils
+inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: Use the PC speaker to signalize some events (shutdown, cut done etc.)"
 HOMEPAGE="http://www.deltab.de/content/view/25/62/"
@@ -13,18 +13,7 @@ SRC_URI="http://www.deltab.de/component/option,com_docman/task,doc_download/gid,
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="nls"
+IUSE=""
 
 RDEPEND=">=media-video/vdr-1.6.0"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-
-	if ! use nls; then
-		sed -i -e 's:^WANT_I18N.*::' Makefile || die
-	fi
-
-	vdr-plugin_src_prepare
-}
+DEPEND="${RDEPEND}"