Fix underlinking, pkg-config use (bug #482030). Clean up patches.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 76 insertions, 14 deletions

diff --git a/x11-plugins/wmcalendar/ChangeLog b/x11-plugins/wmcalendar/ChangeLog
index 43ac3427bace..350761a98c3e 100644
--- a/x11-plugins/wmcalendar/ChangeLog
+++ b/x11-plugins/wmcalendar/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/wmcalendar
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.21 2012/05/05 05:12:02 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.22 2013/08/25 15:27:57 jer Exp $
+
+*wmcalendar-0.5.2-r1 (25 Aug 2013)
+
+  25 Aug 2013; Jeroen Roovers <jer@gentoo.org> +wmcalendar-0.5.2-r1.ebuild,
+  files/wmcalendar-0.5.2-exit-sin-and-cos.patch,
+  +files/wmcalendar-0.5.2-ical.patch,
+  files/wmcalendar-0.5.2-rename_kill_func.patch:
+  Fix underlinking, pkg-config use (bug #482030). Clean up patches.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> wmcalendar-0.5.2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
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
index 20367bf3c677..1f51b17889ed 100644
--- 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
@@ -1,6 +1,5 @@
-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
+--- a/Src/calendarfunc.c	2003-07-13 17:41:02.000000000 +0300
++++ b/Src/calendarfunc.c	2008-05-03 10:03:06.000000000 +0300
 @@ -22,7 +22,7 @@
  
  #include "calendarfunc.h"
@@ -10,9 +9,8 @@ diff -ur wmcalendar-0.5.2.orig/Src/calendarfunc.c wmcalendar-0.5.2/Src/calendarf
  
  
  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
+--- a/Src/dockapp.c	2003-07-15 18:15:12.000000000 +0300
++++ b/Src/dockapp.c	2008-05-03 10:03:34.000000000 +0300
 @@ -23,6 +23,7 @@
   * modified by Seiichi SATO <ssato@sh.rim.or.jp>
   */
@@ -21,9 +19,8 @@ diff -ur wmcalendar-0.5.2.orig/Src/dockapp.c wmcalendar-0.5.2/Src/dockapp.c
  #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
+--- a/Src/Makefile	2003-07-15 18:19:26.000000000 +0300
++++ b/Src/Makefile	2008-05-03 10:11:48.000000000 +0300
 @@ -1,19 +1,15 @@
 -CC     = gcc
 +CC     ?= gcc
@@ -44,7 +41,7 @@ diff -ur wmcalendar-0.5.2.orig/Src/Makefile wmcalendar-0.5.2/Src/Makefile
  
  # for Linux
 -LIBS   = $(LIBDIR) -lXpm -lical -lpthread
-+LIBS   = -lXpm -lical -lpthread `pkg-config --libs gtk+-2.0`
++LIBS   = -lpthread -lm $(shell $(PKG_CONFIG) --libs gtk+-2.0 x11 xpm xext libical)
  # for Solaris (untested!!!)
  # LIBS   = -lXpm -lX11 -lXext -lsocket -lnsl -lical
  
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch
new file mode 100644
index 000000000000..76a92a65b1db
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch
@@ -0,0 +1,19 @@
+--- a/Src/calendar.h
++++ b/Src/calendar.h
+@@ -1,4 +1,4 @@
+-#include <ical.h>
++#include <libical/ical.h>
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
+ #include <string.h>
+--- a/Src/calendarfunc.h
++++ b/Src/calendarfunc.h
+@@ -22,7 +22,7 @@
+ 
+ #include <unistd.h>
+ #include <stdlib.h>
+-#include <ical.h>
++#include <libical/ical.h>
+ #define TIMZ 3.0
+ #define MINAGE 13.5
+ #define SUNSET 19.5 /*approximate */
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch
index 9a22a176dd71..fc648a6b60d0 100644
--- a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch
@@ -1,5 +1,5 @@
---- calendar.c	2009-01-22 16:36:23.000000000 +0100
-+++ calendar.c.new	2009-01-22 16:36:07.000000000 +0100
+--- a/Src/calendar.c
++++ b/Src/calendar.c
 @@ -48,7 +48,7 @@
  
  
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r1.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..e05ac6330dff
--- /dev/null
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/08/25 15:27:57 jer Exp $
+
+EAPI=5
+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/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P}/Src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-exit-sin-and-cos.patch
+	epatch "${FILESDIR}"/${P}-rename_kill_func.patch
+	epatch "${FILESDIR}"/${P}-ical.patch
+	tc-export CC PKG_CONFIG
+}
+
+DOCS=( ../{BUGS,CHANGES,HINTS,README,TODO} )