Removed old ebuild. Fixed quoting.

(Portage version: 2.1.4)

4 files changed, 13 insertions, 89 deletions

diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index 94592356fb37..3076f8e43542 100644
--- a/media-plugins/vdr-setup/ChangeLog
+++ b/media-plugins/vdr-setup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-setup
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.20 2007/12/11 11:13:00 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.21 2008/01/12 11:50:51 zzam Exp $
+
+  12 Jan 2008; Matthias Schwarzott <zzam@gentoo.org>
+  -vdr-setup-0.3.1.ebuild, vdr-setup-0.3.1-r1.ebuild:
+  Removed old ebuild. Fixed quoting.
 
   11 Dec 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-setup-0.3.1-r1.ebuild:
diff --git a/media-plugins/vdr-setup/files/digest-vdr-setup-0.3.1 b/media-plugins/vdr-setup/files/digest-vdr-setup-0.3.1
deleted file mode 100644
index 95497116e08e..000000000000
--- a/media-plugins/vdr-setup/files/digest-vdr-setup-0.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3cc4a91219dfb671ba9fd75edadfb56b vdr-setup-0.3.1.tgz 89366
-RMD160 81bc99b57669cff762aed4f452db4ddb67662c22 vdr-setup-0.3.1.tgz 89366
-SHA256 b44457c384a6fcf22baa24ae7cbeca3d8e23c9d93c7be5c1601dbca338828392 vdr-setup-0.3.1.tgz 89366
diff --git a/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild b/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild
index f342a0999353..037dd96efa2e 100644
--- a/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild
+++ b/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild,v 1.4 2007/12/11 11:13:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.3.1-r1.ebuild,v 1.5 2008/01/12 11:50:51 zzam Exp $
 
 inherit vdr-plugin
 
@@ -56,7 +56,7 @@ src_install() {
 	keepdir /etc/vdr/channels.d
 
 	insinto /var/vdr
-	newins ${S}/Examples/sysconfig sysconfig-setup
+	newins "${S}"/Examples/sysconfig sysconfig-setup
 	fowners vdr:vdr /var/vdr/sysconfig-setup
 
 	local lang
@@ -64,13 +64,13 @@ src_install() {
 	[[ -z ${lang} ]] && lang="en"
 
 	insinto /etc/vdr/plugins/setup
-	newins ${FILESDIR}/vdr-menu.${lang}.xml vdr-menu.xml
-	newins ${FILESDIR}/vdr-setup.${lang}.xml vdr-setup.xml
+	newins "${FILESDIR}"/vdr-menu.${lang}.xml vdr-menu.xml
+	newins "${FILESDIR}"/vdr-setup.${lang}.xml vdr-setup.xml
 
 	insinto /etc/vdr/plugins/setup/help
-	doins ${S}/Examples/help/*.hlp
+	doins "${S}"/Examples/help/*.hlp
 
-	chown -R vdr:vdr ${D}/etc/vdr
+	chown -R vdr:vdr "${D}"/etc/vdr
 
 	dodoc MANUAL.DE Examples/*.xml
 }
diff --git a/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild b/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild
deleted file mode 100644
index 286aedff8d8d..000000000000
--- a/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild
+++ /dev/null
@@ -1,77 +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-setup/vdr-setup-0.3.1.ebuild,v 1.10 2007/07/30 15:27:39 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Create Submenus, Configure VDR on OSD"
-HOMEPAGE="http://www.vdrtools.de/vdrsetup.html"
-SRC_URI="http://www.vdrtools.de/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.36"
-
-S=${WORKDIR}/setup-${PV}
-
-PATCHES="${FILESDIR}/${P}-*.diff"
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	local header=/usr/include/vdr/submenu.h
-	if [[ -f ${header} ]] && grep -q cSubMenuNode ${header} && [[ -f /usr/share/vdr/setup/menu.c ]]; then
-		einfo "Patched vdr found"
-	else
-		echo
-		eerror "Patched VDR needed"
-		echo
-		elog "reemerge VDR with USE=\"setup-plugin\" " && die "unpack failed, patched VDR needed"
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	keepdir /etc/vdr/channels.d
-
-	insinto /var/vdr
-	newins ${S}/Examples/sysconfig sysconfig-setup
-	fowners vdr:vdr /var/vdr/sysconfig-setup
-
-	insinto /etc/vdr/plugins/setup
-	newins ${FILESDIR}/vdr-setup.de.xml vdr-setup.xml
-
-	insinto /etc/vdr/plugins/setup/help
-	doins ${S}/Examples/help/*.hlp
-
-	chown -R vdr:vdr ${D}/etc/vdr
-
-	dodoc MANUAL.DE Examples/*.xml
-}
-
-pkg_preinst() {
-	if [[ ! -L ${ROOT}/etc/vdr/channels.conf ]]; then
-		cp "${ROOT}"/etc/vdr/channels.conf "${D}"/etc/vdr/channels.d/channels.conf.bak
-		cp "${ROOT}"/etc/vdr/channels.conf "${D}"/etc/vdr/channels.d/channels.conf
-		fowners vdr:vdr /etc/vdr/channels.d/{channels.conf,channels.conf.bak}
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Edit /etc/vdr/plugins/setup/*"
-	echo
-	eerror "vdr-setup is very sensible on Error's in your setup.conf"
-	elog "Best way to fix this: Stop (at first) VDR , move setup.conf to setup.conf.bak"
-	elog "and let create VDR a new setup.conf on next Start automatically"
-	echo
-	ewarn "Setup-Plugin will change the path of your channels.conf"
-	elog "You will find a backup copy on /etc/vdr/channels/channels.conf.bak"
-	echo
-}