1 |
commit: 5a2369ba50c77d52d20e5553e993c88ec2fc449f |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Feb 27 09:21:58 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 1 20:43:16 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2369ba |
7 |
|
8 |
x11-misc/cairo-clock: EAPI bump 4 -> 6, fix #452106 |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/452106 |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
Closes: https://github.com/gentoo/gentoo/pull/4091 |
14 |
|
15 |
x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild | 4 ++-- |
16 |
...ck-0.3.4.ebuild => cairo-clock-0.3.4-r1.ebuild} | 17 +++++++++++------ |
17 |
.../files/cairo-clock-0.3.4-desktop.patch | 18 ++++++++++++++++++ |
18 |
.../files/cairo-clock-0.3.4-linker.patch | 22 ++++++++++++++++++++++ |
19 |
4 files changed, 53 insertions(+), 8 deletions(-) |
20 |
|
21 |
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild |
22 |
index e2471b3ae89..c4609d99d9c 100644 |
23 |
--- a/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild |
24 |
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild |
25 |
@@ -1,4 +1,4 @@ |
26 |
-# Copyright 1999-2014 Gentoo Foundation |
27 |
+# Copyright 1999-2017 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
|
30 |
EAPI=2 |
31 |
@@ -6,7 +6,7 @@ EAPI=2 |
32 |
inherit autotools base |
33 |
|
34 |
DESCRIPTION="An analog clock displaying the system-time" |
35 |
-HOMEPAGE="http://macslow.thepimp.net/?page_id=23" |
36 |
+HOMEPAGE="https://launchpad.net/cairo-clock" |
37 |
SRC_URI="http://macslow.thepimp.net/projects/${PN}/${PN}_${PV}-1.tar.gz" |
38 |
|
39 |
LICENSE="GPL-2" |
40 |
|
41 |
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild |
42 |
similarity index 66% |
43 |
rename from x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild |
44 |
rename to x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild |
45 |
index 786624c702d..beeae3cafbb 100644 |
46 |
--- a/x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild |
47 |
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild |
48 |
@@ -1,10 +1,12 @@ |
49 |
-# Copyright 1999-2014 Gentoo Foundation |
50 |
+# Copyright 1999-2017 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
|
53 |
-EAPI=4 |
54 |
+EAPI=6 |
55 |
+ |
56 |
+inherit autotools |
57 |
|
58 |
DESCRIPTION="An analog clock displaying the system-time" |
59 |
-HOMEPAGE="http://macslow.net/?page_id=23" |
60 |
+HOMEPAGE="https://launchpad.net/cairo-clock" |
61 |
SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz" |
62 |
|
63 |
LICENSE="GPL-2" |
64 |
@@ -23,9 +25,12 @@ DEPEND="${DEPEND} |
65 |
virtual/pkgconfig |
66 |
sys-devel/gettext" |
67 |
|
68 |
-DOCS=( AUTHORS NEWS README TODO ) |
69 |
+PATCHES=( |
70 |
+ "${FILESDIR}"/${P}-desktop.patch |
71 |
+ "${FILESDIR}"/${P}-linker.patch |
72 |
+) |
73 |
|
74 |
src_prepare() { |
75 |
- # cc: error: unrecognized option '--export-dynamic' |
76 |
- sed -i -e '/cairo_clock_LDFLAGS/s:=.*:= -rdynamic:' src/Makefile.in || die |
77 |
+ default |
78 |
+ eautoreconf |
79 |
} |
80 |
|
81 |
diff --git a/x11-misc/cairo-clock/files/cairo-clock-0.3.4-desktop.patch b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-desktop.patch |
82 |
new file mode 100644 |
83 |
index 00000000000..5228776a00e |
84 |
--- /dev/null |
85 |
+++ b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-desktop.patch |
86 |
@@ -0,0 +1,18 @@ |
87 |
+diff -u desktop/cairo-clock.desktop desktop2/cairo-clock.desktop |
88 |
+--- a/desktop/cairo-clock.desktop |
89 |
++++ b/desktop/cairo-clock.desktop |
90 |
+@@ -37,4 +37,4 @@ |
91 |
+ Comment[zh_TW]=一個超好用的類比時鐘 |
92 |
+ Exec=cairo-clock |
93 |
+ Icon=cairo-clock |
94 |
+-Categories=GNOME;Application;Utility; |
95 |
++Categories=GNOME;Utility; |
96 |
+diff -u desktop/cairo-clock.desktop.in desktop2/cairo-clock.desktop.in |
97 |
+--- a/desktop/cairo-clock.desktop.in |
98 |
++++ b/desktop/cairo-clock.desktop.in |
99 |
+@@ -5,4 +5,4 @@ |
100 |
+ _Comment=a super fine analog clock |
101 |
+ Exec=cairo-clock |
102 |
+ Icon=cairo-clock |
103 |
+-Categories=GNOME;Application;Utility; |
104 |
++Categories=GNOME;Utility; |
105 |
|
106 |
diff --git a/x11-misc/cairo-clock/files/cairo-clock-0.3.4-linker.patch b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-linker.patch |
107 |
new file mode 100644 |
108 |
index 00000000000..bdd1a7bc8b1 |
109 |
--- /dev/null |
110 |
+++ b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-linker.patch |
111 |
@@ -0,0 +1,22 @@ |
112 |
+From 9e1575324da26ef15143ab2dd38f61af222576b4 Mon Sep 17 00:00:00 2001 |
113 |
+From: =?UTF-8?q?Mirco=20M=C3=BCller?= <macslow@×××××.com> |
114 |
+Date: Thu, 9 Feb 2017 01:02:03 +0100 |
115 |
+Subject: [PATCH] Updated linker-options so ld is happy. |
116 |
+ |
117 |
+--- |
118 |
+ src/Makefile.am | 2 +- |
119 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
120 |
+ |
121 |
+diff --git a/src/Makefile.am b/src/Makefile.am |
122 |
+index 7057198..fd88852 100644 |
123 |
+--- a/src/Makefile.am |
124 |
++++ b/src/Makefile.am |
125 |
+@@ -1,7 +1,7 @@ |
126 |
+ bin_PROGRAMS = cairo_clock |
127 |
+ transform = s/_/-/g |
128 |
+ |
129 |
+-cairo_clock_LDFLAGS = -Wl, --export-dynamic |
130 |
++cairo_clock_LDFLAGS = -Wl,-export-dynamic |
131 |
+ |
132 |
+ cairo_clock_LDADD = \ |
133 |
+ $(GLIB_LIBS) \ |