Version bump. Move pkgconfig to DEPEND wrt #217278 for stable version.

Package-Manager: portage-2.1.5_rc6

5 files changed, 129 insertions, 9 deletions

diff --git a/x11-plugins/wmcalendar/ChangeLog b/x11-plugins/wmcalendar/ChangeLog
index a0c67592a3e3..a9dcad3bc9d7 100644
--- a/x11-plugins/wmcalendar/ChangeLog
+++ b/x11-plugins/wmcalendar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/wmcalendar
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.13 2006/10/10 07:16:21 s4t4n Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.14 2008/05/03 07:17:17 drac Exp $
+
+*wmcalendar-0.5.2 (03 May 2008)
+
+  03 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/wmcalendar-0.5.2-exit-sin-and-cos.patch,
+  wmcalendar-0.5.0-r1.ebuild, +wmcalendar-0.5.2.ebuild:
+  Version bump. Move pkgconfig to DEPEND wrt #217278 for stable version.
 
   10 Oct 2006; Michele Noberasco <s4t4n@gentoo.org> wmcalendar-0.5.0-r1.ebuild:
   Added missing libXpm dependancy. Closes bug #150643.
diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
index b280d5b5e7b6..7f85cd375e33 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -1,6 +1,9 @@
 AUX wmcalendar-0.5.0-gcc4.patch 1946 RMD160 09b35fc5d923f6c18e5baec4d887f86a30780006 SHA1 76db2d0dc4215657bad60113e98651974420d13b SHA256 8ed047190c35f9fc6d62b7e1301401947fa8906ea6e563d0165b3abf5e2443cb
 AUX wmcalendar-0.5.0.makefile.patch 980 RMD160 30e12e521202209f8df34c42bb1c09a9468a81cf SHA1 181720380e9154f44998c7d07cc906ef67299672 SHA256 09d000a63d53144a581f86997b9830ae4b3ad2d9c4b33849fb507a2b7d117ee0
+AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 2394 RMD160 d32530f55a87bd7c485284ff5b05128e66d1825f SHA1 b5144e1e65465cf85a00bd7db607d02d4a708848 SHA256 4e2ade7013f86b42250ff3534aa7e3a0960f315ab77ffe92213a6cb802385b61
 DIST wmcalendar-0.5.0.tar.gz 42896 RMD160 b488cb0038919ae4281f4aa178db317abf5dd48f SHA1 400fd0e37419a14d67722eee448d093f1dc3fc91 SHA256 81c407e0ba7028f2f428c5049017c7a8cb15b09b3ebdc91f111c6e4d35a854e4
