Cleanup of older ebuilds.

(Portage version: 2.1.2_rc1-r1)
 (Signed Manifest commit)

4 files changed, 8 insertions, 281 deletions

diff --git a/media-plugins/vdr-setup/Manifest b/media-plugins/vdr-setup/Manifest
index 2e53f30ccee3..fa06a92d3587 100644
--- a/media-plugins/vdr-setup/Manifest
+++ b/media-plugins/vdr-setup/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX vdr-setup-0.2.3-gentoo.diff 6713 RMD160 7b20f191388b812d5b7f31503c10f4886a19b987 SHA1 2812742d485aeae809ef0b6394e88cfcfff849e7 SHA256 f2667ed29477c25a0ca3f32aec1fe49bf64c346de75ffc938674ace566ef700f
-MD5 4dd1e551d51e11df975e6743ea2ead01 files/vdr-setup-0.2.3-gentoo.diff 6713
-RMD160 7b20f191388b812d5b7f31503c10f4886a19b987 files/vdr-setup-0.2.3-gentoo.diff 6713
-SHA256 f2667ed29477c25a0ca3f32aec1fe49bf64c346de75ffc938674ace566ef700f files/vdr-setup-0.2.3-gentoo.diff 6713
 AUX vdr-setup-0.3.1-gcc-4.x.diff 2560 RMD160 1ef325019522d4ee5757ec5ffdc51239ca1b8427 SHA1 5de78950064149e9e94ec65acadc1321b273b22a SHA256 fe8595e8965977f0df4aa1816607eb2f824bd5b8c72c5d885efd26b22eae8b88
 MD5 6b9f4b57fe2815b116fdf24466a38b3b files/vdr-setup-0.3.1-gcc-4.x.diff 2560
 RMD160 1ef325019522d4ee5757ec5ffdc51239ca1b8427 files/vdr-setup-0.3.1-gcc-4.x.diff 2560
@@ -25,35 +21,26 @@ AUX vdr-setup.xml 8338 RMD160 63bb870b9eb21a207d6e5fca47613359b56e3cea SHA1 4083
 MD5 13134d72f70ed4077f1783e4b9640e0c files/vdr-setup.xml 8338
 RMD160 63bb870b9eb21a207d6e5fca47613359b56e3cea files/vdr-setup.xml 8338
 SHA256 5860b6d6d4a4cc2756bd5fe8fcc02172e39db523d06717f24edb0aeb498dc0cb files/vdr-setup.xml 8338
-DIST vdr-setup-0.2.3.tgz 88483 RMD160 9c5c555fc3c0a37dfa3fb3008d656c213e485062 SHA1 8374b1b220215cb80ed339d58beba6f0322c8c2b SHA256 8669c8599f468b768994b3388898048d17d82e9163ac9cc8846e1d99bd3824dc
 DIST vdr-setup-0.3.1.tgz 89366 RMD160 81bc99b57669cff762aed4f452db4ddb67662c22 SHA1 301967f7876b9ec78326ca48c436a08146093540 SHA256 b44457c384a6fcf22baa24ae7cbeca3d8e23c9d93c7be5c1601dbca338828392
-EBUILD vdr-setup-0.2.3.ebuild 1797 RMD160 fe390f0ad7b862e1e9f9cd392c43980962069064 SHA1 54833148d82f655e674bab96b2f9ee679731df61 SHA256 9c80d31f724467865bde3e61f46a7c0713bdb848f398695dcecfe2a66377f55a
-MD5 8f022e87ee9ece56950ef705e7780109 vdr-setup-0.2.3.ebuild 1797
-RMD160 fe390f0ad7b862e1e9f9cd392c43980962069064 vdr-setup-0.2.3.ebuild 1797
-SHA256 9c80d31f724467865bde3e61f46a7c0713bdb848f398695dcecfe2a66377f55a vdr-setup-0.2.3.ebuild 1797
 EBUILD vdr-setup-0.3.1.ebuild 2101 RMD160 20d031927d3c58c0342b7a1d33c6078d5847de0c SHA1 c69e3973ef07fc81a228ca0359c53242400e1ef9 SHA256 d82c7bdac0192f683fca2bc78487fb2fe0c7e8ae8173cf3a2e13085a2e2be05b
 MD5 13becd2ed3db3bd5e01b98f314d778e5 vdr-setup-0.3.1.ebuild 2101
 RMD160 20d031927d3c58c0342b7a1d33c6078d5847de0c vdr-setup-0.3.1.ebuild 2101
 SHA256 d82c7bdac0192f683fca2bc78487fb2fe0c7e8ae8173cf3a2e13085a2e2be05b vdr-setup-0.3.1.ebuild 2101
