Revision bump, with lots of fixes (see CL). Closes bug #207888.

Package-Manager: portage-2.1.3.19

5 files changed, 167 insertions, 2 deletions

diff --git a/x11-plugins/wmSpaceWeather/ChangeLog b/x11-plugins/wmSpaceWeather/ChangeLog
index 0ae615834d23..6a4e43de9dd9 100644
--- a/x11-plugins/wmSpaceWeather/ChangeLog
+++ b/x11-plugins/wmSpaceWeather/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/wmSpaceWeather
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/ChangeLog,v 1.11 2007/07/22 05:32:16 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/ChangeLog,v 1.12 2008/02/01 14:00:22 s4t4n Exp $
+
+*wmSpaceWeather-1.04_p19 (08 Feb 2008)
+
+  08 Feb 2008; Michele Noberasco <s4t4n@gentoo.org>
+  wmSpaceWeather-1.04_p19.ebuild :
+  Revision bump, with debian patchset, new SRC_URI and HOMEPAGE,
+  data locations. Now it also honour LDFLAGS, crosscompile, dependancies,
+  etc. Closes bug #207888.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   wmSpaceWeather-1.04.ebuild:
diff --git a/x11-plugins/wmSpaceWeather/Manifest b/x11-plugins/wmSpaceWeather/Manifest
index 9ad244dbc681..ccc8841a3ff3 100644
--- a/x11-plugins/wmSpaceWeather/Manifest
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -1,5 +1,10 @@
 AUX getkp.patch 836 RMD160 dd2fd64268b7c8f1f20691bfc7d09c7dfcd78e24 SHA1 13d4e9a6fd757e7e6a1fa9daaf8a24f98b5ff7e3 SHA256 295ccba2cac735713bfe4c19875c53b4e565caee8572ac0f2204e5e0f717c301
+AUX wmSpaceWeather-1.04_p19-gentoo.patch 2034 RMD160 e168c6fd1ddbc8e917b10671f21ae44357adab3b SHA1 65bcc684f5bad1b5fe4cecf9f9c8afe3547f786b SHA256 fe5bbfe77c053db8f497cfe06497c8d7151a8ca073ae72288a7e8ad1b773b4d1
+AUX wmSpaceWeather-1.04_p19-getkp.patch 1290 RMD160 f4ccccafe18bc744b8425065a4e4d6299a9d190a SHA1 87efd4f6d2dfb4f3f3fa26522389b1f84fc8608e SHA256 f1e7f6bda7e004ef15780a3d7f520e7e4c9de947b291604c6219da552f02f970
 DIST wmSpaceWeather-1.04.tar.gz 36760 RMD160 7cde741e2ca9990ecc1dac63e3b5ca6d2c41bd5d SHA1 eb64b72aeb9f94a87d19e444de7d2a56c5414a65 SHA256 107343c2e3d1fc2dd40f74ed9684f218d0f19e2358bc3813c6bc943bfd48eac0
+DIST wmspaceweather_1.04-19.diff.gz 9429 RMD160 2ee45cddd6f77dd21d2a73fa78414e46ff2f18fc SHA1 95c4db05d0c3ad59d84966abcf08fe71bf5e7225 SHA256 21298d603c181ccf8e34590ea2654035b755c3832bf450dacc3d57953dd6e137
+DIST wmspaceweather_1.04.orig.tar.gz 36295 RMD160 9d8f28bcd3510876cfa85aa4271a373b452dafed SHA1 2fa44d3e08f2365e5df489b8768743a2a2632398 SHA256 946455238e3bca6137a122271da4af9fa154730a071c69eb49c0fde5be010f38
 EBUILD wmSpaceWeather-1.04.ebuild 981 RMD160 018bd79d4f11d0beb3484f244040b1ab097542d5 SHA1 1df9a2800ccb1f8920ec276d01449ca9ef7ae33c SHA256 bdeae2b7b8126357a22218ff19d028912c437fd8590f0bd45f3a32d17c29ddb2
