clean up; eapi=2; stable x86 amd64, wrt bug #287052

(Portage version: 2.1.9.25/cvs/Linux i686)

3 files changed, 13 insertions, 53 deletions

diff --git a/media-plugins/vdr-admin/ChangeLog b/media-plugins/vdr-admin/ChangeLog
index 5beb31b82120..fb168edb4bb2 100644
--- a/media-plugins/vdr-admin/ChangeLog
+++ b/media-plugins/vdr-admin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-admin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-admin/ChangeLog,v 1.9 2009/06/14 09:37:37 zzam Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-admin/ChangeLog,v 1.10 2011/01/22 23:20:58 hd_brummy Exp $
+
+  22 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-admin-0.4.0.ebuild, vdr-admin-0.8.0.ebuild:
+  clean up; eapi=2; stable x86 amd64, wrt bug #287052
 
 *vdr-admin-0.8.0 (14 Jun 2009)
 
diff --git a/media-plugins/vdr-admin/vdr-admin-0.4.0.ebuild b/media-plugins/vdr-admin/vdr-admin-0.4.0.ebuild
deleted file mode 100644
index 2032d28be1ae..000000000000
--- a/media-plugins/vdr-admin/vdr-admin-0.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-admin/vdr-admin-0.4.0.ebuild,v 1.6 2009/06/14 09:37:37 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Admin OSD - This is not! the webadmin program called vdradmin."
-HOMEPAGE="http://htpc-forum.de"
-SRC_URI="mirror://vdrfiles/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.37"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/admin-${PV}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	sed -i "s:/etc/vdr/plugins/admin:/usr/share/vdr/admin/bin:" gentoo/admin.conf
-	sed -i "s:/etc/conf.d/vdr.admin.cfg:/usr/lib/vdr/rcscript/plugin-admin.sh:" gentoo/{runvdr,*.sh}
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/admin
-	doins gentoo/admin.conf
-
-	exeinto /usr/share/vdr/admin/bin
-	doexe gentoo/{runvdr,*.sh}
-
-	dodoc gentoo/vdr
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "There more config Parameter than default are in /etc/conf.d/vdr"
-	elog "Find examples in /usr/share/doc/${PF}"
-}
diff --git a/media-plugins/vdr-admin/vdr-admin-0.8.0.ebuild b/media-plugins/vdr-admin/vdr-admin-0.8.0.ebuild
index 38c4da9d5c3f..e4c669905a3f 100644
--- a/media-plugins/vdr-admin/vdr-admin-0.8.0.ebuild
+++ b/media-plugins/vdr-admin/vdr-admin-0.8.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 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-admin/vdr-admin-0.8.0.ebuild,v 1.1 2009/06/14 09:37:37 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-admin/vdr-admin-0.8.0.ebuild,v 1.2 2011/01/22 23:20:58 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin
 
@@ -10,7 +12,7 @@ SRC_URI="mirror://vdrfiles/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.37"
@@ -18,8 +20,8 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/admin-${PV}
 
-src_unpack() {
-	vdr-plugin_src_unpack
+src_prepare() {
+	vdr-plugin_src_prepare
 
 	sed -i "s:/etc/vdr/plugins/admin:/usr/share/vdr/admin/bin:" gentoo/admin.conf
 	sed -i "s:/etc/conf.d/vdr.admin.cfg:/usr/lib/vdr/rcscript/plugin-admin.sh:" gentoo/{runvdr,*.sh}