[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-weather-plugin/, xfce-extra/xfce4-weather-plugin/files/

[Michał Górny]

commit:     414eb446d05dde63fca91dd39a94452e4560885b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 15:29:37 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 16:09:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=414eb446

xfce-extra/xfce4-weather-plugin: Prune old

 xfce-extra/xfce4-weather-plugin/Manifest           |   4 -
 ...ix-color-parsing-when-reading-config-file.patch |  28 ----
 ...-ready-for-met.no-locationforecast-1.2-AP.patch | 164 ---------------------
 ...et.no-locationforecastLTS-1.2-API-bug-109.patch |  28 ----
 .../xfce4-weather-plugin-0.8.3-upower-0.99.patch   |  64 --------
 .../xfce4-weather-plugin-0.8.3-r2.ebuild           |  45 ------
 .../xfce4-weather-plugin-0.8.4.ebuild              |  38 -----
 .../xfce4-weather-plugin-0.8.5.ebuild              |  38 -----
 .../xfce4-weather-plugin-0.8.6.ebuild              |  38 -----
 9 files changed, 447 deletions(-)

diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index bdc4ca7..438c68f 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -1,5 +1 @@
-DIST xfce4-weather-plugin-0.8.3.tar.bz2 2786473 SHA256 40a6a22be7653b15a47174a430da89040f178695b48e5e01e77990050f715ce4 SHA512 24b1f191e12fcd56a9149d2f0dd3d4449a31586503a28f96352b4dd25f795e3ebcb975997d580478840311c98e30d313458403814ca21d049f35865a5e75b687 WHIRLPOOL b857a236c39e9986ad6962cdc670fabb560ac32d1339d3c276fb8b512387a281c163cf66613a57c3858c98978acfdb8dd5c23ff97aec3dd70d8f6e57c954292a
-DIST xfce4-weather-plugin-0.8.4.tar.bz2 2910251 SHA256 56f6883f7b0e61e4fced57086dfb5a714afbb3d4ec33b1c433186c9a7d86fe3f SHA512 ad547681683150d2605d52e6b9d7f76d6871e7ffa5ae9b654ac324b94cf39d22318b624fa73e32a1457a6e865e3fb4d81d160ffbe3ce00b919ea6d167c06d29f WHIRLPOOL 7b45854636a6f5457d67ebd94c0f64c3e199d766a5f06b93e58ad45b4e7443168faca7ccb1db05b70f5cd3b0d0662ddbd43bd1ce44f348960078017e15c44607
-DIST xfce4-weather-plugin-0.8.5.tar.bz2 2937333 SHA256 be8ac0e5635355d568e4095a3459f53efd5f10a8ef46976a43dc30cbb277e5cd SHA512 f81b1cd0084abc07299724f9086b3efd7f7628affdcaec5d347ad092fcd632eb9a8c8f9fcbc53bf96b8b68717e515b45804d1838917ddea76009190815f0d2dc WHIRLPOOL bf85bd5499018abfe74dc2a3d6d35e84b48e398c07f34465391ba1bedaee361235ec3bcc7f2446f7afd84fd7a6f59bec99b986273bac1284c7730fbde3632d95
-DIST xfce4-weather-plugin-0.8.6.tar.bz2 2949753 SHA256 927c3b2c699208d63b2baf469b74c8c0dfcb98006ca9f80d75e7aec62658e6fa SHA512 052b652c64d83653e957831bb7f4717fe10b9a7847302c64100d5d9feb4b1b8c05306a35443a0e5859e68cbe48170051b77fc42d956068726286becffc7dde87 WHIRLPOOL 88db04f235cd892ce8921889249f08578a9ce6ccaf0c3352c301b6d153c6a0826006c9a8b3f301b620c9df921f7a5ce643843e5bb56cda2b1d6ae28dcaafff35
 DIST xfce4-weather-plugin-0.8.7.tar.bz2 2976092 SHA256 071e71106868c7d90c936256d837ca834d0ca6f54daea59a9b5fc11b318e65b0 SHA512 681b500cbeead09e61b2d30960853503e90ece6a73871b0a603d32026d7781096e5dac8fc456fb80a9a3a69c65f2ff1e297ffab520e7a7b27a31d5b7627710c8 WHIRLPOOL b195c2bf4a517623f3ad869f4ef70776de0ee49a99644207869c9ab6b3bce8e81e7f8e46143b38af468f638e5d34b7ca9d2878f50dc6468007a04152360a93c2

diff --git a/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-Fix-color-parsing-when-reading-config-file.patch b/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-Fix-color-parsing-when-reading-config-file.patch
deleted file mode 100644
index be93645..0000000
--- a/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-Fix-color-parsing-when-reading-config-file.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 09a9a4fdec9ee709bd3da2be2ba1cf13e4e377e1 Mon Sep 17 00:00:00 2001
-From: Harald Judt <h.judt@×××.at>
-Date: Wed, 20 Feb 2013 15:25:09 +0100
-Subject: [PATCH] Fix color parsing when reading config file.
-
-This turned out to be a stupid copy & paste mistake.
-
-(cherry picked from commit 462e85dfd54e9a3bdf6c330c602a6545bccce585)
----
- panel-plugin/weather.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
-index 710c33c..4a2e3c3 100644
---- a/panel-plugin/weather.c
-+++ b/panel-plugin/weather.c
-@@ -884,7 +884,7 @@ xfceweather_read_config(XfcePanelPlugin *plugin,
- 
-     value = xfce_rc_read_entry(rc, "scrollbox_color", NULL);
-     if (value)
--        gdk_color_parse("#rrrrggggbbbb", &(data->scrollbox_color));
-+        gdk_color_parse(value, &(data->scrollbox_color));
- 
-     data->scrollbox_use_color =
-         xfce_rc_read_bool_entry(rc, "scrollbox_use_color", FALSE);
--- 
-2.1.2
-

diff --git a/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-Make-plugin-ready-for-met.no-locationforecast-1.2-AP.patch b/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-Make-plugin-ready-for-met.no-locationforecast-1.2-AP.patch
deleted file mode 100644
index a19241c..0000000
--- a/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-Make-plugin-ready-for-met.no-locationforecast-1.2-AP.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-http://bugs.gentoo.org/524850
-
-From a17ed6d248135cedc645b0481c4ad01687386ed2 Mon Sep 17 00:00:00 2001
-From: Harald Judt <h.judt@×××.at>
-Date: Wed, 28 May 2014 20:08:02 +0200
-Subject: [PATCH] Make plugin ready for met.no locationforecast-1.2 API (bug
- #10916).
-
-http://api.yr.no/weatherapi/locationforecastlts/1.1/documentation#version_1_2___2014_05_20
-
-The updated API version uses CamelCase symbol names instead of UPPERCASE
-ones and has added some new names (like 'Drizzle'), which unfortunately
-have not been documented (yet?).
-
-What's more, the typo 'celcius' has been replaced by the fixed 'celsius',
-but luckily the plugin will not be affected by that change.
-
-What's a bit more unfortunate is that the existing icon themes do not
-cover the new symbol names, so one would have to create quite a lot of
-new icons. Also, new translations would have to be added for the symbols,
-and maybe existing ones would have to be altered. To prevent this, we're
-simply going to map the new symbols to existing ones as good as possible.
-This should be good enough for the time being.
-
-(cherry picked from commit 1ff71669644a0b824a8a5ba9b40771ee4fb8a76b)
----
- panel-plugin/weather-parsers.c   |  3 +-
- panel-plugin/weather-translate.c | 70 +++++++++++++++++++++++++++++++++++++++-
- panel-plugin/weather-translate.h |  2 ++
- 3 files changed, 73 insertions(+), 2 deletions(-)
-
-diff --git a/panel-plugin/weather-parsers.c b/panel-plugin/weather-parsers.c
-index c380130..2c90c11 100644
---- a/panel-plugin/weather-parsers.c
-+++ b/panel-plugin/weather-parsers.c
-@@ -28,6 +28,7 @@
- #define _XOPEN_SOURCE
- #define _XOPEN_SOURCE_EXTENDED 1
- #include "weather-parsers.h"
-+#include "weather-translate.h"
- #include "weather-debug.h"
- 
- #include <time.h>
-@@ -196,8 +197,8 @@ parse_location(xmlNode *cur_node,
-         }
-         if (NODE_IS_TYPE(child_node, "symbol")) {
-             g_free(loc->symbol);
--            loc->symbol = PROP(child_node, "id");
-             loc->symbol_id = strtol(PROP(child_node, "number"), NULL, 10);
-+            loc->symbol = g_strdup(get_symbol_for_id(loc->symbol_id));
-         }
-     }
- 
-diff --git a/panel-plugin/weather-translate.c b/panel-plugin/weather-translate.c
-index 004eef1..cc97600 100644
---- a/panel-plugin/weather-translate.c
-+++ b/panel-plugin/weather-translate.c
-@@ -29,6 +29,7 @@
- #include "weather-translate.h"
- 
- #define DAY_LOC_N (sizeof(gchar) * 100)
-+#define NODATA "NODATA"
- 
- 
- static const gchar *wdirs[] = {
-@@ -169,7 +170,7 @@ static const symbol_desc symbol_to_desc[] = {
- 
-     { 15, "FOG",                 N_("Fog"),                        N_("Fog")                        },
- 
--    /* Symbols 16-19 are used for polar days */
-+    /* Symbols 16-19 are used for polar days (unused beginning with API version 1.2) */
-     { 16, "SUN",                 N_("Sunny"),                      N_("Clear")                      },
-     { 17, "LIGHTCLOUD",          N_("Lightly cloudy"),             N_("Lightly cloudy")             },
-     { 18, "LIGHTRAINSUN",        N_("Rain showers"),               N_("Rain showers")               },
-@@ -185,6 +186,73 @@ static const symbol_desc symbol_to_desc[] = {
- #define NUM_SYMBOLS (sizeof(symbol_to_desc) / sizeof(symbol_to_desc[0]))
- 
- 
-+/*
-+ * API version 1.2, published in May 2014, introduced new symbols. We
-+ * try to match these with existing symbols, in order to be compatible
-+ * with existing icon themes and to maintain translation completeness.
-+ *
-+ * See http://api.met.no/weatherapi/weathericon/1.1/documentation
-+ * for a list of symbols. For a list of symbols with descriptions,
-+ * see http://om.yr.no/forklaring/symbol.
-+ */
-+gint
-+replace_symbol_id(gint id)
-+{
-+    /* Symbol ids greater than 100 are used for indicating polar
-+     * night. These ids are over the ordinary id + 100. Since we
-+     * don't support polar icons, we can simply subtract 100 to
-+     * get the non-polar symbol ids.
-+     */
-+    if (id > 100)
-+        id -= 100;
-+
-+    switch (id) {
-+    case 24: return 22; /* Light rain showers and thunder */
-+    case 25: return 6;  /* Heavy rain showers and thunder */
-+    case 26: return 20; /* Light sleet showers and thunder */
-+    case 27: return 20; /* Heavy sleet showers and thunder */
-+    case 28: return 21; /* Light snow showers and thunder */
-+    case 29: return 21; /* Heavy snow showers and thunder */
-+    case 30: return 22; /* Light rain and thunder */
-+    case 31: return 23; /* Light sleet and thunder */
-+    case 32: return 23; /* Heavy sleet and thunder */
-+    case 33: return 14; /* Light snow and thunder */
-+    case 34: return 14; /* Heavy snow and thunder */
-+
-+    /* symbols 35-39 are unused */
-+
-+    case 40: return 5;  /* Light rain showers */
-+    case 41: return 5;  /* Heavy rain showers */
-+    case 42: return 7;  /* Light sleet showers */
-+    case 43: return 7;  /* Heavy sleet showers */
-+    case 44: return 8;  /* Light snow showers */
-+    case 45: return 8;  /* Heavy snow showers */
-+    case 46: return 9;  /* Light rain */
-+    case 47: return 12; /* Light sleet */
-+    case 48: return 12; /* Heavy sleet */
-+    case 49: return 13; /* Light snow */
-+    case 50: return 13; /* Heavy snow */
-+    default: return id;
-+    }
-+}
-+
-+
-+const gchar *
-+get_symbol_for_id(gint id)
-+{
-+    if (G_UNLIKELY(id < 1))
-+        return NODATA;
-+
-+    if (id >= NUM_SYMBOLS)
-+        id = replace_symbol_id(id);
-+
-+    if (id < NUM_SYMBOLS)
-+        return symbol_to_desc[id-1].symbol;
-+
-+    return NODATA;
-+}
-+
-+
- const gchar *
- translate_desc(const gchar *desc,
-                const gboolean nighttime)
-diff --git a/panel-plugin/weather-translate.h b/panel-plugin/weather-translate.h
-index 1538466..2926279 100644
---- a/panel-plugin/weather-translate.h
-+++ b/panel-plugin/weather-translate.h
-@@ -24,6 +24,8 @@
- 
- G_BEGIN_DECLS
- 
-+const gchar *get_symbol_for_id(gint id);
-+
- const gchar *translate_desc(const gchar *desc,
-                             gboolean nighttime);
- 
--- 
-2.1.2
-

diff --git a/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-Switch-to-met.no-locationforecastLTS-1.2-API-bug-109.patch b/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-Switch-to-met.no-locationforecastLTS-1.2-API-bug-109.patch
deleted file mode 100644
index 0b91580..0000000
--- a/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-Switch-to-met.no-locationforecastLTS-1.2-API-bug-109.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://bugs.gentoo.org/524850
-
-From 70024ad992bfd3845d885469e5eccfad76269465 Mon Sep 17 00:00:00 2001
-From: Harald Judt <h.judt@×××.at>
-Date: Tue, 3 Jun 2014 19:59:05 +0200
-Subject: [PATCH] Switch to met.no locationforecastLTS-1.2 API (bug #10916).
-
-(cherry picked from commit 7df303bc5fa649299e18efeb5d4b801614030488)
----
- panel-plugin/weather.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
-index 4a2e3c3..e5036ae 100644
---- a/panel-plugin/weather.c
-+++ b/panel-plugin/weather.c
-@@ -638,7 +638,7 @@ update_handler(plugin_data *data)
-         /* build url */
-         url =
-             g_strdup_printf("http://api.yr.no/weatherapi"
--                            "/locationforecastlts/1.1/?lat=%s;lon=%s;msl=%d",
-+                            "/locationforecastlts/1.2/?lat=%s;lon=%s;msl=%d",
-                             data->lat, data->lon, data->msl);
- 
-         /* start receive thread */
--- 
-2.1.2
-

diff --git a/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-upower-0.99.patch b/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-upower-0.99.patch
deleted file mode 100644
index 7333fef..0000000
--- a/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-upower-0.99.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=10922
-
-From 79887843c58ef21233a0de571474ac656f977d7c Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel@×××××.com>
-Date: Fri, 30 May 2014 19:01:08 +0300
-Subject: [PATCH] Update for Upower 0.99
-
-Upower changed a singal handler.
----
- panel-plugin/weather.c | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
-index efa8559..30eddb3 100644
---- a/panel-plugin/weather.c
-+++ b/panel-plugin/weather.c
-@@ -1553,8 +1553,14 @@ proxy_auth(SoupSession *session,
- 
- #ifdef HAVE_UPOWER_GLIB
- static void
-+#if UP_CHECK_VERSION(0, 99, 0)
- upower_changed_cb(UpClient *client,
-+                  GParamSpec *pspec,
-                   plugin_data *data)
-+#else /* UP_CHECK_VERSION < 0.99 */
-+upower_changed_cb(UpClient *client,
-+                  plugin_data *data)
-+#endif /* UP_CHECK_VERSION */
- {
-     gboolean on_battery;
- 
-@@ -1576,7 +1582,7 @@ upower_changed_cb(UpClient *client,
-         schedule_next_wakeup(data);
-     }
- }
--#endif
-+#endif /* HAVE_UPOWER_GLIB */
- 
- 
- static void
-@@ -2171,10 +2177,16 @@ weather_construct(XfcePanelPlugin *plugin)
-                      G_CALLBACK(xfceweather_show_about), data);
- 
- #ifdef HAVE_UPOWER_GLIB
--    if (data->upower)
--        g_signal_connect(data->upower, "changed",
--                         G_CALLBACK(upower_changed_cb), data);
--#endif
-+    if (data->upower) {
-+#if UP_CHECK_VERSION(0, 99, 0)
-+        g_signal_connect (data->upower, "notify",
-+                          G_CALLBACK(upower_changed_cb), data);
-+#else /* UP_CHECK_VERSION < 0.99 */
-+        g_signal_connect (data->upower, "changed",
-+                          G_CALLBACK(upower_changed_cb), data);
-+#endif /* UP_CHECK_VERSION */
-+    }
-+#endif /* HAVE_UPOWER_GLIB */
- 
-     weather_dump(weather_dump_plugindata, data);
- }
--- 
-1.9.3
-

diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3-r2.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3-r2.ebuild
deleted file mode 100644
index f7744be..0000000
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A weather plug-in for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug upower"
-
-RDEPEND=">=dev-libs/glib-2.20
-	dev-libs/libxml2
-	>=net-libs/libsoup-2.26
-	>=x11-libs/gtk+-2.14:2
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfce4-panel-4.10
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-upower-0.99.patch
-		"${FILESDIR}"/${P}-Fix-color-parsing-when-reading-config-file.patch
-		"${FILESDIR}"/${P}-Make-plugin-ready-for-met.no-locationforecast-1.2-AP.patch
-		"${FILESDIR}"/${P}-Switch-to-met.no-locationforecastLTS-1.2-API-bug-109.patch
-		)
-
-	# For GEONAMES_USERNAME, read README file and ask ssuominen@!
-	XFCONF=(
-		$(use_enable upower)
-		$(xfconf_use_debug)
-		GEONAMES_USERNAME=Gentoo
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}

diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.4.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.4.ebuild
deleted file mode 100644
index fee64b2..0000000
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A weather plug-in for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug upower"
-
-RDEPEND=">=dev-libs/glib-2.20
-	dev-libs/libxml2
-	>=net-libs/libsoup-2.32
-	>=x11-libs/gtk+-2.14:2
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfce4-panel-4.10
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# For GEONAMES_USERNAME, read README file and ask ssuominen@!
-	XFCONF=(
-		$(use_enable upower)
-		$(xfconf_use_debug)
-		GEONAMES_USERNAME=Gentoo
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}

diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.5.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.5.ebuild
deleted file mode 100644
index d52b90f..0000000
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A weather plug-in for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug upower"
-
-RDEPEND=">=dev-libs/glib-2.20:=
-	dev-libs/libxml2:=
-	>=net-libs/libsoup-2.32:=
-	>=x11-libs/gtk+-2.14:2=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# For GEONAMES_USERNAME, read README file and ask ssuominen@!
-	XFCONF=(
-		$(use_enable upower)
-		$(xfconf_use_debug)
-		GEONAMES_USERNAME=Gentoo
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}

diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.6.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.6.ebuild
deleted file mode 100644
index 9179af7..0000000
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A weather plug-in for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug upower"
-
-RDEPEND=">=dev-libs/glib-2.20:=
-	dev-libs/libxml2:=
-	>=net-libs/libsoup-2.32:=
-	>=x11-libs/gtk+-2.14:2=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# For GEONAMES_USERNAME, read README file and ask ssuominen@!
-	XFCONF=(
-		$(use_enable upower)
-		$(xfconf_use_debug)
-		GEONAMES_USERNAME=Gentoo
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}