Revision bump, see bug #207758.

(Portage version: 2.1.3.19)

3 files changed, 81 insertions, 2 deletions

diff --git a/x11-plugins/wmCalClock/ChangeLog b/x11-plugins/wmCalClock/ChangeLog
index 1ce57a17b5a0..91e8e879c485 100644
--- a/x11-plugins/wmCalClock/ChangeLog
+++ b/x11-plugins/wmCalClock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmCalClock
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/ChangeLog,v 1.15 2007/07/22 05:35:48 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmCalClock/ChangeLog,v 1.16 2008/02/12 16:24:03 s4t4n Exp $
+
+*wmCalClock-1.25-r2 (12 Feb 2008)
+
+  12 Feb 2008; Michele Noberasco <s4t4n@gentoo.org> wmCalClock-1.25-r2.ebuild:
+  Revision bump. See bug #207758.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   wmCalClock-1.25-r1.ebuild:
diff --git a/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch b/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch
new file mode 100644
index 000000000000..64046c83f4be
--- /dev/null
+++ b/x11-plugins/wmCalClock/files/wmCalClock-1.25-makefile.patch
@@ -0,0 +1,35 @@
+--- Makefile.orig	1999-03-27 07:46:38.000000000 +0100
++++ Makefile	2008-01-27 22:45:09.000000000 +0100
+@@ -1,8 +1,8 @@
+-CC     = gcc
+-CFLAGS = -O2 -Wall
+-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
+-DESTDIR= /usr/X11R6
+-LIBDIR = -L/usr/X11R6/lib
++CC     ?= gcc
++CFLAGS += -Wall
++INCDIR = -I/usr/include/X11 -I/usr/include
++PREFIX ?= /usr
++LIBDIR ?= /usr/lib
+ 
+ # for Linux
+ LIBS   = -lXpm -lX11 -lXext
+@@ -22,7 +22,7 @@
+ 
+ wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm
+ wmCalClock:	$(OBJS) 
+-	$(CC) $(COPTS) $(SYSTEM) -o wmCalClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) -o wmCalClock $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	for i in $(OBJS) ; do \
+@@ -31,6 +31,7 @@
+ 	rm -f wmCalClock
+ 
+ install:: wmCalClock
+-	install -c -s -m 0755 wmCalClock $(DESTDIR)/bin
+-	install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1 
++	install -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1
++	install -m 0755 wmCalClock $(DESTDIR)$(PREFIX)/bin
++	install -m 0644 wmCalClock.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ 
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
new file mode 100644
index 000000000000..94016b6676c0
--- /dev/null
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r2.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/wmCalClock/wmCalClock-1.25-r2.ebuild,v 1.1 2008/02/12 16:24:03 s4t4n Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="WMaker DockApp: A Calendar clock with antialiased text."
+SRC_URI="http://www.dockapps.org/download.php/id/16/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.org/file.php/id/9"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~alpha ~amd64 ~mips ~ppc ~ppc64"
+IUSE=""
+
+S="${WORKDIR}/${P}/Src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "Compilation failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	dodoc ../{BUGS,CHANGES,HINTS,README,TODO}
+}