clean up; fixed Homepage, stabel on x86

(Portage version: 2.1.3.9)

11 files changed, 12 insertions, 543 deletions

diff --git a/media-plugins/vdr-weatherng/ChangeLog b/media-plugins/vdr-weatherng/ChangeLog
index a6e0e4a6bc7c..52623f6537a4 100644
--- a/media-plugins/vdr-weatherng/ChangeLog
+++ b/media-plugins/vdr-weatherng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-weatherng
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/ChangeLog,v 1.18 2007/09/19 10:36:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/ChangeLog,v 1.19 2007/09/19 16:02:31 hd_brummy Exp $
+
+  19 Sep 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-weatherng-0.0.5.diff,
+  -files/vdr-weatherng-0.0.8_pre2-gentoo.diff,
+  -files/commands.weatherng.conf, -files/confd, -files/rc-addon.sh,
+  -vdr-weatherng-0.0.5.ebuild, -vdr-weatherng-0.0.8_pre2.ebuild,
+  vdr-weatherng-0.0.8_pre3.ebuild:
+  clean up; fixed Homepage, stabel on x86
 
   19 Sep 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
   +files/vdr-weatherng-0.0.8_pre3-i18n-fix.diff,
diff --git a/media-plugins/vdr-weatherng/files/commands.weatherng.conf b/media-plugins/vdr-weatherng/files/commands.weatherng.conf
deleted file mode 100644
index 627e994cd786..000000000000
--- a/media-plugins/vdr-weatherng/files/commands.weatherng.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-~~~~~~~~~ : echo "no function"
-Wetter aktualisieren    : /usr/lib/vdr/bin/vdr-bg.sh /var/vdr/weatherng/SatDownload now
diff --git a/media-plugins/vdr-weatherng/files/confd b/media-plugins/vdr-weatherng/files/confd
deleted file mode 100644
index 2d9f6e5be3e2..000000000000
--- a/media-plugins/vdr-weatherng/files/confd
+++ /dev/null
@@ -1,19 +0,0 @@
-# /etc/conf.d/vdr.weatherng
-
-#
-# Directory where the images are placed
-#   allowed values: pathes
-#   default: /usr/share/weatherng
-#WEATHERNG_IMAGE_DIR="/usr/share/vdr/weatherng"
-
-
-#
-# Directory to store downloaded weather data
-#
-# If you want change this Path,
-# you have to change the Path in file SatDownload too !!!
-# Read at first usr/share/doc/vdrplugin-weatherng-*/README
-#
-#   allowed values: pathes
-#   default: /var/vdr/weatherng
-#WEATHERNG_DATA_DIR="/var/vdr/weatherng"
diff --git a/media-plugins/vdr-weatherng/files/digest-vdr-weatherng-0.0.5 b/media-plugins/vdr-weatherng/files/digest-vdr-weatherng-0.0.5
deleted file mode 100644
index 8b097ce81d4c..000000000000
--- a/media-plugins/vdr-weatherng/files/digest-vdr-weatherng-0.0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 164c5db05fff57e8991dcb32b3167eaf vdr-weatherng-0.0.5.tgz 77681
-RMD160 8e02edebfeb263ed5c32512653ef016df7eeca37 vdr-weatherng-0.0.5.tgz 77681
-SHA256 23551658f1c09bbea2af9df462c86af10698191f60c988f4afe40fed91140cc1 vdr-weatherng-0.0.5.tgz 77681
diff --git a/media-plugins/vdr-weatherng/files/digest-vdr-weatherng-0.0.8_pre2 b/media-plugins/vdr-weatherng/files/digest-vdr-weatherng-0.0.8_pre2
deleted file mode 100644
index e90a1f60221b..000000000000
--- a/media-plugins/vdr-weatherng/files/digest-vdr-weatherng-0.0.8_pre2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2d67ab8b27c146f810aef8fec6e01c88 vdr-weatherng-0.0.8-pre2.tgz 177224
-RMD160 53c320e2f6bbf1a4f1a3cffb4c409e42001315f2 vdr-weatherng-0.0.8-pre2.tgz 177224
-SHA256 6abc0a95ce56a8d5b18323892bfc22f27d65c6050db16706e1fac9729f3eb226 vdr-weatherng-0.0.8-pre2.tgz 177224
diff --git a/media-plugins/vdr-weatherng/files/rc-addon.sh b/media-plugins/vdr-weatherng/files/rc-addon.sh
deleted file mode 100644
index c3fdb8f720a9..000000000000
--- a/media-plugins/vdr-weatherng/files/rc-addon.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/files/rc-addon.sh,v 1.2 2007/04/17 09:43:15 zzam Exp $
-#
-# rc-addon-script for plugin weatherng
-#
-
-plugin_pre_vdr_start() {
-	[ -z "${WEATHERNG_IMAGE_DIR}" ] && WEATHERNG_IMAGE_DIR="/usr/share/vdr/weatherng"
-	add_plugin_param "-I ${WEATHERNG_IMAGE_DIR}"
-
-	[ -z "${WEATHERNG_DATA_DIR}" ] && WEATHERNG_DATA_DIR="/var/vdr/weatherng"
-	add_plugin_param "-D ${WEATHERNG_DATA_DIR}"
-}
-
diff --git a/media-plugins/vdr-weatherng/files/vdr-weatherng-0.0.5.diff b/media-plugins/vdr-weatherng/files/vdr-weatherng-0.0.5.diff
deleted file mode 100644
index cf374ec5c09c..000000000000
--- a/media-plugins/vdr-weatherng/files/vdr-weatherng-0.0.5.diff
+++ /dev/null
@@ -1,325 +0,0 @@
-diff -Nru weatherng-0.0.5/i18n.c weatherng-0.0.5-neu/i18n.c
---- weatherng-0.0.5/i18n.c	2005-06-18 14:58:43.000000000 +0200
-+++ weatherng-0.0.5-neu/i18n.c	2005-10-11 19:14:03.000000000 +0200
-@@ -1198,7 +1198,7 @@
-     "¿àØÒÕâ!",
-   },
-   { "Partly Cloudy",
--    "",
-+    "teilweise bewölkt",
-     "",// TODO
-     "",// TODO
-     "",// TODO
-diff -Nru weatherng-0.0.5/img/bitmap.c weatherng-0.0.5-neu/img/bitmap.c
---- weatherng-0.0.5/img/bitmap.c	2005-06-07 04:56:21.000000000 +0200
-+++ weatherng-0.0.5-neu/img/bitmap.c	2005-10-11 19:14:03.000000000 +0200
-@@ -1,8 +1,9 @@
- #include <string>
- #include <vector>
--#include <Magick++.h>
--#include <vdr/tools.h>
- #include <vdr/osd.h>
-+#include <vdr/tools.h>
-+#include <Magick++.h>
-+
- using namespace Magick;
- 
- cBitmap* LoadMagick(const char *Filename, int height, int width, int colors, bool Quiet) {
-diff -Nru weatherng-0.0.5/OsdWeather.c weatherng-0.0.5-neu/OsdWeather.c
---- weatherng-0.0.5/OsdWeather.c	2005-06-18 14:58:43.000000000 +0200
-+++ weatherng-0.0.5-neu/OsdWeather.c	2005-10-11 19:14:30.000000000 +0200
-@@ -217,7 +217,7 @@
- 	sat_file = sat_file + "/daten.dat";
- 	BOOL ex = if_exist_file(sat_file.c_str());
- 	
--		int MAXHOEHE = 480;
-+		int MAXHOEHE = 430;
- 	 	int MAXBREITE = 624;
- 		int HALBEHOEHE= (Setup.OSDHeight/2)+1;
- 		int HALBEBREITE= (Setup.OSDWidth/2)+1;	
-@@ -273,19 +273,11 @@
- 			printf("Information about: %s\n",parser.ort.c_str());
- 
- 			  ausgabe = tr("Weather for: ");
--			  ausgabe = ausgabe + parser.ort.c_str();
-+			  ausgabe = ausgabe + parser.ort.c_str() + "  /  ";
-+			  ausgabe = ausgabe + tr(parser.dayname.c_str());
-+			  ausgabe = ausgabe + "  (" + parser.date + ")";
- 			osd->DrawText(8,HALBEHOEHE+4,ausgabe.c_str(), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font);
- 
--
--//			  ausgabe = replaceDay(parser.dayname.c_str()) + " ("+  parser.date.c_str() +")";
--			  ausgabe = parser.dayname;
--//			  ausgabe = tr(ausgabe);
--			osd->DrawText(HALBEBREITE+70,HALBEHOEHE+4,tr(ausgabe.c_str()), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font,CELLWIDTH,20,taRight);
--
--		          ausgabe = "(" + parser.date + ")";
--    			osd->DrawText(HALBEBREITE+144,HALBEHOEHE+4,ausgabe.c_str(), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font,CELLWIDTH,20,taRight);
--
--
- 			osd->DrawText(8,HALBEHOEHE+40,tr("High temperature: "), wetterTheme[wetterSetup.w_theme].clrFgHiColor,clrTransparent,font);
- 		          ausgabe = parser.hi.c_str();
- 		          ausgabe= ausgabe + tr("°C");
-@@ -313,22 +305,22 @@
- 			//right Side
- 			osd->DrawText(HALBEBREITE+15,HALBEHOEHE+40,tr("Wind comes from: "), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font);
- 			  ausgabe = parser.winddir.c_str();
--			osd->DrawText(HALBEBREITE+144,HALBEHOEHE+40,ausgabe.c_str(), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font,CELLWIDTH,20,taRight);
-+			osd->DrawText(Setup.OSDWidth - CELLWIDTH -6 ,HALBEHOEHE+40,ausgabe.c_str(), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font,CELLWIDTH,20,taRight);
- 
- 			osd->DrawText(HALBEBREITE+15,HALBEHOEHE+70,tr("Wind speed: "), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font);
- 			  ausgabe = parser.windspeed.c_str();
- 			  ausgabe= ausgabe + tr(" km/h");
--			osd->DrawText(HALBEBREITE+144,HALBEHOEHE+70,ausgabe.c_str(), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font,CELLWIDTH,20,taRight);
-+			osd->DrawText(Setup.OSDWidth - CELLWIDTH -6 ,HALBEHOEHE+70,ausgabe.c_str(), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font,CELLWIDTH,20,taRight);
- 
- 			osd->DrawText(HALBEBREITE+15,HALBEHOEHE+100,tr("Humitidy: "), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font);
- 			  ausgabe = parser.humidity.c_str();
- 			  ausgabe= ausgabe + tr(" %");
--			osd->DrawText(HALBEBREITE+144,HALBEHOEHE+100,ausgabe.c_str(), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font,CELLWIDTH,20,taRight);
-+			osd->DrawText(Setup.OSDWidth - CELLWIDTH -6 ,HALBEHOEHE+100,ausgabe.c_str(), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font,CELLWIDTH,20,taRight);
- 
- 			osd->DrawText(HALBEBREITE+15,HALBEHOEHE+130,tr("Precipitation: "), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font);
- 			  ausgabe = parser.raindown.c_str();
- 			  ausgabe= ausgabe + tr(" %");
--			osd->DrawText(HALBEBREITE+144,HALBEHOEHE+130,ausgabe.c_str(), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font,CELLWIDTH,20,taRight);
-+			osd->DrawText(Setup.OSDWidth - CELLWIDTH -6 ,HALBEHOEHE+130,ausgabe.c_str(), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font,CELLWIDTH,20,taRight);
- 
- 
-                      // BORDER
-@@ -360,7 +352,7 @@
- 			}
- 
- 			if (day<10){
--				osd->DrawText(HALBEBREITE+ 150,MAXHOEHE-29,tr("Day forward -->"), wetterTheme[wetterSetup.w_theme].clrBackground,clrTransparent,font,CELLWIDTH,20,taRight);
-+				osd->DrawText(Setup.OSDWidth - CELLWIDTH -6 ,MAXHOEHE-29,tr("Day forward -->"), wetterTheme[wetterSetup.w_theme].clrBackground,clrTransparent,font,CELLWIDTH,20,taRight);
- //				osd->DrawText((Setup.OSDWidth)-5,MAXHOEHE-29,tr("Day forward -->"), wetterTheme[wetterSetup.w_theme].clrBackground,clrTransparent,font,CELLWIDTH,20,taRight);
- 			}
- 
-@@ -373,7 +365,7 @@
- 		else
- 	         {
- 			osd->DrawText(20,HALBEHOEHE+10,tr("ERROR : NO DATA"), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font);
--			osd->DrawText(20,HALBEHOEHE+50,tr("Check path and that you are in offlinemode"), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font);
-+			osd->DrawText(20,HALBEHOEHE+50,tr("Check path and setup ,that you are not in offlinemode"), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font);
- 			osd->DrawText(20,HALBEHOEHE+80,tr("Your path to 'daten.dat' is:"), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font);
- 			osd->DrawText(20,HALBEHOEHE+110,tr(DataDir), wetterTheme[wetterSetup.w_theme].clrFgHiColor,clrTransparent,font);
- 			osd->DrawText(20,HALBEHOEHE+140,tr("Restart VDR with '--loglevel 3' and watch stdout"), wetterTheme[wetterSetup.w_theme].clrFgText,clrTransparent,font);
-diff -Nru weatherng-0.0.5/parsing.c weatherng-0.0.5-neu/parsing.c
---- weatherng-0.0.5/parsing.c	2005-06-18 22:04:29.000000000 +0200
-+++ weatherng-0.0.5-neu/parsing.c	2005-10-11 19:14:03.000000000 +0200
-@@ -12,19 +12,19 @@
- 
- 
- #define TAG_ERR_REMAIN(_context) do { \
--                esyslog("ERROR: Weatherng: Unexpected tag %s within %s", \
-+                esyslog("ERROR: Text2Skin: Unexpected tag %s within %s", \
-                                 name.c_str(), _context); \
-                 return false; \
-         } while (0)
- 
- #define TAG_ERR_CHILD(_context) do { \
--                esyslog("ERROR:  Weatherng: No child tag %s expected within %s", \
-+                esyslog("ERROR: Text2Skin: No child tag %s expected within %s", \
-                                 name.c_str(), _context); \
-                 return false; \
-         } while (0)
- 
- #define TAG_ERR_END(_context) do { \
--                esyslog("ERROR:  Weatherng: Unexpected closing tag for %s within %s", \
-+                esyslog("ERROR: Text2Skin: Unexpected closing tag for %s within %s", \
-                                 name.c_str(), _context); \
-                 return false; \
-         } while (0)
-@@ -36,7 +36,7 @@
- #define ATTRIB_MAN_STRING(_attr,_target) \
-         ATTRIB_OPT_STRING(_attr,_target) \
-         else { \
--                esyslog("ERROR:  Weatherng: Mandatory attribute %s missing in tag %s", \
-+                esyslog("ERROR: Text2Skin: Mandatory attribute %s missing in tag %s", \
-                                 _attr, name.c_str()); \
-                 return false; \
-         }
-@@ -44,7 +44,7 @@
- #define ATTRIB_MAN_NUMBER(_attr,_target) \
-         ATTRIB_OPT_NUMBER(_attr,_target) \
-         else { \
--                esyslog("ERROR:  Weatherng: Mandatory attribute %s missing in tag %s", \
-+                esyslog("ERROR: Text2Skin: Mandatory attribute %s missing in tag %s", \
-                                 _attr, name.c_str()); \
-                 return false; \
-         }
-@@ -52,7 +52,7 @@
- #define ATTRIB_OPT_FUNC(_attr,_func) \
-         if (attrs.find(_attr) != attrs.end()) { \
-                 if (!_func(attrs[_attr])) { \
--                        esyslog("ERROR:  Weatherng: Unexpected value %s for attribute %s", \
-+                        esyslog("ERROR: Text2Skin: Unexpected value %s for attribute %s", \
-                                         attrs[_attr].c_str(), _attr); \
-                         return false; \
-                 } \
-@@ -61,7 +61,7 @@
- #define ATTRIB_MAN_FUNC(_attr,_func) \
-         ATTRIB_OPT_FUNC(_attr,_func) \
-         else { \
--                esyslog("ERROR: Weatherng: Mandatory attribute %s missing in tag %s", \
-+                esyslog("ERROR: Text2Skin: Mandatory attribute %s missing in tag %s", \
-                                 _attr, name.c_str()); \
-                 return false; \
-         }
-diff -Nru weatherng-0.0.5/README.DE weatherng-0.0.5-neu/README.DE
---- weatherng-0.0.5/README.DE	2005-06-18 15:47:42.000000000 +0200
-+++ weatherng-0.0.5-neu/README.DE	2005-10-11 19:14:03.000000000 +0200
-@@ -98,7 +98,8 @@
- somit nicht mehr in die GPL (siehe permissions.txt im images Verzeichnis).
- 
- 
--Im Setup Menü müsst ihr lediglich die ID eingeben, die kann man wie folg herausfinden.
-+Dann muss man seine Einstellungen im Setup machen.
-+Die eigene ID kann man folgendermassen herausfinden:
- 
- Ruft die Seite http://www.weather.com auf. 
- 
-@@ -106,14 +107,15 @@
- 
- Nach dem Suchen bekommt Ihr ein Link zur eurer Stadt, in der URL steht ein Code,
- der wie folgt aufgebaut ist 
--
- GMXX0056 (Angabe für den Ort Herne)
--
- wobei 0056 ausgetauscht wird, mit der Nummer die für den jeweiligen Ort angegeben wurde.
- 
- Im Offlinemodus wird nicht aufs Internet zugegriffen.
--somit ist es moeglich die Daten auf anderen Rechner zu besorgen und
-+Somit ist es moeglich die Daten auf anderen Rechner zu besorgen und
- auf einen internetfreien VDR zu kopieren.
-+Standardmaessig ist der Offlinemodus aktiviert und es werden keine Daten heruntergeladen.
-+Also sollten keine Daten angezeigt werden , zuerst diesen Punkt ueberpruefen.
-+Der Fehler macht sich bemerkbar durch eine fehlende Datei "daten.dat".
- 
- 
- ____________________________________________
-diff -Nru weatherng-0.0.5/setup.c weatherng-0.0.5-neu/setup.c
---- weatherng-0.0.5/setup.c	2005-06-18 05:45:04.000000000 +0200
-+++ weatherng-0.0.5-neu/setup.c	2005-10-11 19:14:03.000000000 +0200
-@@ -6,7 +6,7 @@
- 
- cWetterSetup::cWetterSetup(void)
- {
--	strcpy(stationId, "GMXX0049");
-+	strcpy(stationId, "GMXX0056");
- 	w_left       = 150;
- 	w_top        = 120;
- 	w_width      = 420;
-@@ -50,9 +50,9 @@
-   },    
-   { // Enigma OK
-     0xB8BFC9E6, //clrBackground
--    0xFFC4C400, //clrFgHiColor
--    0xFF4158BC, //clrFgLowColor
-+    0xFFFF4040, //clrFgHiColor
-+    0xFF000000, //clrFgLowColor
- //    0xB84158BC, //clrBorder
--    0xFFFFFFFF, //clrFgText + Border
-+    0xB84E528F, //clrFgText + Border
-   },    
- }; 
-diff -Nru weatherng-0.0.5/Tools/SatDownload weatherng-0.0.5-neu/Tools/SatDownload
---- weatherng-0.0.5/Tools/SatDownload	2005-06-13 15:49:48.000000000 +0200
-+++ weatherng-0.0.5-neu/Tools/SatDownload	2005-10-11 19:15:09.000000000 +0200
-@@ -34,7 +34,7 @@
- # DANN FOLGENDES IN commands.conf EINTRAGEN:
- #   Wetter aktualisieren : at -f "/dein_pfad_zu_SatDownload/SatDownload" now
- 
--cd /VDR/etc/plugins/weatherng;
-+cd /var/vdr/weatherng;
- 
-           wget --tries=4 --timeout=20 -O overall.wet "$URL"
-           wget --tries=4 --timeout=20 -O pic1.wet $URL1
-diff -Nru weatherng-0.0.5/weatherng.c weatherng-0.0.5-neu/weatherng.c
---- weatherng-0.0.5/weatherng.c	2005-06-14 21:57:51.000000000 +0200
-+++ weatherng-0.0.5-neu/weatherng.c	2005-10-11 19:14:03.000000000 +0200
-@@ -111,33 +111,23 @@
- {
-   themes[eWetterThemeClassic]     = tr("Classic");
-   themes[eWetterThemeenElchi]     = tr("enElchi");
--  themes[eWetterThemeMoronimo]     = tr("Moronimo");
--  themes[eWetterThemeDeepBlue]     = tr("DeepBlue");
--  themes[eWetterThemeEnigma]     = tr("Enigma");
-+  themes[eWetterThemeMoronimo]    = tr("Moronimo");
-+  themes[eWetterThemeDeepBlue]    = tr("DeepBlue");
-+  themes[eWetterThemeEnigma]      = tr("Enigma");
-+
-+  Add(new cMenuEditStrItem(tr("Station ID"),                  wetterSetup.stationId, 9, ALLOWED_STATION_CHARS));
-+  Add(new cMenuEditIntItem(tr("Radar left"),                  &wetterSetup.w_left, 1, 200));
-+  Add(new cMenuEditIntItem(tr("Radar top"),                   &wetterSetup.w_top, 1, 200));
-+  Add(new cMenuEditIntItem(tr("Radar width"),                 &wetterSetup.w_width, 100, 450));
-+  Add(new cMenuEditIntItem(tr("Radar height"),                &wetterSetup.w_height, 100, 400));
-+  Add(new cMenuEditBoolItem(tr("256 Colordepth (radarmaps)"), &wetterSetup.w_rcolor));
-+  Add(new cMenuEditBoolItem(tr("Use small fonts"),            &wetterSetup.w_fontsize));
-+  Add(new cMenuEditBoolItem(tr("Use offlinemode"),            &wetterSetup.w_offline));
-+  Add(new cMenuEditStraItem(tr("Theme"),                      &wetterSetup.w_theme, eWetterThemeMaxNumber, themes));
- 
--  Setup();
- }    
- 
- 
--void cMenuWetterSetup::Setup(void)
--{
--    int current = Current();
--
--        Clear();
--	Add(new cMenuEditStrItem(tr("Station ID"),                   wetterSetup.stationId, 9, ALLOWED_STATION_CHARS));
--	Add(new cMenuEditIntItem(tr("Radar left"),                  &wetterSetup.w_left, 1, 200));
--	Add(new cMenuEditIntItem(tr("Radar top"),                   &wetterSetup.w_top, 1, 200));
--	Add(new cMenuEditIntItem(tr("Radar width"),                 &wetterSetup.w_width, 100, 450));
--	Add(new cMenuEditIntItem(tr("Radar height"),                &wetterSetup.w_height, 100, 400));
--	Add(new cMenuEditBoolItem(tr("256 Colordepth (radarmaps)"), &wetterSetup.w_rcolor));
--	Add(new cMenuEditBoolItem(tr("Use small fonts"),            &wetterSetup.w_fontsize));
--	Add(new cMenuEditBoolItem(tr("Use offlinemode"),            &wetterSetup.w_offline));
--	Add(new cMenuEditStraItem(tr("Theme"),                      &wetterSetup.w_theme, eWetterThemeMaxNumber, themes));
--
--  SetCurrent(Get(current));
--  Display();	
--}
--
- void cMenuWetterSetup::Store(void)
- {
- 	for(char *ptr = wetterSetup.stationId; *ptr; ++ptr) {
-@@ -157,13 +147,5 @@
- 	SetupStore("Theme",           wetterSetup.w_theme);
- 	}
- 
--eOSState cMenuWetterSetup::ProcessKey(eKeys Key)
--{
-- eOSState state = cMenuSetupPage::ProcessKey(Key);
-- if (Key != kNone) {
--       Setup();
--       }
-- return state;
--}
-         
- VDRPLUGINCREATOR(cPluginWetter); // Don't touch this!
-diff -Nru weatherng-0.0.5/weatherng.h weatherng-0.0.5-neu/weatherng.h
---- weatherng-0.0.5/weatherng.h	2005-06-14 22:04:14.000000000 +0200
-+++ weatherng-0.0.5-neu/weatherng.h	2005-10-11 19:14:03.000000000 +0200
-@@ -14,8 +14,7 @@
- static const char *DESCRIPTION    = "Weather forecast";
- static const char *MAINMENUENTRY  = "Weather-NG";
- 
--static const char *ALLOWED_STATION_CHARS 	= "abcdefghijklmnopqrstuvwxyz0123456789";
--//static const char hex[] = { "0123456789abcdef" };
-+static const char *ALLOWED_STATION_CHARS = tr("abcdefghijklmnopqrstuvwxyz0123456789");
- 
- class cPluginWetter : public cPlugin {
- private:
-@@ -41,9 +40,7 @@
- class cMenuWetterSetup : public cMenuSetupPage {
- 	private:
-                 const char *themes[eWetterThemeMaxNumber];
--		virtual void Setup(void);
- 	protected:
--	        virtual eOSState ProcessKey(eKeys Key);
- 		virtual void Store(void);
- 	public:
-   		cMenuWetterSetup(void);
diff --git a/media-plugins/vdr-weatherng/files/vdr-weatherng-0.0.8_pre2-gentoo.diff b/media-plugins/vdr-weatherng/files/vdr-weatherng-0.0.8_pre2-gentoo.diff
deleted file mode 100644
index bd086592a71d..000000000000
--- a/media-plugins/vdr-weatherng/files/vdr-weatherng-0.0.8_pre2-gentoo.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-Joerg Bornkessel <hd_brummy@gentoo.org>
-Version 3 ( 25 Oct 2006 )
-
-diff -Naur weatherng-0.0.8-pre2.orig/examples/weatherng.sh weatherng-0.0.8-pre2/examples/weatherng.sh
---- weatherng-0.0.8-pre2.orig/examples/weatherng.sh	2006-03-19 18:35:48.897789250 +0100
-+++ weatherng-0.0.8-pre2/examples/weatherng.sh	2006-03-19 18:46:43.290686250 +0100
-@@ -8,6 +8,11 @@
- # To use this examples of urls , you must have the permission of owner to download and
- # use them. Otherwise you must change the URLs. See README or README.DE.
- 
-+source /etc/conf.d/vdr.weatherng
-+
-+SCRIPT_API=2
-+source /usr/share/vdr/rcscript/plugin-weatherng.sh
-+
- # Change SETUPDIR if you need.
- SETUPDIR=/etc/vdr
- 
-@@ -16,11 +21,11 @@
- case "${LANGUAGE[2]}" in
- 	1) MESG='Download abgeschlossen und Radarmaps aktualisiert'
- 	   URLS=(\
--#		http://www.dwd.de/scripts/getimg.php?src=/wundk/Wetter.jpg \
--#		http://www.wetter24.de/automatic/brd_tag_n+ww00002.jpg \
--#		http://www.wetter24.de/automatic/brd_tag_dd00002.jpg \
--#		http://www.wetter24.de/automatic/brd_tag_tt00002.jpg \
--#		http://www.wetter24.de/automatic/brd_tag_rr00002.jpg \
-+		http://www.dwd.de/scripts/getimg.php?src=/wundk/Wetter.jpg \
-+       http://www.zdf.de/ZDFde/wetter/showpicture/0,2236,355,00.jpg \
-+       http://www.zdf.de/ZDFde/wetter/showpicture/0,2236,110,00.jpg \
-+       http://www.zdf.de/ZDFde/wetter/showpicture/0,2236,267,00.jpg \
-+       http://www.zdf.de/ZDFde/wetter/showpicture/0,2236,346,00.jpg \
- 		)
- 	;;
- 	7) MESG='Téléchargement des données Météo OK'
-@@ -53,7 +58,7 @@
- esac
- 
- for i in $(seq 0 10) ; do
--    eval ${URLS[$i]:+ wget -t 4 -T 20 "${URLS[$i]}" -O "$SETUPDIR/plugins/weatherng/pic${i}"}
-+    eval ${URLS[$i]:+ wget -t 4 -T 20 "${URLS[$i]}" -O "${WEATHERNG_DATA_DIR}/pic${i}"}
- done
- 
- # Dont change or uncomment this and the following 5 lines. ;)
-@@ -63,8 +68,8 @@
- # Example for Herne,Germany [GMXX0057]with a permission from The weather channel:
- # e.g :  wget -t 4 -T 20 "http://xoap.weather.com/weather/local/GMXX0057?cc=*&unit=m&dayf=10&prod=xoap&par=1004124588&key=079f24145f208494" -O "$SETUPDIR/plugins/weatherng/data1.xml"
- 
--#wget -t 4 -T 20 "http://xoap.weather.com/weather/local/STATIONID1?cc=*&unit=m&dayf=10&prod=xoap&par=1004124588&key=079f24145f208494" -O "$SETUPDIR/plugins/weatherng/data1.xml"
--#wget -t 4 -T 20 "http://xoap.weather.com/weather/local/STATIONID2?cc=*&unit=m&dayf=10&prod=xoap&par=1004124588&key=079f24145f208494" -O "$SETUPDIR/plugins/weatherng/data2.xml"
--#wget -t 4 -T 20 "http://xoap.weather.com/weather/local/STATIONID3?cc=*&unit=m&dayf=10&prod=xoap&par=1004124588&key=079f24145f208494" -O "$SETUPDIR/plugins/weatherng/data3.xml"
-+wget -t 4 -T 20 "http://xoap.weather.com/weather/local/${WEATHERNG_STATIONID1}?cc=*&unit=m&dayf=10&prod=xoap&par=1004124588&key=079f24145f208494" -O "${WEATHERNG_DATA_DIR}/data1.xml"
-+wget -t 4 -T 20 "http://xoap.weather.com/weather/local/${WEATHERNG_STATIONID2}?cc=*&unit=m&dayf=10&prod=xoap&par=1004124588&key=079f24145f208494" -O "${WEATHERNG_DATA_DIR}/data2.xml"
-+wget -t 4 -T 20 "http://xoap.weather.com/weather/local/${WEATHERNG_STATIONID3}?cc=*&unit=m&dayf=10&prod=xoap&par=1004124588&key=079f24145f208494" -O "${WEATHERNG_DATA_DIR}/data3.xml"
- 
- echo $MESG
diff --git a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.5.ebuild b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.5.ebuild
deleted file mode 100644
index e3cb704f56db..000000000000
--- a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.5.ebuild
+++ /dev/null
@@ -1,60 +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-weatherng/vdr-weatherng-0.0.5.ebuild,v 1.3 2007/01/05 17:05:12 hd_brummy Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: show weather for specified place"
-HOMEPAGE="http://beejay.vdr-developer.org/"
-SRC_URI="http://beejay.vdr-developer.org/devel/${P}.tgz
-		mirror://vdrfiles/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="media-gfx/imagemagick
-	>=media-video/vdr-1.3.34
-	media-plugins/vdr-weatherng-images"
-
-PATCHES="${FILESDIR}/${P}.diff"
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/commands/
-	doins "${FILESDIR}/commands.${VDRPLUGIN}.conf"
-
-	diropts -m755 -ovdr -gvdr
-	keepdir /var/vdr/${VDRPLUGIN}
-	insinto /var/vdr/${VDRPLUGIN}
-	insopts -m755
-	doins ${S}/Tools/SatDownload
-
-	insopts -m644 -ovdr -gvdr
-	touch daten.dat
-	doins daten.dat
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Note: On first run, this Plugin is in Offline Mode"
-	elog "You can change this in OSD Menu of the plugin."
-	elog
-	elog
-	elog "To display the weather for your location"
-	elog "you have to find out its ID on weather.com"
-	elog
-	elog "Go to http://www.weather.com and search for your city (i.e. Herne)"
-	elog "in the list of results click on the right one and then look at its URL"
-	elog
-	elog "It contains a code for your city"
-	elog "For Herne this is GMXX0056"
-	elog
-	elog
-	 "Now you have to enter this code in plugin-setup in OSD"
-	echo
-}
diff --git a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre2.ebuild b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre2.ebuild
deleted file mode 100644
index 273a14629e33..000000000000
--- a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre2.ebuild
+++ /dev/null
@@ -1,58 +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-weatherng/vdr-weatherng-0.0.8_pre2.ebuild,v 1.6 2007/01/05 17:05:12 hd_brummy Exp $
-
-inherit vdr-plugin
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VDR plugin: show weather for specified place"
-HOMEPAGE="http://beejay.vdr-developer.org/"
-SRC_URI="mirror://vdrfiles/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2 stardock-images"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND="media-libs/imlib2
-	>=media-video/vdr-1.3.34"
-
-S="${WORKDIR}/weatherng-${MY_PV}"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-0.0.8"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.0.8.sh"
-
-PATCHES="${FILESDIR}/${P}-gentoo.diff"
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /usr/share/vdr/weatherng/images
-	doins ${S}/images/*.png
-
-	diropts -m0755 -ovdr -gvdr
-	dodir /var/vdr/${VDRPLUGIN}
-
-	insinto  /var/vdr/${VDRPLUGIN}
-	insopts -m755 -ovdr -gvdr
-	doins ${S}/examples/weatherng.sh
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "To display the weather for your location"
-	elog "you have to find out its ID on weather.com"
-	elog
-	elog "Go to http://www.weather.com and search for your city (i.e. Herne)"
-	elog "in the list of results click on the right one and then look at its URL"
-	elog
-	elog "It contains a code for your city"
-	elog "For Herne this is GMXX0056"
-	elog
-	elog "Now you have to enter this code in /etc/conf.d/vdr.weatherng WEATHERNG_STATIONID(x)"
-	echo
-}
diff --git a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild
index 2a45ca08c88b..a57c7432c81b 100644
--- a/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild
+++ b/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild,v 1.7 2007/09/19 10:36:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/vdr-weatherng-0.0.8_pre3.ebuild,v 1.8 2007/09/19 16:02:31 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -8,12 +8,12 @@ MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="VDR plugin: show weather for specified place"
-HOMEPAGE="http://beejay.vdr-developer.org/"
+HOMEPAGE="http://www.vdr.glaserei-franz.de/vdrplugins.htm"
 SRC_URI="mirror://vdrfiles/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2 stardock-images"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE="dxr3"
 
 DEPEND="media-libs/imlib2