Removed old ebuild. Fixed quoting.

Package-Manager: portage-2.1.4

5 files changed, 31 insertions, 104 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/Manifest b/media-plugins/vdr-setup/Manifest
index 1db0156cc642..a4bd1c9a055a 100644
--- a/media-plugins/vdr-setup/Manifest
+++ b/media-plugins/vdr-setup/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vdr-menu.de.xml 2882 RMD160 93bf8a0fa03fe2310863d55e960cb758689ec9e5 SHA1 4ae243b53e1b278a0c75766f168de4d36a75d258 SHA256 9cc8d43b97d08d468f5ae583b19c5b1326f930f4fbabacd78f555838e24fe4bd
 MD5 6f3764caa8f2f5dbadc1ab40ba76a3a9 files/vdr-menu.de.xml 2882
 RMD160 93bf8a0fa03fe2310863d55e960cb758689ec9e5 files/vdr-menu.de.xml 2882
@@ -35,25 +38,25 @@ MD5 7ccdea7875b8964e80cd647077d87441 files/vdr-setup.en.xml 8328
 RMD160 15eb50c71817ee93b2e453fa574f1ce8c4205c01 files/vdr-setup.en.xml 8328
 SHA256 496a5ddf8b5f47dd1592cf73f108d7dc7504a8c30c7f0049282572ef5321a0a5 files/vdr-setup.en.xml 8328
 DIST vdr-setup-0.3.1.tgz 89366 RMD160 81bc99b57669cff762aed4f452db4ddb67662c22 SHA1 301967f7876b9ec78326ca48c436a08146093540 SHA256 b44457c384a6fcf22baa24ae7cbeca3d8e23c9d93c7be5c1601dbca338828392
-EBUILD vdr-setup-0.3.1-r1.ebuild 2574 RMD160 dc1da9ebe72a2961601608af4b771f596f60599d SHA1 36269355ca270bcda6fad175437a3b34525f4817 SHA256 7c9c518459fb6656f535054458a41a1cd408e39da9b62b8d3810246c65d391aa
-MD5 9f4f539b87fbf26f4e42440ffae400bd vdr-setup-0.3.1-r1.ebuild 2574
-RMD160 dc1da9ebe72a2961601608af4b771f596f60599d vdr-setup-0.3.1-r1.ebuild 2574
-SHA256 7c9c518459fb6656f535054458a41a1cd408e39da9b62b8d3810246c65d391aa vdr-setup-0.3.1-r1.ebuild 2574
-EBUILD vdr-setup-0.3.1.ebuild 2104 RMD160 a255edd64d8c1f7c3c08aa339f4687a00a205e4e SHA1 dc9968a334940f0cf145e4848a5bc17b192fecbf SHA256 9e2c28049f7e005578a1873f9d943288c1c44a299df4016c39d6f90bd09e90d2
-MD5 5966b7179c91320d444b231ca662e67b vdr-setup-0.3.1.ebuild 2104
-RMD160 a255edd64d8c1f7c3c08aa339f4687a00a205e4e vdr-setup-0.3.1.ebuild 2104
-SHA256 9e2c28049f7e005578a1873f9d943288c1c44a299df4016c39d6f90bd09e90d2 vdr-setup-0.3.1.ebuild 2104
-MISC ChangeLog 3326 RMD160 3f6f1ee8c47caa14343857fa666caa12c839df75 SHA1 6dd77d9d6a9b016ebc03b3768a0ef458b1698ac8 SHA256 81e495ad72ac73a2a8a33b9349284c47e82e4e8956db9cad7ee2162ce6d05994
-MD5 f44a11708c938e5679247a7407088bb1 ChangeLog 3326
-RMD160 3f6f1ee8c47caa14343857fa666caa12c839df75 ChangeLog 3326
-SHA256 81e495ad72ac73a2a8a33b9349284c47e82e4e8956db9cad7ee2162ce6d05994 ChangeLog 3326
+EBUILD vdr-setup-0.3.1-r1.ebuild 2584 RMD160 049b0939f105c33ace25ebdb0087dd0cc482d8db SHA1 54b5d29280fb498575a8c22462b382b94b818a96 SHA256 963be2db6a4ad9caf786ee279baae7971df4f864efa688b24b1bae491e921c72
+MD5 5324e70ae0da9c6fb94140f6edd9d008 vdr-setup-0.3.1-r1.ebuild 2584
+RMD160 049b0939f105c33ace25ebdb0087dd0cc482d8db vdr-setup-0.3.1-r1.ebuild 2584
+SHA256 963be2db6a4ad9caf786ee279baae7971df4f864efa688b24b1bae491e921c72 vdr-setup-0.3.1-r1.ebuild 2584
+MISC ChangeLog 3471 RMD160 122070314866a14e11da3cbe975e10c567ec20d9 SHA1 82836e8acae902b41c39d1c05bfee726aa2ee821 SHA256 b8580f652882d5f2e5ea4c529f469bb1b529e4147e6ad33cd9cf5f96f7e40fd9
+MD5 a3c73bdbfe79e3b1df3581dedb25741d ChangeLog 3471
+RMD160 122070314866a14e11da3cbe975e10c567ec20d9 ChangeLog 3471
+SHA256 b8580f652882d5f2e5ea4c529f469bb1b529e4147e6ad33cd9cf5f96f7e40fd9 ChangeLog 3471
 MISC metadata.xml 540 RMD160 cca198c4529623f25ab1009757673485c021c7da SHA1 586e6fd714fc530db6d4ca19cee2de28d19d9a38 SHA256 a9aa7b1d1b97ae4d5656042dbddab1cdfc9092b6acb94114a59eba5b44175233
 MD5 e516803e84d1e9932b498f664b21574d metadata.xml 540
 RMD160 cca198c4529623f25ab1009757673485c021c7da metadata.xml 540
 SHA256 a9aa7b1d1b97ae4d5656042dbddab1cdfc9092b6acb94114a59eba5b44175233 metadata.xml 540
-MD5 2eb323cfb45d45fce4b23731d6fb2381 files/digest-vdr-setup-0.3.1 235
-RMD160 861af167c79ba63649dee0b6828ae1848f2130d3 files/digest-vdr-setup-0.3.1 235
-SHA256 6abec5c30a9726bafb1e37c26c8223a017291f8c5652be51806624b8b5544782 files/digest-vdr-setup-0.3.1 235
 MD5 2eb323cfb45d45fce4b23731d6fb2381 files/digest-vdr-setup-0.3.1-r1 235
 RMD160 861af167c79ba63649dee0b6828ae1848f2130d3 files/digest-vdr-setup-0.3.1-r1 235
 SHA256 6abec5c30a9726bafb1e37c26c8223a017291f8c5652be51806624b8b5544782 files/digest-vdr-setup-0.3.1-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeIqaUACgkQt2vP6XvVdOeSWgCfYPh5GtEQEBMxPpvFfWjAUblz
+KuYAni/bRXUftn2ZnLbC9mE2qLKXRP3R
+=khUQ
+-----END PGP SIGNATURE-----
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
-}