-MISC ChangeLog 1740 RMD160 9a6f3cd4f3b8222c23f33f2ded5f2c397a875617 SHA1 fcd19aca9970371680b81224674120564c1d5729 SHA256 ff9c25a36778f81c63ea8c4aeddd21ea35b0afd8783bd65d272158087fddb19d
-MD5 e769c85b5591a5536195139e49c379dc ChangeLog 1740
-RMD160 9a6f3cd4f3b8222c23f33f2ded5f2c397a875617 ChangeLog 1740
-SHA256 ff9c25a36778f81c63ea8c4aeddd21ea35b0afd8783bd65d272158087fddb19d ChangeLog 1740
+MISC ChangeLog 1881 RMD160 9f45a11ccec1828857cfc529b6019dbc81bc188a SHA1 3ab8e759ffe79f4becf1298068a66c7b3924f6f0 SHA256 1d72a43e649cd7221188a091b5683f447d7f8b26ad0b0d2f3dfcb7bdd9908b65
+MD5 071ebb4f5f1631e98949b3f79623b9a2 ChangeLog 1881
+RMD160 9f45a11ccec1828857cfc529b6019dbc81bc188a ChangeLog 1881
+SHA256 1d72a43e649cd7221188a091b5683f447d7f8b26ad0b0d2f3dfcb7bdd9908b65 ChangeLog 1881
 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 0d63fca4b3b01f537b7afb480047e40f files/digest-vdr-setup-0.2.3 235
