gentoo resync : 21.07.2018

5 files changed, 50 insertions, 15 deletions

diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
index af97cecf3b4c..31a9d1353a53 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -1,7 +1,8 @@
-AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 2075 BLAKE2B 9c2d973fec2d878c8b4eadf13295d9fde7325d5a51f9fbb3ad10adcd326bc2432b127400f2584e3adb7c567e68903745f0f356dab7713b68f93ca4fe0e43bd1a SHA512 e116c5c632d7ab1043cd5d6e160db99cab134a164312a5e11f385056511c0bbb203e8c74e454883c09660c98a8cd566f48fe5535720a754569250a8619750657
-AUX wmcalendar-0.5.2-ical.patch 403 BLAKE2B abf01e569e097f5a7a885ba47599ba6f22a1227d6381012f9804bcc493f75b203610a932146c77a6b625e4cdb9a5b9c8041e6904e4d4f858cf94d270d2f7d11c SHA512 6328e80ec9723d79d7493b9350747c596f1348d9a0dc951908d78627004cfaf85baaeb8ee55be68f05fc298fa7f59e8b63a0f4d7bb908c5adf88cc36aaa05ce1
-AUX wmcalendar-0.5.2-rename_kill_func.patch 646 BLAKE2B cb9e1f8169d5f3096ce33d9229146bc7e29822f1249460b7588db7364a1bb5501c28409b647c2700b8942305b5aafc674d2051cb65d8ff6dd087dd11e70814fa SHA512 f59f5175130bd8a476bfd8d96906389e672cf7717ae2c2a2b39514420f14af618c64952769fda1fff0594637d3c86df80c1737a257141724532b813f2a30f975
+AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 2051 BLAKE2B 2b24368f074ed9b806fb578a96d22c0479fff15607dcadcf71afa5f11f001543f69129bc1459e63062b3477cb19c19c5214705b51d2e23a2f581e367b7c82dc2 SHA512 55d2577e321d3261dcb8d9bf95e6d756d69952fd061109d4e93fa0cc5170cd1178efee1fa1d693aa826dbb5b659ca29e78b0f123af55ddfd83a37eef1c030d0e
+AUX wmcalendar-0.5.2-ical.patch 387 BLAKE2B a9e8f848f29a2c83aae4e7f0efaec3efdcad6e56488ce8856a3ff19883b3a2c2ddf948148a8d7c45a3ba358f16274881a3ac8c93a081f4dac48e1ddc93ed334d SHA512 e7460227db5ca45ba3f909eba1ea95244d6464f496cbcbdb96e7879a728dbdcf64e8c25625ef05fb8f19713e400fc4b5c8f879526f734dd3e637d179e7186917
+AUX wmcalendar-0.5.2-rename_kill_func.patch 638 BLAKE2B b29503b9a3c6cfcac5cc970a6185c7a5f536a59baa9c2aae25b0f60507e20e6115889894dc82c336392d02c08d8cab4870352f32f94c5cf8656f470789ee12f6 SHA512 f81f3cdf3ea085dbd43e7b81d80c3d44c17945116996171a90f5823d711675851877e5474acdbd0f73989eb071d11826914e83420c596d1484fb4410a489e857
 DIST wmcalendar-0.5.2.tar.gz 42720 BLAKE2B b2de08905b368322013c3fd6fb4d87b5f7a986bee7b7de24fe2ce3be0003acc5e888dd01d9dedba85fa60ad211be23fb8623b432e5687e4ff2592b514dc549f0 SHA512 8d60a46f26657bf4876057ed092440018055e5a1ab6e2811a9c27f351533bfe6c941dbec10880daafe0858766cb890863cb66bfb70412e025a8d59ab96c663d7
 EBUILD wmcalendar-0.5.2-r1.ebuild 733 BLAKE2B ebfdb2ce8b167a7d9ae1cdb37402b6e9657d6733dacb230f6704d330409387a1c2784d262b7290d0292504379ef7fe7417a07c0ef56c7db566f25bf7f486c8cb SHA512 7f9eeaedc3f35fd6b01c8929c8a5e005dfaa03c7133e9c5648a118a92a829122f2a5c3ce0ab4408b6ab55f837d1f89cac6194bc2deadd1872b0a54bcebd75360
