cleanup, eapi=2; stable x86 amd64

(Portage version: 2.1.9.24/cvs/Linux i686)

6 files changed, 13 insertions, 100 deletions

diff --git a/media-plugins/vdr-powermate/ChangeLog b/media-plugins/vdr-powermate/ChangeLog
index ab8c1e774709..ea3272c595b4 100644
--- a/media-plugins/vdr-powermate/ChangeLog
+++ b/media-plugins/vdr-powermate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-powermate
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/ChangeLog,v 1.9 2008/05/03 07:36:33 zzam Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/ChangeLog,v 1.10 2011/01/17 21:33:56 hd_brummy Exp $
+
+  17 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-powermate-0.0.3.ebuild, -files/vdr-powermate-0.0.3-1.3.38.diff,
+  -files/vdr-powermate-0.0.3-uint64.diff, -vdr-powermate-0.0.4.ebuild,
+  vdr-powermate-0.0.5.ebuild:
+  cleanup, eapi=2; stable x86 amd64
 
 *vdr-powermate-0.0.5 (03 May 2008)
 
diff --git a/media-plugins/vdr-powermate/files/vdr-powermate-0.0.3-1.3.38.diff b/media-plugins/vdr-powermate/files/vdr-powermate-0.0.3-1.3.38.diff
deleted file mode 100644
index bb354bd6573d..000000000000
--- a/media-plugins/vdr-powermate/files/vdr-powermate-0.0.3-1.3.38.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- powermate-0.0.3/powermate.c
-+++ powermate-0.0.3/powermate.c
-@@ -253,9 +253,15 @@
- 		cRemote::Put(key);
- }
- 
-+#if VDRVERSNUM >= 10338
-+void cPowerMate::Replaying(const cControl *Control, const char *Name, const char *FileName, bool On)
-+{
-+	if (On)
-+#else
- void cPowerMate::Replaying(const cControl *Control, const char *Name)
- {
- 	if (Name)
-+#endif
- 	{
- 		context = kContextReplay;
- 	}
---- powermate-0.0.3/powermate.h
-+++ powermate-0.0.3/powermate.h
-@@ -42,7 +42,11 @@
- 	virtual ~cPowerMate();
- 	void SetBrightness(int brightness);
- 
-+#if VDRVERSNUM >= 10338
-+	virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
-+#else
- 	virtual void Replaying(const cControl *Control, const char *Name);
-+#endif
- 	virtual void OsdClear(void);
- 	virtual void OsdTitle(const char *Title);
- 	virtual void OsdHelpKeys(const char *Red, const char *Green, const char *Yellow, const char *Blue);
diff --git a/media-plugins/vdr-powermate/files/vdr-powermate-0.0.3-uint64.diff b/media-plugins/vdr-powermate/files/vdr-powermate-0.0.3-uint64.diff
deleted file mode 100644
index 28f23f3ec0a2..000000000000
--- a/media-plugins/vdr-powermate/files/vdr-powermate-0.0.3-uint64.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru powermate-0.0.3-orig/powermate.c powermate-0.0.3/powermate.c
---- powermate-0.0.3-orig/powermate.c	2006-12-03 15:58:54.854003243 +0100
-+++ powermate-0.0.3/powermate.c	2006-12-03 15:59:51.239469576 +0100
-@@ -134,8 +134,8 @@
- 		}
- 		if (click && !pushed)
- 		{
--			uint64 current = TimeMs();
--			if (current - lastPush > (uint64) PowerMateSetup.doubleClickTime)
-+			uint64_t current = TimeMs();
-+			if (current - lastPush > (uint64_t) PowerMateSetup.doubleClickTime)
- 			{
- 				//printf("CLICK\n");
- 				ProcessEvent(kEventClick);
-diff -ru powermate-0.0.3-orig/powermate.h powermate-0.0.3/powermate.h
---- powermate-0.0.3-orig/powermate.h	2006-12-03 15:58:54.854003243 +0100
-+++ powermate-0.0.3/powermate.h	2006-12-03 15:59:41.325102033 +0100
-@@ -26,7 +26,7 @@
- 	bool menu;
- 
- 	bool pushed;
--	uint64 lastPush;
-+	uint64_t lastPush;
- 	int offset;
- 	bool click;
- 	bool turn;
diff --git a/media-plugins/vdr-powermate/vdr-powermate-0.0.3.ebuild b/media-plugins/vdr-powermate/vdr-powermate-0.0.3.ebuild
deleted file mode 100644
index 4c9947766681..000000000000
--- a/media-plugins/vdr-powermate/vdr-powermate-0.0.3.ebuild
+++ /dev/null
@@ -1,20 +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-powermate/vdr-powermate-0.0.3.ebuild,v 1.5 2008/04/28 19:50:43 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder - Powermate PlugIn"
-HOMEPAGE="http://www.powarman.de/"
-SRC_URI="http://home.arcor.de/andreas.regel/files/powermate/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-RDEPEND="media-video/vdr"
-DEPEND="${RDEPEND}"
-
-PATCHES=("${FILESDIR}/${P}-1.3.38.diff"
-	"${FILESDIR}/${P}-uint64.diff")
diff --git a/media-plugins/vdr-powermate/vdr-powermate-0.0.4.ebuild b/media-plugins/vdr-powermate/vdr-powermate-0.0.4.ebuild
deleted file mode 100644
index 48c97122d66d..000000000000
--- a/media-plugins/vdr-powermate/vdr-powermate-0.0.4.ebuild
+++ /dev/null
@@ -1,17 +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-powermate/vdr-powermate-0.0.4.ebuild,v 1.1 2008/04/28 19:50:43 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder - Powermate PlugIn"
-HOMEPAGE="http://www.powarman.de/"
-SRC_URI="http://home.arcor.de/andreas.regel/files/powermate/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-video/vdr"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild b/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild
index dbdf6613a0f2..879e1db71a5d 100644
--- a/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild
+++ b/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild,v 1.1 2008/05/03 07:36:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild,v 1.2 2011/01/17 21:33:56 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin
 
@@ -10,7 +12,7 @@ SRC_URI="http://home.arcor.de/andreas.regel/files/powermate/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-video/vdr-1.5.8"