Bug #363593 - Version bump

Package-Manager: portage-2.1.9.34/cvs/Linux i686

5 files changed, 151 insertions, 3 deletions

diff --git a/x11-plugins/gkrellweather/ChangeLog b/x11-plugins/gkrellweather/ChangeLog
index f2b1f7ee127e..cc38b7ac5287 100644
--- a/x11-plugins/gkrellweather/ChangeLog
+++ b/x11-plugins/gkrellweather/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/gkrellweather
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/ChangeLog,v 1.32 2010/08/25 00:44:14 lack Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/ChangeLog,v 1.33 2011/05/10 18:20:14 lack Exp $
+
+*gkrellweather-2.0.8 (10 May 2011)
+
+  10 May 2011; Jim Ramsay <lack@gentoo.org> +gkrellweather-2.0.8.ebuild,
+  +files/gkrellweather-2.0.8-Move-GrabWeather.patch,
+  +files/gkrellweather-2.0.8-Respect-LDFLAGS.patch:
+  Bug #363593 - Version bump
 
 *gkrellweather-2.0.7-r2 (25 Aug 2010)
 
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index f617d7ad68a8..a83955296b6a 100644
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -1,8 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gkrellweather-2.0.7-Move-GrabWeather.patch 2081 RMD160 bab8b520875756e58c3fc973a45f498fdc5eb718 SHA1 84b52b67a6c8066201b6b9c618dd0042f546d39f SHA256 516777c80518a0c2aa924daf7028222a24a7f30714892741bf5551ab29ab032c
 AUX gkrellweather-2.0.7-Respect-LDFLAGS.patch 537 RMD160 399b6ae28022d1bcba2e8ac4a85383af84fa51d1 SHA1 b6e9174bcd8d2d2d5570f32f87f0cc432aae7227 SHA256 66aa262d2154db592da67205834e04a1217ada213c06e9083eb931db017e1be6
+AUX gkrellweather-2.0.8-Move-GrabWeather.patch 2162 RMD160 1d9d9b703756d9da808e43b3d8f3e4fd40b5fd15 SHA1 9a263678d4b2f6200d216de41bdb3d430b4f59cd SHA256 4209c50950352c8f4cba5a5bf3998f03722a7fe5cf01bf177faa0fbba46e04e4
+AUX gkrellweather-2.0.8-Respect-LDFLAGS.patch 537 RMD160 399b6ae28022d1bcba2e8ac4a85383af84fa51d1 SHA1 b6e9174bcd8d2d2d5570f32f87f0cc432aae7227 SHA256 66aa262d2154db592da67205834e04a1217ada213c06e9083eb931db017e1be6
 DIST gkrellweather-2.0.7.tgz 19968 RMD160 a8f92a45ea048c194970f5615e50c4b08120efe0 SHA1 53f62999a4aff018f6943b8b56dd9e54907754c3 SHA256 ad902acd0ffb8adb1f0d838e57545d1f52a31ae33711b73d28929c2786a740ca
+DIST gkrellweather-2.0.8.tgz 20227 RMD160 d4625aaeec2eceb055dbf61b750e8d07258ca8b6 SHA1 355ea882c0519baa66d102181452c6721755fd89 SHA256 06236ad489151019e71bab4ba63b4b8b06d58c58890caed8b1a28fdd05cde16d
 EBUILD gkrellweather-2.0.7-r1.ebuild 944 RMD160 d7982e40d8e87cc812d0d73c89a0f648362ac23b SHA1 3b2a9e17e5041ba4116d4f589450b9bc46a110d6 SHA256 9e1b2368edc1b43f9f744279b0469f548b6a82b8076b01e0956d48c0ee468d31
 EBUILD gkrellweather-2.0.7-r2.ebuild 915 RMD160 26ce70a6d903eb2aa9f11c94bc8f9ed48cc6c11b SHA1 a3340d1303ed8df30d952298293e2d6bd8c1439f SHA256 d11948c102b91d6fac87217bd9c4ae1fa452d2ef45242fc07a84daef237f59c2
 EBUILD gkrellweather-2.0.7.ebuild 963 RMD160 b12e4879bdbb88f8d68fbe83126f0c3274eee628 SHA1 a20de02c553c45d185795bb147fadfca7606696f SHA256 f2c9621638809c972d61316c49864704304223d781febee28ce9bd4f411a8496