-RMD160 9e9819d4309a2ebe80d7e84d91d7aa39f59f6c1b files/digest-vdr-setup-0.2.3 235
-SHA256 74ede186a022e78d60a18b095f1154adf8564dd7a957d9f6cd1c5698e1d96cfa files/digest-vdr-setup-0.2.3 235
 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-Comment: no further Information
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/dUidn07HTTCgIoRAq5TAJ41NXbq9PmVzPlrSTNlx3BB/2DTgQCfZ2k3
-pjEuRRSYwm63seGoYUvDdV4=
-=09Xm
+iD8DBQFFRhPNt2vP6XvVdOcRAmsvAKC4/v78iCSn0I/h8DXIvE03jO4NjgCfcXzJ
+cyLv2PD0zJIENtQfK6RB1VI=
+=wC/d
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-setup/files/digest-vdr-setup-0.2.3 b/media-plugins/vdr-setup/files/digest-vdr-setup-0.2.3
deleted file mode 100644
index 9e7e1d1d8786..000000000000
--- a/media-plugins/vdr-setup/files/digest-vdr-setup-0.2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 39cd6002b80fcd153bc57a1dc487af23 vdr-setup-0.2.3.tgz 88483
-RMD160 9c5c555fc3c0a37dfa3fb3008d656c213e485062 vdr-setup-0.2.3.tgz 88483
-SHA256 8669c8599f468b768994b3388898048d17d82e9163ac9cc8846e1d99bd3824dc vdr-setup-0.2.3.tgz 88483
diff --git a/media-plugins/vdr-setup/files/vdr-setup-0.2.3-gentoo.diff b/media-plugins/vdr-setup/files/vdr-setup-0.2.3-gentoo.diff
deleted file mode 100644
index 5b24d00c14b1..000000000000
--- a/media-plugins/vdr-setup/files/vdr-setup-0.2.3-gentoo.diff
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -Naur setup-0.2.3-orig/config.cpp setup-0.2.3/config.cpp
---- setup-0.2.3-orig/config.cpp	2006-02-05 02:59:19.079869000 +0100
-+++ setup-0.2.3/config.cpp	2006-02-05 03:11:40.962233750 +0100
-@@ -13,7 +13,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include "vdr/plugin.h"
--#include "tinystr.h"
-+#include "vdr/tinystr.h"
- #include "config.h"
- #include "sysconfig.h"
- #include "plugins.h"
-@@ -148,7 +148,7 @@
- -         bootLinux=\"/sbin/reboot\" \n\
- -         VDRlibDir=\"/usr/lib/vdr/plugins\" \n\
- -    <plugins sysconfig=\"PLUGINLIST\">\n\
---         <plugin name=\"setup\" info=\"Minivdr-Setup\" active=\"yes\" />\n\
-+-         <plugin name=\"setup\" info=\"Gento-VDR-Setup\" active=\"yes\" />\n\
- -         <plugin name=\"vdrcd\" param=\"-c /dev/dvd -c /media/dvd -c /media/cdfs\" info=\"VDR CD\"/>\n\
- -         ...\n\
- -    </plugin>\n\
-diff -Naur setup-0.2.3-orig/config.h setup-0.2.3/config.h
---- setup-0.2.3-orig/config.h	2006-02-05 02:59:19.079869000 +0100
-+++ setup-0.2.3/config.h	2006-02-05 03:00:02.974612250 +0100
-@@ -11,7 +11,7 @@
- 
- #ifndef CONFIG_H
- #define CONFIG_H
--#include "tinystr.h"
-+#include "vdr/tinystr.h"
- #include "plugins.h"
- #include "sysconfig.h"
- #include "menus.h"
-diff -Naur setup-0.2.3-orig/debug.h setup-0.2.3/debug.h
---- setup-0.2.3-orig/debug.h	2006-02-05 02:59:19.075868750 +0100
-+++ setup-0.2.3/debug.h	2006-02-05 03:00:34.840603750 +0100
-@@ -31,6 +31,6 @@
- #define DEBUG7(p1, p2, p3, p4, p5, p6, p7)  esyslog(p1, p2, p3, p4, p5, p6, p7)
- 
- #endif
--#define DBG_PREFIX                      "ERROR: Minivdr-Setup"
-+#define DBG_PREFIX                      "ERROR: Gentoo-VDR-Setup"
- 
- #endif /* DEBUG_H */
-diff -Naur setup-0.2.3-orig/getVdrSetupMenu.pl setup-0.2.3/getVdrSetupMenu.pl
---- setup-0.2.3-orig/getVdrSetupMenu.pl	2006-02-05 02:59:19.079869000 +0100
-+++ setup-0.2.3/getVdrSetupMenu.pl	2006-02-05 03:01:23.675655750 +0100
-@@ -35,6 +35,7 @@
-     if (/^\s*#include/)
-     {
-       #printf(OUTPUT $_);
-+		s-"(.*)"-<vdr/\1>-;
-       push @headers, $_;
-     }
-     if (/^\s*class\s+\w+MenuSetupBase/) 
-diff -Naur setup-0.2.3-orig/i18n.cpp setup-0.2.3/i18n.cpp
---- setup-0.2.3-orig/i18n.cpp	2006-02-05 02:59:19.079869000 +0100
-+++ setup-0.2.3/i18n.cpp	2006-02-05 03:03:07.782162000 +0100
-@@ -12,8 +12,8 @@
- 
- const tI18nPhrase Phrases[] = {
-   {
--    "Setup - designed for minivdr.de",
--    "Setup - designed for minivdr.de",
-+    "Setup - VDR",
-+    "Setup - VDR",
-     "",
-     "",
-     "",
-@@ -643,8 +643,8 @@
-   },
-   
-   {
--    "missing channels/*.conf",
--    "keine channels/*.conf vorhanden",
-+    "missing channels.d/*.conf",
-+    "keine channels.d/*.conf vorhanden",
-       "",
-       "",
-       "",
-diff -Naur setup-0.2.3-orig/Makefile setup-0.2.3/Makefile
---- setup-0.2.3-orig/Makefile	2006-02-05 02:59:19.087869500 +0100
-+++ setup-0.2.3/Makefile	2006-02-05 03:03:50.140809250 +0100
-@@ -84,9 +84,9 @@
- 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
- 	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
- 
--setupsystemmenu.cpp:  ../../../menu.c
-+setupsystemmenu.cpp:  /usr/share/vdr/setup/menu.c
- 	@echo "Extracting class definitions from VDR's menu.c for standard Setup"
--	@./getVdrSetupMenu.pl ../../../menu.c
-+	@./getVdrSetupMenu.pl /usr/share/vdr/setup/menu.c
- 
- 	
- dist: clean
-diff -Naur setup-0.2.3-orig/MANUAL.DE setup-0.2.3/MANUAL.DE
---- setup-0.2.3-orig/MANUAL.DE	2006-02-05 02:59:19.087869500 +0100
-+++ setup-0.2.3/MANUAL.DE	2006-02-05 03:05:04.145434250 +0100
-@@ -206,7 +206,7 @@
-                 werden in Form von "*" angezeigt.
-             channellist
- setup           Erlaubt die Auswahl von vordefinierten Kanallisten. Die
--                Kanallisten müssen in den Verzeichnis <vdrdir>/plugins/channels
-+                Kanallisten müssen in den Verzeichnis <vdrdir>/plugins/channels.d
-                 mit der Endung *.conf abgelegt werden. Das Setup-Plugin linkt
-                 dann die ausgewählte Kanalliste nach <vdrdir>/channels.conf
-             networkdriver"
-diff -Naur setup-0.2.3-orig/menus.cpp setup-0.2.3/menus.cpp
---- setup-0.2.3-orig/menus.cpp	2006-02-05 02:59:19.079869000 +0100
-+++ setup-0.2.3/menus.cpp	2006-02-05 03:05:45.816038500 +0100
-@@ -840,7 +840,7 @@
-   *tmp = '\0';
- 
-   asprintf(&channelFile, "%s/channels.conf",channelDir);
--  asprintf(&channelDir,  "%s/channels",channelDir);
-+  asprintf(&channelDir,  "%s/channels.d",channelDir);
- 
-   
-    if(  (dirFP = opendir(channelDir))!= NULL)
-@@ -1446,7 +1446,7 @@
-   *tmp = '\0';
- 
-   asprintf(&channelFile,    "%s/channels.conf",channelDir);
--  asprintf(&channelDir,     "%s/channels",channelDir);
-+  asprintf(&channelDir,     "%s/channels.d",channelDir);
-   asprintf(&newChannelFile, "%s/%s.conf", channelDir, GetSelectedValue());
- 
- 
-diff -Naur setup-0.2.3-orig/menus.h setup-0.2.3/menus.h
---- setup-0.2.3-orig/menus.h	2006-02-05 02:59:19.079869000 +0100
-+++ setup-0.2.3/menus.h	2006-02-05 03:06:06.825351500 +0100
-@@ -13,7 +13,7 @@
- #define MENUS_H
- #include <vdr/tools.h>
- #include "util.h"
--#include "tinystr.h"
-+#include "vdr/tinystr.h"
- #include "sysconfig.h"
- 
- 
-diff -Naur setup-0.2.3-orig/setup.cpp setup-0.2.3/setup.cpp
---- setup-0.2.3-orig/setup.cpp	2006-02-05 02:59:19.083869250 +0100
-+++ setup-0.2.3/setup.cpp	2006-02-05 03:06:58.224563750 +0100
-@@ -15,8 +15,8 @@
- #include "i18n.h"
- 
- static const char *VERSION        = "0.2.3";
--static const char *DESCRIPTION    = "Minivdr-Setup";
--static const char *MAINMENUENTRY  = "Minivdr-Setup";
-+static const char *DESCRIPTION    = "Gentoo-VDR-Setup";
-+static const char *MAINMENUENTRY  = "Gentoo-VDR-Setup";
- 
- //holds setup configuration
- cSetupSetup  setupSetup;
-diff -Naur setup-0.2.3-orig/setupmenu.cpp setup-0.2.3/setupmenu.cpp
---- setup-0.2.3-orig/setupmenu.cpp	2006-02-05 02:59:19.083869250 +0100
-+++ setup-0.2.3/setupmenu.cpp	2006-02-05 03:08:42.435076500 +0100
-@@ -537,7 +537,7 @@
-               if(  e->GetNrOfSelectionValues() == 0 )
-               {
-                 char *txt=NULL;
--                asprintf(&txt, "%s:\t%s", nohk(e->GetName()),tr("missing channels/*.conf"));
-+                asprintf(&txt, "%s:\t%s", nohk(e->GetName()),tr("missing channels.d/*.conf"));
-                 Add(new cOsdItem (txt));
-                 free(txt);
-               }
-@@ -699,13 +699,13 @@
- //#############################################################################################
- 
- 
--cSetupMenu::cSetupMenu() : cOsdMenu(tr("Setup - designed for minivdr.de (c)"))
-+cSetupMenu::cSetupMenu() : cOsdMenu(tr("Setup - Gentoo-VDR"))
- {
-    char *configFile=NULL;
- 
-    SetCols(20);
-    
--   asprintf(&configFile, "%s/setup/minivdr-setup.xml", cPlugin::ConfigDirectory());
-+   asprintf(&configFile, "%s/setup/vdr-setup.xml", cPlugin::ConfigDirectory());
-   _config    = new Config( configFile );
-    free(configFile);
- 
diff --git a/media-plugins/vdr-setup/vdr-setup-0.2.3.ebuild b/media-plugins/vdr-setup/vdr-setup-0.2.3.ebuild
deleted file mode 100644
index e0d36469ba74..000000000000
--- a/media-plugins/vdr-setup/vdr-setup-0.2.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 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.2.3.ebuild,v 1.2 2006/02/19 23:06:29 hd_brummy Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder 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="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.36-r3"
-
-S=${WORKDIR}/setup-${PV}
-
-PATCHES="${FILESDIR}/${P}-gentoo.diff"
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if [[ ! -f /usr/include/vdr/submenu.h ]] || [[ ! -f /usr/share/vdr/setup/menu.c ]]; then
-		echo
-		eerror "Patched VDR needed"
-		echo
-		einfo "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
-	doins ${FILESDIR}/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 ${IMAGE}/etc/vdr/channels.d/channels.conf.bak
-	cp ${ROOT}/etc/vdr/channels.conf ${IMAGE}/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
-	einfo "Edit /etc/vdr/plugins/setup/*"
-	echo
-	ewarn "Setup-Plugin will change the path of your channels.conf"
-	einfo "You will find a backup copy on /etc/vdr/channels/channels.conf.bak"
-	echo
-}
-
-
-
-