cleanup; stable amd64 x86, wrt bug 495758

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)

5 files changed, 11 insertions, 178 deletions

diff --git a/media-plugins/vdr-extrecmenu/ChangeLog b/media-plugins/vdr-extrecmenu/ChangeLog
index d088a845301f..e8a66e512e5f 100644
--- a/media-plugins/vdr-extrecmenu/ChangeLog
+++ b/media-plugins/vdr-extrecmenu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-extrecmenu
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.43 2013/10/23 12:02:49 hd_brummy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.44 2014/01/02 17:34:48 hd_brummy Exp $
+
+  02 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-extrecmenu-1.2.1.ebuild, -vdr-extrecmenu-1.2.2.ebuild,
+  -vdr-extrecmenu-1.2.2-r1.ebuild, vdr-extrecmenu-1.2.2-r2.ebuild:
+  cleanup; stable amd64 x86, wrt bug 495758
 
 *vdr-extrecmenu-1.2.2-r2 (23 Oct 2013)
 
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild
deleted file mode 100644
index 560af9676f18..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild
+++ /dev/null
@@ -1,61 +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-extrecmenu/vdr-extrecmenu-1.2.1.ebuild,v 1.8 2012/12/03 22:42:27 idl0r Exp $
-
-EAPI="4"
-
-inherit vdr-plugin eutils
-
-VERSION="583" #every bump, new version
-
-DVDARCHIVE="dvdarchive-2.3-beta.sh"
-
-DESCRIPTION="Video Disk Recorder - Extended recordings menu Plugin"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-extrecmenu"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
-	mirror://gentoo/${DVDARCHIVE}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6.0
-	<media-video/vdr-1.7.32"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
-
-	cd "${S}"
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		einfo "Enabling parentalrating option"
-		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
-	fi
-
-	vdr-plugin_src_prepare
-
-	if has_version ">=media-video/vdr-1.7.18"; then
-		sed -e "s:Read(f):Read():" -i mymenueditrecording.c
-	fi
-
-	if has_version ">=media-video/vdr-1.7.27"; then
-		epatch "${FILESDIR}/vdr-1.7.27.diff"
-	fi
-
-	if has_version ">=media-video/vdr-1.7.28"; then
-		sed -i "s:SetRecording(recording->FileName(),recording->Title:SetRecording(recording->FileName:" mymenurecordings.c
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${WORKDIR}"
-	newbin ${DVDARCHIVE} dvdarchive.sh
-
-	insinto /etc/vdr
-	doins "${FILESDIR}"/dvdarchive.conf
-}
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r1.ebuild
deleted file mode 100644
index 812abe2bcc84..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r1.ebuild,v 1.5 2013/03/25 20:41:52 ago Exp $
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-VERSION="936" #every bump, new version
-
-DVDARCHIVE="dvdarchive-2.3-beta.sh"
-
-DESCRIPTION="Video Disk Recorder - Extended recordings menu Plugin"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-extrecmenu"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
-	mirror://gentoo/${DVDARCHIVE}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
-
-	cd "${S}"
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		einfo "Enabling parentalrating option"
-		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
-	fi
-
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-1.7.28"; then
-		sed -i "s:SetRecording(recording->FileName(),recording->Title:SetRecording(recording->FileName:" mymenurecordings.c
-	fi
-
-	if has_version ">=media-video/vdr-1.7.32"; then
-		export EXTRECMENU_USE_VDR_CUTTER=1
-		einfo "disabled plugin cutter"
-		einfo "plugin use now the vdr included cutter"
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	cd "${WORKDIR}"
-	newbin ${DVDARCHIVE} dvdarchive.sh
-
-	insinto /etc/vdr
-	doins "${FILESDIR}"/dvdarchive.conf
-}
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild
index 6f5bb2dae460..edeebfa8e099 100644
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild,v 1.1 2013/10/23 12:02:49 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild,v 1.2 2014/01/02 17:34:48 hd_brummy Exp $
 
-EAPI="5"
+EAPI=5
 
 inherit vdr-plugin-2
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.6.0"
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2.ebuild
deleted file mode 100644
index 8394a1e5c788..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2.ebuild
+++ /dev/null
@@ -1,53 +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-extrecmenu/vdr-extrecmenu-1.2.2.ebuild,v 1.4 2012/12/03 22:42:27 idl0r Exp $
-
-EAPI="4"
-
-inherit vdr-plugin-2
-
-VERSION="936" #every bump, new version
-
-DVDARCHIVE="dvdarchive-2.3-beta.sh"
-
-DESCRIPTION="Video Disk Recorder - Extended recordings menu Plugin"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-extrecmenu"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
-	mirror://gentoo/${DVDARCHIVE}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6.0
-	<media-video/vdr-1.7.32"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
-
-	cd "${S}"
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		einfo "Enabling parentalrating option"
-		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
-	fi
-
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-1.7.28"; then
-		sed -i "s:SetRecording(recording->FileName(),recording->Title:SetRecording(recording->FileName:" mymenurecordings.c
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	cd "${WORKDIR}"
-	newbin ${DVDARCHIVE} dvdarchive.sh
-
-	insinto /etc/vdr
-	doins "${FILESDIR}"/dvdarchive.conf
-}