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

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 94 insertions, 20 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/Manifest b/x11-plugins/wmcalendar/Manifest
index 6ab3cbaea743..1d5026c357fb 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -1,6 +1,18 @@
-AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 2394 RMD160 d32530f55a87bd7c485284ff5b05128e66d1825f SHA1 b5144e1e65465cf85a00bd7db607d02d4a708848 SHA256 4e2ade7013f86b42250ff3534aa7e3a0960f315ab77ffe92213a6cb802385b61
-AUX wmcalendar-0.5.2-rename_kill_func.patch 710 RMD160 2fc73d59cc6dc3acb35648d9f3c34c539c64ef71 SHA1 086c12f3b9cbdcf56d92f66f11b74f2f13e1b61e SHA256 631f8e5575aae903b158366b1cb867124eee9c2afd57e9f7b8e05b50b55c7916
-DIST wmcalendar-0.5.2.tar.gz 42720 RMD160 9daf0cae0c8eb5c651083783b7cac368f9528543 SHA1 b6ca855bd73f516a271df077696035507dbad76d SHA256 1915fe5b9af9de400650db4e9e4fa5934115902e8906144bf266b2f3503e0c00
-EBUILD wmcalendar-0.5.2.ebuild 951 RMD160 7dbf35b8e0dd29a834359ff3435e7c443970b5a4 SHA1 bc4d91293d781559c3e5883ac07d3a38a4002be5 SHA256 86ae92df00638571dc6087ea0540ec3f5e508e9b3803c77a2d2bcf0078d70459
-MISC ChangeLog 3152 RMD160 9ea217aaee0cdec7edc246db42cefa2d5bd322c4 SHA1 a380dd1e105492cf7fcbb11349a74a453478f8f4 SHA256 59e31fa6337d274f6ff2c62041f2f514a1b450b90fa76ba45978a88538d77a31
-MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 2075 SHA256 36509add601dbf0a835c03d0b80f3c3cfa7c50e9ac7bc5c3a52b62da415735bc SHA512 e116c5c632d7ab1043cd5d6e160db99cab134a164312a5e11f385056511c0bbb203e8c74e454883c09660c98a8cd566f48fe5535720a754569250a8619750657 WHIRLPOOL ec60f0f5a43d48ee1fce1864c169f64cfaafd4489ab82b98f5a1421af885d344aea33594f1e787c58fcc0d98ba4779b701393240d2374d0c1aa1d6edfe1a2b2f
+AUX wmcalendar-0.5.2-ical.patch 403 SHA256 fd00bf39a7e0f6032a5a5eee52397bffb9e941519d27b2421d89b052acbc3453 SHA512 6328e80ec9723d79d7493b9350747c596f1348d9a0dc951908d78627004cfaf85baaeb8ee55be68f05fc298fa7f59e8b63a0f4d7bb908c5adf88cc36aaa05ce1 WHIRLPOOL a80b0dc827b4b1b3ee3de83d18aef94809bb4349a84c93e414635588fcfbbe9fc62c43c3b3cd42a7894e2d30ee1581f2b1197ff1c6173ec9d22586b8fc12fc83
+AUX wmcalendar-0.5.2-rename_kill_func.patch 646 SHA256 8914853f7726e2a725c1df4b43c0296b293c87471a1729a265cf3e77917e05ae SHA512 f59f5175130bd8a476bfd8d96906389e672cf7717ae2c2a2b39514420f14af618c64952769fda1fff0594637d3c86df80c1737a257141724532b813f2a30f975 WHIRLPOOL 08fe7fc68f64822cbc4198fb86376b22639a43d6e11af0620499093383d4a75a3b82c407f4e2a65bfef4379efd5776912b5f69b5f6a334faa5db1285e745d930
+DIST wmcalendar-0.5.2.tar.gz 42720 SHA256 1915fe5b9af9de400650db4e9e4fa5934115902e8906144bf266b2f3503e0c00 SHA512 8d60a46f26657bf4876057ed092440018055e5a1ab6e2811a9c27f351533bfe6c941dbec10880daafe0858766cb890863cb66bfb70412e025a8d59ab96c663d7 WHIRLPOOL 416726d0c568aa7246e04dc567457928a2af71c371dad519504982f2f9ef3dbed57f2478d927e9c6f869f2823a13386e28fd124b8839fb9426d83f19b07f5ee4
+EBUILD wmcalendar-0.5.2-r1.ebuild 857 SHA256 7e6852c6ad7af3b67e8d841a13a95c3f11906d883f6a4cb3e7919287a8ec5828 SHA512 ace6642a8c7f349917bdea12f589e27e9ee18ce626d7f4cfdf3cf779ac790ec7afd093f0d41224e8145b8b9729a3cf795c977c6522e452d5b6b056875dd05900 WHIRLPOOL 8c8316bb8fc571a94bc9a55e89a411c18ca447060a3b61debdf7cc036cd12d4c76696da33986617b47ac188d0e1ab73fc2e3b13b931f9b4063596331d4ac6df9
+EBUILD wmcalendar-0.5.2.ebuild 951 SHA256 86ae92df00638571dc6087ea0540ec3f5e508e9b3803c77a2d2bcf0078d70459 SHA512 999b48ec7edf8a136b82763c4110e85df26c6fc5d926b54b92a41bbff9b16fa17049f92342192c5f419ce53480baf2e10139e3707971c76b17e2d71a99d11168 WHIRLPOOL c6ce5c5ea4c9f5c45dc34b1ddac3a85f8c16c09ba9df712238c232449dd38d3cf34e4fd3d3f14c27c3cb30036304f3594d3f083c41a1cd429a9581e80ce29e93
+MISC ChangeLog 3466 SHA256 94933bdbdf32628472d6dd5b981d5ae6e1a05a2b6fb14344887546670f357e95 SHA512 1a215a40e935ea00ddf6b2de5b302f5013700f630cd2fe117d71a87adbb3de07e5e8eec01f95e0cf50b3186007e67aafa2b90309f1bbc6200bce41909191a06d WHIRLPOOL 0e0502b9fc27f74502a01ba3b1adbc6d9387f178677323997ed4dfa41e6ff4721b547885fe4fcfd6f2e036b6b3591e92dfe7b2cddd77479b16add4ba37fe0d58
+MISC metadata.xml 165 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b SHA512 dd0c867c49224060269f229cdd6cfe3c2b8a1f9ebb94d26605878d5b050d10cedb229a64ffd4c13e5c119bce3e236b14f5a9f6dac36a6ace50965f0887e5362a WHIRLPOOL 5f4139a044e2f8bc197f5d21ee51f21b8a5131b2eb145d88bda1dc3b04cf7d21ed89da77dc9b43496071d8098d5eee2b19da0fbc810ac15d379cec0420d99950
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlIaIn4ACgkQVWmRsqeSphONXwCfaXThVvmKeKvHPWtiHAFGI4Le
+QrIAn0A3XN31AdBzv2G1OOTW1gPFQzJ9
+=1Ieb
+-----END PGP SIGNATURE-----
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} )