summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2018-07-08 16:11:49 +0200
committerBernard Cafarelli <voyageur@gentoo.org>2018-07-19 15:25:23 +0200
commit1f4dada784da01b4a9cff7cff3ef44045f245c7d (patch)
treefb99f8d32bcc4d060153dc6ab9071908e0a9639e
parentx11-plugins/wmcalc: add EAPI7 ebuild (diff)
downloadgentoo-1f4dada784da01b4a9cff7cff3ef44045f245c7d.tar.gz
gentoo-1f4dada784da01b4a9cff7cff3ef44045f245c7d.tar.bz2
gentoo-1f4dada784da01b4a9cff7cff3ef44045f245c7d.zip
x11-plugins/wmcalendar: EAPI7, improve ebuild
-rw-r--r--x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch12
-rw-r--r--x11-plugins/wmcalendar/files/wmcalendar-0.5.2-ical.patch8
-rw-r--r--x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch4
-rw-r--r--x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild34
4 files changed, 46 insertions, 12 deletions
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
+}