-EBUILD wmcalendar-0.5.0-r1.ebuild 1122 RMD160 8a762aee90988ff2d8139e9a4d96fab62b3b0d61 SHA1 89b849e2ff2081a1df11ce9475d791d18066309f SHA256 c8c429a017f1c8b7c1640989f93c3e210c18416c6029e8c3fefdfaa9f2f1bc57
-MISC ChangeLog 1787 RMD160 ddffa18a9dae2a26a39a7f1e559c98a824d9a73e SHA1 558477c59f544c560bbdec7d3b6f32ce04192e83 SHA256 86672f1f022fc5b431b743952e03c5884471029ee17c23d637d6ab3785958989
+DIST wmcalendar-0.5.2.tar.gz 42720 RMD160 9daf0cae0c8eb5c651083783b7cac368f9528543 SHA1 b6ca855bd73f516a271df077696035507dbad76d SHA256 1915fe5b9af9de400650db4e9e4fa5934115902e8906144bf266b2f3503e0c00
+EBUILD wmcalendar-0.5.0-r1.ebuild 1111 RMD160 d7e8cf4df642390023a9b118e6bde90e4780d174 SHA1 6ea69c3e90b916b51ddcffd2fadded90b829c361 SHA256 5417666a4a117e8335f25f6d122c78b71de745325ca96002d15f189716387e63
+EBUILD wmcalendar-0.5.2.ebuild 895 RMD160 150b7dcb8089991317a4fd3a7106a2924706976e SHA1 658af0c4df69da5f84f202a331e6d82e52747811 SHA256 ae6da5212f15df4fc437426b506340066529be765a7bd8622cabb005249d0e46
+MISC ChangeLog 2048 RMD160 b959c0313db6cded6d80b409e6d02b1045d9f9b4 SHA1 ad46f386000c55d341c8d1224734907b70527e7b SHA256 c888cb51ecaa9aa0b5249f76a0ba2418b466a2fb208723fccdcef03b86d7b668
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
new file mode 100644
index 000000000000..20367bf3c677
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch
@@ -0,0 +1,70 @@
+diff -ur wmcalendar-0.5.2.orig/Src/calendarfunc.c wmcalendar-0.5.2/Src/calendarfunc.c
+--- wmcalendar-0.5.2.orig/Src/calendarfunc.c	2003-07-13 17:41:02.000000000 +0300
++++ wmcalendar-0.5.2/Src/calendarfunc.c	2008-05-03 10:03:06.000000000 +0300
+@@ -22,7 +22,7 @@
+ 
+ #include "calendarfunc.h"
+ #include <stdio.h>
+-
++#include <math.h>
+ 
+ 
+ long persian_jdn(struct icaltimetype dt)
+diff -ur wmcalendar-0.5.2.orig/Src/dockapp.c wmcalendar-0.5.2/Src/dockapp.c
+--- wmcalendar-0.5.2.orig/Src/dockapp.c	2003-07-15 18:15:12.000000000 +0300
++++ wmcalendar-0.5.2/Src/dockapp.c	2008-05-03 10:03:34.000000000 +0300
+@@ -23,6 +23,7 @@
+  * modified by Seiichi SATO <ssato@sh.rim.or.jp>
+  */
+ 
++#include <stdlib.h>
+ #include "dockapp.h"
+ 
+ #define WINDOWED_SIZE_W 64
+diff -ur wmcalendar-0.5.2.orig/Src/Makefile wmcalendar-0.5.2/Src/Makefile
+--- wmcalendar-0.5.2.orig/Src/Makefile	2003-07-15 18:19:26.000000000 +0300
++++ wmcalendar-0.5.2/Src/Makefile	2008-05-03 10:11:48.000000000 +0300
+@@ -1,19 +1,15 @@
+-CC     = gcc
++CC     ?= gcc
+ INCLUDES  = `pkg-config --cflags gtk+-2.0` -I. 
+-LFLAGS = `pkg-config --libs gtk+-2.0`
+ 
+ # for BSD
+ #INCLUDES = `gtk12-config --cflags` -I. 
+ #LFLAGS = `gtk12-config --libs`
+-X11BASE = /usr/X11R6
+-CFLAGS =  $(INCLUDES) -DICON_TYPE=$(ICON_TYPE)
+-INCDIR = -I$(X11BASE)/include/X11 -I$(X11BASE)/include -I$/usr/include -I$/usr/local/include
+-DESTDIR= /usr/local
+-LIBDIR = -L/usr/lib -L${X11BASE}/lib -L/usr/local/lib
++CFLAGS +=  $(INCLUDES) -DICON_TYPE=$(ICON_TYPE)
++PREFIX = /usr
+ PACKAGE = wmCalendar
+ 
+ # for Linux
+-LIBS   = $(LIBDIR) -lXpm -lical -lpthread
++LIBS   = -lXpm -lical -lpthread `pkg-config --libs gtk+-2.0`
+ # for Solaris (untested!!!)
+ # LIBS   = -lXpm -lX11 -lXext -lsocket -lnsl -lical
+ 
+@@ -30,7 +26,7 @@
+ all:	wmCalendar.o wmCalendar 
+ 
+ wmCalendar: $(OBJECTS) 
+-	 $(CC) $(COPTS)  $(SYSTEM) $(LFLAGS) -o $@ $(OBJECTS) -o wmCalendar $(INCDIR)$(LIBDIR) $(LIBS)
++	 $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ 
+ wmCalendar.o: wmCalendar_master.xpm   wmCalendar_master2.xpm
+ clean:
+@@ -40,6 +36,8 @@
+ 	rm -f wmCalendar
+ 
+ install:: wmCalendar
+-	install -c -s -m 0755 wmCalendar $(DESTDIR)/bin/
+-	install -c -m 0644 wmCalendar.1 $(DESTDIR)/man/man1 
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -m 0755 wmCalendar $(DESTDIR)$(PREFIX)/bin
++	install -d $(DESTDIR)$(PREFIX)/share/man/man1
++	install -m 0644 wmCalendar.1 $(DESTDIR)$(PREFIX)/share/man/man1 
+ 
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild
index fda6e848eb9d..749206e134b2 100644
--- a/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild,v 1.5 2006/10/10 07:16:21 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild,v 1.6 2008/05/03 07:17:17 drac Exp $
 
 inherit eutils
 
@@ -15,11 +15,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc ~sparc x86"
 
-DEPEND=">=dev-libs/libical-0.24_rc4
-	>=dev-util/pkgconfig-0.15.0
+RDEPEND=">=dev-libs/libical-0.24_rc4
 	>=x11-libs/gtk+-2.2.1-r1
-	>=sys-apps/sed-4.0.9
 	>=x11-libs/libXpm-3.5.5"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 S=${WORKDIR}/${P}/Src
 
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.2.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.2.ebuild
new file mode 100644
index 000000000000..37240d367b7a
--- /dev/null
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.2.ebuild,v 1.1 2008/05/03 07:17:17 drac Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a calendar dockapp"
+HOMEPAGE="http://wmcalendar.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libical
+	>=x11-libs/gtk+-2
+	x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${P}/Src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-exit-sin-and-cos.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc ../{BUGS,CHANGES,HINTS,README,TODO}
+}