-MISC ChangeLog 1368 RMD160 9b6d04111ebcf1df019e7621c9f7358a2b31ded1 SHA1 e19830bcb518d17de92e85b5e7a6b9c1d7c6aba5 SHA256 516726b4be1c77358d5bdbb2de6de5c90985ad141c4b4dd21af6e81700ae3532
+EBUILD wmSpaceWeather-1.04_p19.ebuild 1913 RMD160 d42dac45a8eab359876ab52ae1413e0d42ba12ba SHA1 2995fd8d68804069e8db0c8583682a1212a6c37e SHA256 97674a0d79ed4eb973beddc02cdac43ae5c8d7b3ff59181e900c07c474375e6a
+MISC ChangeLog 1658 RMD160 278b91b69d83a7317ed93051b0172e6435f1f95c SHA1 817d4ce2da604c8f09d48f11a9a31d0a4b4c188f SHA256 f570a61b856a59826e8667b05027464f98db455a407453632f11630eb2f5193c
 MISC metadata.xml 263 RMD160 5fb70476857a2d4f4b72092e60e88d704365dd52 SHA1 744d3757a83c33e45128aa0de41a504dcce33b62 SHA256 874e80cd949e31cddb2ff3efff4ff8dc630fa8eb895a325b043a2c9c013105e1
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
new file mode 100644
index 000000000000..29cb5f984f13
--- /dev/null
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
@@ -0,0 +1,61 @@
+--- wmSpaceWeather/Makefile.orig	2008-01-28 02:45:07.000000000 +0100
++++ wmSpaceWeather/Makefile	2008-01-28 02:46:04.000000000 +0100
+@@ -1,8 +1,8 @@
+-CC     = gcc
+-CFLAGS = -O2 -Wall
+-INCDIR = -I/usr/X11R6/include/X11
+-DESTDIR= /usr/X11R6
+-LIBDIR = -L/usr/X11R6/lib
++CC     ?= gcc
++CFLAGS += -Wall
++INCDIR = -I/usr/include/X11
++PREFIX = /usr
++LIBDIR ?= /usr/lib
+ # for linux
+ LIBS   = -lXpm -lX11 -lXext
+ # for Solaris
+@@ -12,14 +12,14 @@
+ 
+ 
+ .c.o:
+-	$(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
++	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
+ 
+ 
+ all:	wmSpaceWeather.o wmSpaceWeather
+ 
+ wmSpaceWeather.o: wmSpaceWeather_master.xpm wmSpaceWeather_mask.xbm
+ wmSpaceWeather:	$(OBJS) 
+-	$(CC) $(COPTS) $(SYSTEM) -o wmSpaceWeather $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) -o wmSpaceWeather $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	for i in $(OBJS) ; do \
+@@ -28,10 +28,10 @@
+ 	rm -f wmSpaceWeather
+ 
+ install:: wmSpaceWeather
+-	install -d $(DESTDIR)/usr/bin
+-	install -d $(DESTDIR)/usr/share/wmspaceweather
+-	install -d $(DESTDIR)/usr/share/man/man1 
+-	install -m 0755 wmSpaceWeather $(DESTDIR)/usr/bin
+-	install -m 0755 GetKp $(DESTDIR)/usr/share/wmspaceweather
+-	install -m 0644 wmSpaceWeather.1 $(DESTDIR)/usr/share/man/man1 
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -d $(DESTDIR)$(PREFIX)/share/wmspaceweather
++	install -d $(DESTDIR)$(PREFIX)/share/man/man1 
++	install -m 0755 wmSpaceWeather $(DESTDIR)$(PREFIX)/bin
++	install -m 0755 GetKp $(DESTDIR)$(PREFIX)/share/wmspaceweather
++	install -m 0644 wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ 
+--- wmSpaceWeather/wmSpaceWeather.c.orig	2008-01-28 03:16:36.000000000 +0100
++++ wmSpaceWeather/wmSpaceWeather.c	2008-01-28 03:22:12.000000000 +0100
+@@ -663,7 +663,7 @@
+     if (GotDoubleClick1) {
+         GotFirstClick1 = 0;
+         GotDoubleClick1 = 0;
+-        sprintf(Command, "sensible-browser '%s' &", URL);
++	sprintf(Command, "firefox -remote 'openURL(%s)'", URL);
+         system(Command);
+     }
+ 
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
new file mode 100644
index 000000000000..6d6d90137feb
--- /dev/null
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
@@ -0,0 +1,27 @@
+--- wmSpaceWeather/GetKp.orig	2008-01-28 14:20:43.000000000 +0100
++++ wmSpaceWeather/GetKp	2008-01-28 14:22:48.000000000 +0100
+@@ -17,10 +17,10 @@
+     unlink(CUR_INDEX);
+ 
+ 
+-#   $grabcmd = "cd /tmp; /usr/bin/wget -q ftp://www.sec.noaa.gov/pub/indices/DGD.txt";
++#   $grabcmd = "cd /tmp; /usr/bin/wget -q http://www.swpc.noaa.gov/ftpdir/indices/DGD.txt";
+ #   system "$grabcmd";
+ #
+-	$grabcmd = "/usr/bin/curl -f -s -o " . DGD_FILE . " http://www.sec.noaa.gov/ftpdir/indices/DGD.txt";
++	$grabcmd = "/usr/bin/curl -f -s -o " . DGD_FILE . " http://www.swpc.noaa.gov/ftpdir/indices/DGD.txt";
+ 	exit 1 if (system "$grabcmd");
+ 
+ 
+@@ -69,9 +69,9 @@
+     #
+     # Add in very latest stuff
+     #
+-#   $grabcmd = "cd /tmp; /usr/bin/wget -q ftp://www.sec.noaa.gov/pub/latest/curind.txt";
++#   $grabcmd = "cd /tmp; /usr/bin/wget -q http://www.swpc.noaa.gov/ftpdir/latest/curind.txt";
+ #   system "$grabcmd";
+-	$grabcmd = "/usr/bin/curl -f -s -o " . CUR_INDEX . " http://www.sec.noaa.gov/ftpdir/latest/curind.txt";
++	$grabcmd = "/usr/bin/curl -f -s -o " . CUR_INDEX . " http://www.swpc.noaa.gov/ftpdir/latest/curind.txt";
+ 	exit 1 if (system "$grabcmd");
+     %lmonstr = ( "Jan", 1, "Feb", 2, "Mar", 3, "Apr", 4, "May", 5, "Jun", 6, "Jul", 7, "Aug", 8, "Sep", 9, "Oct", 10, "Nov", 11, "Dec", 12);
+ 
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
new file mode 100644
index 000000000000..19b4940b3bc8
--- /dev/null
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild,v 1.1 2008/02/01 14:00:22 s4t4n Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MY_PN="wmspaceweather"
+MY_PV_ORIG="${PV/_p*}"
+MY_PV_PATCH="${PV/_p/-}"
+MY_P_ORIG="${MY_PN}_${MY_PV_ORIG}.orig"
+MY_P_PATCH="${MY_PN}_${MY_PV_PATCH}.diff"
+
+DESCRIPTION="dockapp showing weather at geosynchronous orbit."
+HOMEPAGE="http://packages.debian.org/sid/wmspaceweather"
+SRC_URI="mirror://debian/pool/main/w/${MY_PN}/${MY_P_ORIG}.tar.gz
+	    mirror://debian/pool/main/w/${MY_PN}/${MY_P_PATCH}.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~mips ~hppa ~ppc ~sparc"
+IUSE=""
+
+CDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${CDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+RDEPEND="${CDEPEND}
+	net-misc/curl
+	dev-lang/perl"
+
+S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}"
+
+src_unpack() {
+	unpack ${MY_P_ORIG}.tar.gz
+	epatch "${DISTDIR}"/${MY_P_PATCH}.gz
+
+	# need to apply patches from Debian first, do NOT change the order
+	cd "${S}"
+	mv ../debian/patches "${WORKDIR}"/patch
+	EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" \
+		EPATCH_MULTI_MSG="Applying Debian patches ..." epatch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-getkp.patch
+}
+
+src_compile() {
+	emake clean || die "make clean failed"
+	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "parallel make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die install failed
+	dodoc ../{BUGS,CHANGES,HINTS,README}
+}
+
+pkg_postinst() {
+	elog "You need to emerge www-client/mozilla-firefox or www-client/mozilla-firefox-bin"
+	elog "to use the -url functionality - see man ${PN} for more info."
+	elog
+	elog "This version uses curl instead of wget. You may edit /usr/share/wmspaceweather/GetKp"
+	elog "if you don't like it."
+}