+EBUILD wmcalendar-0.5.2-r2.ebuild 698 BLAKE2B adce7a404d0f66892c743d5457fc07ebe1ac00e0a497b10f9845486a1ca20a4f16d9e0b6b9af70f7e43a21e808bf8511be94611f69b265df6df618588dc81a17 SHA512 b58e292d6bf8f297350b43a1a4374248e1f18c744eb2986945bb7005d05e6cc6759407b38dc03622a878475b150fa74b6312cf6bae19f537741fcf64886a5eef
 EBUILD wmcalendar-0.5.2.ebuild 750 BLAKE2B 116270ab1503eb382486e598f3a0c6ba8900f1cd7a2e9114893480dc6d4de4fbb73e77f7629f8e03c6b8cd444ff854cb0df12870de1b61c8d28d97b4da4d7908 SHA512 a81d576790b62991834e66780f224070c5b273a57b6adccbe7cf1fef3bf3def7c9ccdb0f42aff31ea165b641bf8a616af350d756c0d81f028622113132b7665f
 MISC metadata.xml 332 BLAKE2B 77b1bf5bab2fd180f0e7c7483abf79dcf5c7f12a8e8946f7b726e4509bef4b48d7dc9b9bb3977353cbce4c27a38009c12fec3c7ef3b1c0ab958dba59d9798ac1 SHA512 277dcef3109b86fdade36714655afc36c515fc0274f155bd598cca2ccb2c133870c966619aedf078c7eaf172d6850912c28793c349d30a1cdcaeb4a5698b2a9f
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 1f51b17889ed..1d68111fc261 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,5 +1,5 @@
---- a/Src/calendarfunc.c	2003-07-13 17:41:02.000000000 +0300
-+++ b/Src/calendarfunc.c	2008-05-03 10:03:06.000000000 +0300
+--- a/calendarfunc.c	2003-07-13 17:41:02.000000000 +0300
++++ b/calendarfunc.c	2008-05-03 10:03:06.000000000 +0300
 @@ -22,7 +22,7 @@
  
  #include "calendarfunc.h"
@@ -9,8 +9,8 @@
  
  
  long persian_jdn(struct icaltimetype dt)
---- a/Src/dockapp.c	2003-07-15 18:15:12.000000000 +0300
-+++ b/Src/dockapp.c	2008-05-03 10:03:34.000000000 +0300
+--- a/dockapp.c	2003-07-15 18:15:12.000000000 +0300
++++ b/dockapp.c	2008-05-03 10:03:34.000000000 +0300
 @@ -23,6 +23,7 @@
   * modified by Seiichi SATO <ssato@sh.rim.or.jp>
   */
@@ -19,8 +19,8 @@
  #include "dockapp.h"
  
  #define WINDOWED_SIZE_W 64
---- a/Src/Makefile	2003-07-15 18:19:26.000000000 +0300
-+++ b/Src/Makefile	2008-05-03 10:11:48.000000000 +0300
+--- a/Makefile	2003-07-15 18:19:26.000000000 +0300
++++ b/Makefile	2008-05-03 10:11:48.000000000 +0300
 @@ -1,19 +1,15 @@
 -CC     = gcc
 +CC     ?= gcc
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch
index 76a92a65b1db..9297717a3558 100644
--- a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch
@@ -1,13 +1,13 @@
---- a/Src/calendar.h
-+++ b/Src/calendar.h
+--- a/calendar.h
++++ b/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
+--- a/calendarfunc.h
++++ b/calendarfunc.h
 @@ -22,7 +22,7 @@
  
  #include <unistd.h>
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 fc648a6b60d0..e11a8b1b98cf 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 @@
---- a/Src/calendar.c
-+++ b/Src/calendar.c
+--- a/calendar.c
++++ b/calendar.c
 @@ -48,7 +48,7 @@
  
  
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..bda76dc009c0
--- /dev/null
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit 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"
+
+RDEPEND="
+	dev-libs/libical
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ../{BUGS,CHANGES,HINTS,README,TODO} )
+
+S=${WORKDIR}/${P}/Src
+
+PATCHES=( "${FILESDIR}"/${P}-exit-sin-and-cos.patch
+	"${FILESDIR}"/${P}-rename_kill_func.patch
+	"${FILESDIR}"/${P}-ical.patch )
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+}