Restore original weather.com key wrt #423691 by Balint SZENTE

(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)

3 files changed, 45 insertions, 6 deletions

diff --git a/xfce-extra/xfce4-weather-plugin/ChangeLog b/xfce-extra/xfce4-weather-plugin/ChangeLog
index 94cadc3e935f..93f0fb82dbc2 100644
--- a/xfce-extra/xfce4-weather-plugin/ChangeLog
+++ b/xfce-extra/xfce4-weather-plugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-weather-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/ChangeLog,v 1.19 2012/05/05 07:47:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/ChangeLog,v 1.20 2012/06/27 14:20:01 ssuominen Exp $
+
+*xfce4-weather-plugin-0.7.4-r2 (27 Jun 2012)
+
+  27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-weather-plugin-0.7.4-r1.ebuild, +xfce4-weather-plugin-0.7.4-r2.ebuild:
+  Restore original weather.com key wrt #423691 by Balint SZENTE
 
   05 May 2012; Michał Górny <mgorny@gentoo.org>
   xfce4-weather-plugin-0.7.4-r1.ebuild:
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild
index ec8b4484a624..b189a9c184bc 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild,v 1.5 2012/05/05 07:47:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild,v 1.6 2012/06/27 14:20:01 ssuominen Exp $
 
 EAPI=4
 inherit multilib xfconf
@@ -34,10 +34,10 @@ pkg_setup() {
 
 src_prepare() {
 	# http://bugzilla.xfce.org/show_bug.cgi?id=8105#c9
-	sed -i \
-		-e '/PARTNER_ID/s:1121946239:1003666583:' \
-		-e '/LICENSE_KEY/s:3c4cd39ee5dec84f:4128909340a9b2fc:' \
-		panel-plugin/weather.h || die
+#	sed -i \
+#		-e '/PARTNER_ID/s:1121946239:1003666583:' \
+#		-e '/LICENSE_KEY/s:3c4cd39ee5dec84f:4128909340a9b2fc:' \
+#		panel-plugin/weather.h || die
 
 	xfconf_src_prepare
 }
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r2.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r2.ebuild
new file mode 100644
index 000000000000..4b4e956be307
--- /dev/null
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r2.ebuild,v 1.1 2012/06/27 14:20:01 ssuominen Exp $
+
+EAPI=4
+inherit multilib 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 ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/libxml2
+	x11-libs/gtk+:2
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}