-MISC ChangeLog 5178 RMD160 11f0ea8e8b03b671a250a7b7e86faaa191a26b77 SHA1 e4942e1148604c9d4d6d151fde0cea2d51e601da SHA256 3eab86b4ea9d710dfb7c3c4ecd719209f18e0046878a6f3cec06c10acb5afb21
+EBUILD gkrellweather-2.0.8.ebuild 910 RMD160 62a4d516484c572fabe02f44dd4b7015ea82568c SHA1 27396dbacfdd5048f6adb4c29537ce6ceb9665b1 SHA256 86bbf5104624cc94ffba212d8bbbae34627bddf225f475da0624ba33d9edc8ea
+MISC ChangeLog 5422 RMD160 975984f5a4c5114a5d0e6b28d3686a2388971a7f SHA1 78832005b9cbb6801d4a801b460e4d1acc16125e SHA256 3cbdbfe2a2c55d1821c0b4ae8a7328c77278d7d25c458d48af56beff80c774f2
 MISC metadata.xml 254 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c SHA1 172a4c3880766b1bb7e75f4f2b4ed0b62c1d2d6c SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNyYHtAAoJEA8o5SF9Rr6qNjoP/2fQEuahiFduRAuMbWShEJ9s
+jvzYT9J6T74zU0nNy691NiOP5YeePgZG+HlNPT/n0BRyJ6fqSlULbFeDRjtGa8fj
+nWMiJpdjrPtdc1aTBYGkwDE0Bx8ZD+M9BTS7ol+b9yxAX0tkK0LAxOtlzbXW9cva
+SAa+ob8x4or9sp8Rx4iXqQj04XmWSRVnamsFpmvVli2XGA1KpbyyNkQUuoAD+NXr
+h7uGxhVQD1QwVJ6QCGO8TyxNJ9kxI0RMGZnm3eOh8aUK2X3aCuJz0kF8s2pPscoF
+il5PJ+zyPBS1h08RSR3Z6z+HtefJ7hkCHO4vqyJZ9F/6UVUEmoiaqjNwe9virt2R
+kn5OqcwU1/KG5bX3mBCFgxih3muGLxAe5KazxzrkRz9OMBKzKkIC4oTfB5dmYlhN
+cwSSjR1v3QTKwwT/p7bpe/9myVE4ITeE8YIp5cb0EHu0IiK6jnOtj/eZz4xeUFBK
+zIgc/LpP95FrDmij9pZTTRIfuZ7eDadjwySb39jK6V0ugEf8WCgy6zDcFBmKbAH4
+pu4B21YefQCn1OcfFeyQ1kd+4FC+8yKZoMIKjHbhLR9ujQEIt7xeOB5aaBxaJzqP
+b3upbI5MrDY9A+W1e/qut4AsrFdyRruj8kmufph/iziNl6IZeGgpNgXF5UQH7rQN
+6fMXMUcOkzmv9CHPRZSb
+=CDeH
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch
new file mode 100644
index 000000000000..5e2eb95e33fc
--- /dev/null
+++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Move-GrabWeather.patch
@@ -0,0 +1,56 @@
+From dc0fed370865b49e9bcb2db2eb7ff21adec904a8 Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <lack@gentoo.org>
+Date: Tue, 24 Aug 2010 12:23:25 -0400
+Subject: [PATCH] Move GrabWeather script to $(PREFIX)/libexec/gkrellweather/
+
+This is to avoid a file collision with x11-misc/bbweather (Bug #333289)
+---
+ Makefile        |    4 ++--
+ gkrellweather.c |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d6dc404..693b4f2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -38,13 +38,13 @@ install:
+ 	else \
+ 		install -D -c -s -m 644 gkrellweather.so $(PREFIX)/lib/gkrellm2/plugins/gkrellweather.so ; \
+ 	fi
+-	install -c -m 755 GrabWeather $(PREFIX)/bin
++	install -D -c -m 755 GrabWeather $(PREFIX)/libexec/gkrellweather/
+ 
+ uninstall:
+ 	(cd po && ${MAKE} uninstall )
+ 	rm -f /usr/lib/gkrellm2/plugins/gkrellweather.so
+ 	rm -f $(PREFIX)/lib/gkrellm2/plugins/gkrellweather.so
+-	rm -f $(PREFIX)/bin/GrabWeather
++	rm -f $(PREFIX)/libexec/gkrellweather/GrabWeather
+ 
+ dist:
+ 	rm -rf $(PKGNAME)-$(VERSION)
+diff --git a/gkrellweather.c b/gkrellweather.c
+index 1d4cf4e..224260a 100644
+--- a/gkrellweather.c
++++ b/gkrellweather.c
+@@ -721,7 +721,7 @@ apply_air_config (void)
+         options.station[1] = c[1];
+         options.station[2] = c[2];
+         options.station[3] = c[3];
+-        snprintf(options.command, 512, PREFIX "/bin/GrabWeather %s", options.station);
++        snprintf(options.command, 512, PREFIX "/libexec/gkrellweather/GrabWeather %s", options.station);
+         options.command[511] = 0;
+         snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat",
+                 getenv("HOME"), options.station);
+@@ -986,7 +986,7 @@ read_default(void)
+     options.windspeed_unit = 1;
+     options.pressure_unit = 1;
+     strcpy(options.station, DEFAULT_STATION_ID);
+-    snprintf(options.command, 512, "/usr/share/gkrellm/GrabWeather %s", options.station);
++    snprintf(options.command, 512, PREFIX "/libexec/gkrellweather/GrabWeather %s", options.station);
+     options.command[511] = 0;
+     snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat",
+              getenv("HOME"), options.station);
+-- 
+1.7.2
+
diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Respect-LDFLAGS.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Respect-LDFLAGS.patch
new file mode 100644
index 000000000000..9256cdd919c8
--- /dev/null
+++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-Respect-LDFLAGS.patch
@@ -0,0 +1,25 @@
+From 82c3a24ef34c5a5388ee9cc40126b3381fb8445a Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <lack@gentoo.org>
+Date: Wed, 11 Aug 2010 09:03:13 -0400
+Subject: [PATCH] Respect LDFLAGS
+
+---
+ Makefile |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d6dc404..46074ab 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,6 +5,8 @@ LIBS = `pkg-config gtk+-2.0 --libs`
+ LFLAGS = -shared
+ PREFIX = /usr/local
+ 
++LFLAGS += $(LDFLAGS)
++
+ LOCALEDIR := $(PREFIX)/share/locale
+ 
+ ifeq ($(enable_nls),1)
+-- 
+1.7.2
+
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild
new file mode 100644
index 000000000000..31b8fe7f5593
--- /dev/null
+++ b/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild,v 1.1 2011/05/10 18:20:14 lack Exp $
+
+EAPI=3
+inherit gkrellm-plugin
+
+IUSE=""
+DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weather
+info"
+SRC_URI="http://sites.google.com/site/makovick/projects/${P}.tgz"
+HOMEPAGE="http://sites.google.com/site/makovick/gkrellm-plugins"
+
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=net-misc/wget-1.5.3"
+DEPEND=">=sys-apps/sed-4.0.5"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Respect-LDFLAGS.patch"
+	epatch "${FILESDIR}/${P}-Move-GrabWeather.patch"
+}
+
+src_compile() {
+	emake PREFIX=/usr || die
+}
+
+src_install () {
+	gkrellm-plugin_src_install
+
+	exeinto /usr/libexec/gkrellweather
+	doexe GrabWeather
+}