Revision bump, see bug #207898.

Package-Manager: portage-2.1.4.4

4 files changed, 93 insertions, 2 deletions

diff --git a/x11-plugins/wmSun/ChangeLog b/x11-plugins/wmSun/ChangeLog
index 237692c56715..a6102790f0f6 100644
--- a/x11-plugins/wmSun/ChangeLog
+++ b/x11-plugins/wmSun/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmSun
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/ChangeLog,v 1.8 2007/07/22 05:31:27 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/ChangeLog,v 1.9 2008/02/15 07:56:13 s4t4n Exp $
+
+*wmSun-1.03-r1 (15 Feb 2008)
+
+  15 Feb 2008; Michele Noberasco <s4t4n@gentoo.org> wmSun-1.03-r1.ebuid:
+  Revision bump, see bug #207898.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmSun-1.03.ebuild:
   Drop virtual/x11 references.
diff --git a/x11-plugins/wmSun/Manifest b/x11-plugins/wmSun/Manifest
index 96c2a0b26a9c..93dd7a9e5d88 100644
--- a/x11-plugins/wmSun/Manifest
+++ b/x11-plugins/wmSun/Manifest
@@ -1,4 +1,6 @@
+AUX wmSun-1.03-makefile.patch 1127 RMD160 b06a6fe42d9232dfa0517c1d892adb63aa08cdef SHA1 328db60aa0202214be34c8ce08fc8171abe05c51 SHA256 467ae63413985e78c93c631d20f96ddf96154c05a959d84163b345620d089c69
 DIST wmSun-1.03.tar.gz 49744 RMD160 9c3bb5e35107d5ed74d0da329495beb7b0cfbff9 SHA1 e9933d84db322631f331c432ee15d4fe4decd707 SHA256 a46e11680d4625589d4d91030e17916c02405451e60d366340668a01597c4ea2
+EBUILD wmSun-1.03-r1.ebuild 984 RMD160 573608f14f085e2d325aae4a61020902a3773436 SHA1 2eb63fecf7cc93ba51cb9f6a367f0144e5da4736 SHA256 0622c413ed1fd3d512cbf2868d328dfa9bc1bd4b48e70f294fd71d011ccd564e
 EBUILD wmSun-1.03.ebuild 831 RMD160 b6310c6d183842a05d0732891f2695010a6a3e02 SHA1 af3990d5d43f0dd9e123fec833d04f227d920883 SHA256 a3ccac6610ad5ae1cfedb09745d21047c50b4447cb549495fc083099fd69bc49
-MISC ChangeLog 876 RMD160 45a0b69e64dc90a565fc384f73dd48ec495865e1 SHA1 ac6229feac15553701b56878109f894159834779 SHA256 30ca3ad494ef0fef34ae32b286dcc9d40d2eaeed5b7cb6eff068acf2c251ed19
+MISC ChangeLog 1010 RMD160 a2f580b67efe84513d4e7214fb99e1ca8d756b9e SHA1 8b0b910edf50040b78ed16e433c5bf6060d781e8 SHA256 76685a1d6378eb86f6fd0bb22fd0ad1dfa05c8b54b3edae6628221b7640f91c7
 MISC metadata.xml 412 RMD160 b47d79eb5e1e045f345de5a8f7096872c5efff84 SHA1 8e94fc38d84831be1d95e20679b52e0128495e1d SHA256 584a9e55435d1e8d25ae2a3fb7c6702087750090e81bcbbf99873032383f9591
diff --git a/x11-plugins/wmSun/files/wmSun-1.03-makefile.patch b/x11-plugins/wmSun/files/wmSun-1.03-makefile.patch
new file mode 100644
index 000000000000..1e712ede094e
--- /dev/null
+++ b/x11-plugins/wmSun/files/wmSun-1.03-makefile.patch
@@ -0,0 +1,45 @@
+--- Makefile.orig	1999-01-06 03:28:39.000000000 +0100
++++ Makefile	2008-01-28 14:58:36.000000000 +0100
+@@ -1,8 +1,9 @@
+-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
++MANDIR = $(PREFIX)/share/man
+ 
+ 
+ 
+@@ -22,14 +23,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:	wmSun.o wmSun
+ 
+ wmSun.o: wmSun_master.xpm wmSun_mask.xbm 
+ wmSun:	$(OBJS) 
+-	$(CC) $(COPTS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) -lm -o wmSun $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	for i in $(OBJS) ; do \
+@@ -38,6 +39,8 @@
+ 	rm -f wmSun
+ 
+ install:: wmSun
+-	install -s -m 0755 wmSun $(DESTDIR)/bin
+-	install    -m 0644 wmSun.1 $(DESTDIR)/man/man1 
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -m 0755 wmSun $(DESTDIR)$(PREFIX)/bin
++	install -d $(DESTDIR)$(MANDIR)/man1
++	install    -m 0644 wmSun.1 $(DESTDIR)$(MANDIR)/man1 
+ 
diff --git a/x11-plugins/wmSun/wmSun-1.03-r1.ebuild b/x11-plugins/wmSun/wmSun-1.03-r1.ebuild
new file mode 100644
index 000000000000..7112c7e6084a
--- /dev/null
+++ b/x11-plugins/wmSun/wmSun-1.03-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSun/wmSun-1.03-r1.ebuild,v 1.1 2008/02/15 07:56:13 s4t4n Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="dockapp which displays the rise/set time of the sun"
+HOMEPAGE="http://dockapps.org/file.php/id/16"
+SRC_URI="http://dockapps.org/download.php/id/23/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~mips ~ppc ~sparc"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+S="${WORKDIR}/${P}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-makefile.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 README ../{BUGS,TODO}
+}