Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmsg/, x11-plugins/wmmsg/files/
Date: Fri, 05 Jan 2018 22:52:33
Message-Id: 1515192688.f2640861a990c5169359252371b5011b9618fd80.zlogene@gentoo
1 commit: f2640861a990c5169359252371b5011b9618fd80
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 5 22:51:28 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 5 22:51:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2640861
7
8 x11-plugins/wmmsg: remove last rited package (bug #639914)
9
10 x11-plugins/wmmsg/Manifest | 1 -
11 .../wmmsg/files/wmmsg-1.0.1-alt-desktop.patch | 11 --
12 x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch | 132 ---------------------
13 x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch | 44 -------
14 x11-plugins/wmmsg/metadata.xml | 15 ---
15 x11-plugins/wmmsg/wmmsg-1.0.1-r2.ebuild | 36 ------
16 6 files changed, 239 deletions(-)
17
18 diff --git a/x11-plugins/wmmsg/Manifest b/x11-plugins/wmmsg/Manifest
19 deleted file mode 100644
20 index 122b489a2ab..00000000000
21 --- a/x11-plugins/wmmsg/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST wmmsg-1.0.1.tar.gz 322551 BLAKE2B 585559f331549ec222984f5b377f61d10576b740a1080ae30466dab5bf0ccf97a23c178e69743c202407d40c0720e47fe756c093e8fd6b7d2d2b302a5a69f2ea SHA512 6897a6cb48d88536bf9bde4ae824ddeba7953618666aca24202d9d21865d63c9d0d28a306b8f249da8052715be706a02de12c90c14718b1b3bd41d3803dd6abe
25
26 diff --git a/x11-plugins/wmmsg/files/wmmsg-1.0.1-alt-desktop.patch b/x11-plugins/wmmsg/files/wmmsg-1.0.1-alt-desktop.patch
27 deleted file mode 100644
28 index 5a7135d7cc3..00000000000
29 --- a/x11-plugins/wmmsg/files/wmmsg-1.0.1-alt-desktop.patch
30 +++ /dev/null
31 @@ -1,11 +0,0 @@
32 ---- wmmsg-1.0.1/src/wmmsg/wmmsg.c.vns 2003-02-04 06:40:12 +0300
33 -+++ wmmsg-1.0.1/src/wmmsg/wmmsg.c 2006-03-26 21:42:45 +0400
34 -@@ -144,7 +144,7 @@
35 - WMMSG_MASK_WIDTH, WMMSG_MASK_HEIGHT);
36 - openXwindow (argc, argv, wmmsg_xpm, global_wmmsg_mask_bits,
37 - WMMSG_MASK_WIDTH, WMMSG_MASK_HEIGHT);
38 -- global_win_workspace = XInternAtom(display, "_WIN_WORKSPACE", 0);
39 -+ global_win_workspace = XInternAtom(display, "_NET_CURRENT_DESKTOP", 0);
40 -
41 - //add clickable regions
42 - for(i = 0; i < MESSAGES_PER_SCREEN; i++)
43
44 diff --git a/x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch b/x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch
45 deleted file mode 100644
46 index 76d2e26fbc6..00000000000
47 --- a/x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch
48 +++ /dev/null
49 @@ -1,132 +0,0 @@
50 -diff -Naur wmmsg-1.0.1/src/wmgeneral.orig/list.c wmmsg-1.0.1/src/wmgeneral/list.c
51 ---- wmmsg-1.0.1/src/wmgeneral.orig/list.c 2016-01-04 13:03:23.206828813 +0100
52 -+++ wmmsg-1.0.1/src/wmgeneral/list.c 2016-01-04 13:03:32.358832037 +0100
53 -@@ -38,7 +38,7 @@
54 -
55 - /* Return a cons cell produced from (head . tail) */
56 -
57 --INLINE LinkedList * list_cons (void *head, LinkedList * tail)
58 -+LinkedList * list_cons (void *head, LinkedList * tail)
59 - {
60 - LinkedList *cell;
61 -
62 -@@ -50,7 +50,7 @@
63 -
64 - /* Return the length of a list, list_length(NULL) returns zero */
65 -
66 --INLINE int list_length (LinkedList * list)
67 -+int list_length (LinkedList * list)
68 - {
69 - int i = 0;
70 - while (list)
71 -@@ -64,7 +64,7 @@
72 - /* Return the Nth element of LIST, where N count from zero. If N
73 - larger than the list length, NULL is returned */
74 -
75 --INLINE void * list_nth (int index, LinkedList * list)
76 -+void * list_nth (int index, LinkedList * list)
77 - {
78 - while (index-- != 0)
79 - {
80 -@@ -78,7 +78,7 @@
81 -
82 - /* Remove the element at the head by replacing it by its successor */
83 -
84 --INLINE void list_remove_head (LinkedList ** list)
85 -+void list_remove_head (LinkedList ** list)
86 - {
87 - if (!*list)
88 - return;
89 -@@ -98,19 +98,7 @@
90 -
91 -
92 - /* Remove the element with `car' set to ELEMENT */
93 --/*
94 -- INLINE void
95 -- list_remove_elem(LinkedList** list, void* elem)
96 -- {
97 -- while (*list)
98 -- {
99 -- if ((*list)->head == elem)
100 -- list_remove_head(list);
101 -- *list = (*list ? (*list)->tail : NULL);
102 -- }
103 -- } */
104 --
105 --INLINE LinkedList * list_remove_elem (LinkedList * list, void *elem)
106 -+LinkedList * list_remove_elem (LinkedList * list, void *elem)
107 - {
108 - LinkedList *tmp;
109 -
110 -@@ -131,7 +119,7 @@
111 -
112 - /* Return element that has ELEM as car */
113 -
114 --INLINE LinkedList * list_find (LinkedList * list, void *elem)
115 -+LinkedList * list_find (LinkedList * list, void *elem)
116 - {
117 - while (list)
118 - {
119 -@@ -144,7 +132,7 @@
120 -
121 - /* Free list (backwards recursive) */
122 -
123 --INLINE void list_free (LinkedList * list)
124 -+void list_free (LinkedList * list)
125 - {
126 - if (list)
127 - {
128 -@@ -155,7 +143,7 @@
129 -
130 - /* Map FUNCTION over all elements in LIST */
131 -
132 --INLINE void list_mapcar (LinkedList * list, void (*function) (void *))
133 -+void list_mapcar (LinkedList * list, void (*function) (void *))
134 - {
135 - while (list)
136 - {
137 -diff -Naur wmmsg-1.0.1/src/wmgeneral.orig/list.h wmmsg-1.0.1/src/wmgeneral/list.h
138 ---- wmmsg-1.0.1/src/wmgeneral.orig/list.h 2016-01-04 13:03:23.206828813 +0100
139 -+++ wmmsg-1.0.1/src/wmgeneral/list.h 2016-01-04 13:03:46.741837100 +0100
140 -@@ -29,12 +29,6 @@
141 - #ifndef __LIST_H_
142 - #define __LIST_H_
143 -
144 --#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
145 --#define INLINE inline
146 --#else
147 --#define INLINE
148 --#endif
149 --
150 - typedef struct LinkedList
151 - {
152 - void *head;
153 -@@ -42,20 +36,20 @@
154 - }
155 - LinkedList;
156 -
157 --INLINE LinkedList *list_cons (void *head, LinkedList * tail);
158 -+LinkedList *list_cons (void *head, LinkedList * tail);
159 -
160 --INLINE int list_length (LinkedList * list);
161 -+int list_length (LinkedList * list);
162 -
163 --INLINE void *list_nth (int index, LinkedList * list);
164 -+void *list_nth (int index, LinkedList * list);
165 -
166 --INLINE void list_remove_head (LinkedList ** list);
167 -+void list_remove_head (LinkedList ** list);
168 -
169 --INLINE LinkedList *list_remove_elem (LinkedList * list, void *elem);
170 -+LinkedList *list_remove_elem (LinkedList * list, void *elem);
171 -
172 --INLINE void list_mapcar (LinkedList * list, void (*function) (void *));
173 -+void list_mapcar (LinkedList * list, void (*function) (void *));
174 -
175 --INLINE LinkedList *list_find (LinkedList * list, void *elem);
176 -+LinkedList *list_find (LinkedList * list, void *elem);
177 -
178 --INLINE void list_free (LinkedList * list);
179 -+void list_free (LinkedList * list);
180 -
181 - #endif
182
183 diff --git a/x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch b/x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch
184 deleted file mode 100644
185 index 6bdc05e3623..00000000000
186 --- a/x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch
187 +++ /dev/null
188 @@ -1,44 +0,0 @@
189 -diff -ur wmmsg-1.0.1.orig/configure.in wmmsg-1.0.1/configure.in
190 ---- wmmsg-1.0.1.orig/configure.in 2004-10-04 19:57:13.000000000 +0300
191 -+++ wmmsg-1.0.1/configure.in 2008-03-12 17:45:29.000000000 +0200
192 -@@ -17,11 +17,6 @@
193 - AM_MAINTAINER_MODE
194 -
195 - # get options
196 --AC_ARG_WITH(gtk,
197 -- [ --with-gtk=DIR use gtk in <DIR>],
198 -- [CFLAGS="$CFLAGS -I$withval/include"
199 -- LIBS="-L$withval/lib $LIBS"])
200 --
201 - AC_ARG_WITH(imlib2,
202 - [ --with-imlib2=DIR use imlib2 in <DIR>],
203 - [CFLAGS="$CFLAGS -I$withval/include"
204 -@@ -32,10 +27,9 @@
205 - AC_CHECK_LIB([m], [sin])
206 -
207 - # Check for glib/gtk stuff
208 --AM_PATH_GLIB(1.2.2,,AC_MSG_ERROR([*** GLIB >= 1.2.2 not installed - please insta
209 --ll first ***]))
210 --AM_PATH_GTK(1.2.2,,AC_MSG_ERROR([*** GTK+ >= 1.2.2 not installed - please instal
211 --l first ***]),gthread)
212 -+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0])
213 -+AC_SUBST(GTK_CFLAGS)
214 -+AC_SUBST(GTK_LIBS)
215 -
216 - # check for Imlib2
217 - AC_PATH_GENERIC(imlib2, 1.0.0, [
218 -diff -ur wmmsg-1.0.1.orig/Makefile.am wmmsg-1.0.1/Makefile.am
219 ---- wmmsg-1.0.1.orig/Makefile.am 2003-03-26 09:08:21.000000000 +0200
220 -+++ wmmsg-1.0.1/Makefile.am 2008-03-12 17:42:48.000000000 +0200
221 -@@ -3,8 +3,9 @@
222 - bin_PROGRAMS = wmmsg wmmsg_notify
223 - wmmsg_SOURCES = src/wmmsg/wmconfig.c src/wmmsg/wmmsg.c src/wmmsg/getopt.c src/wmgeneral/wmgeneral.c src/wmgeneral/misc.c src/wmgeneral/list.c
224 - wmmsg_notify_SOURCES = src/wmmsg/wmmsg_notify.c src/wmmsg/getopt.c
225 --INCLUDES = -I/usr/X11R6/include -I$(prefix)/include -I$(includedir) -I. `glib-config --cflags` `gtk-config --cflags` `imlib2-config --cflags`
226 --AM_LDFLAGS = -lX11 -lXext -lXpm -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib `glib-config --libs` `gtk-config --libs` `imlib2-config --libs`
227 -+INCLUDES = -I$(prefix)/include -I$(includedir) -I. `pkg-config --cflags gtk+-2.0` `imlib2-config --cflags`
228 -+wmmsg_LDADD = -lX11 -lXext -lXpm -L/usr/lib -L/usr/local/lib $(GTK_LIBS) $(IMLIB_LIBS)
229 -+wmmsg_notify_LDADD = $(wmmsg_LDADD)
230 -
231 - man1_MANS = man/wmmsg.1 man/wmmsg_notify.1
232 - man_MANS =
233
234 diff --git a/x11-plugins/wmmsg/metadata.xml b/x11-plugins/wmmsg/metadata.xml
235 deleted file mode 100644
236 index 6498eab3ceb..00000000000
237 --- a/x11-plugins/wmmsg/metadata.xml
238 +++ /dev/null
239 @@ -1,15 +0,0 @@
240 -<?xml version="1.0" encoding="UTF-8"?>
241 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
242 -<pkgmetadata>
243 -<maintainer type="person">
244 - <email>voyageur@g.o</email>
245 - <name>Bernard Cafarelli</name>
246 -</maintainer>
247 -
248 -<longdescription>
249 -wmmsg is a dockapp that informs you of new events, such as incoming chat
250 -messages, by displaying related icons and arrival times. A notification
251 -program, wmmsg_notify, is included to send events to the dockapp. This can be
252 -called from messaging clients, or any other useful location.
253 -</longdescription>
254 -</pkgmetadata>
255
256 diff --git a/x11-plugins/wmmsg/wmmsg-1.0.1-r2.ebuild b/x11-plugins/wmmsg/wmmsg-1.0.1-r2.ebuild
257 deleted file mode 100644
258 index f08f0340963..00000000000
259 --- a/x11-plugins/wmmsg/wmmsg-1.0.1-r2.ebuild
260 +++ /dev/null
261 @@ -1,36 +0,0 @@
262 -# Copyright 1999-2017 Gentoo Foundation
263 -# Distributed under the terms of the GNU General Public License v2
264 -
265 -EAPI=6
266 -inherit autotools
267 -
268 -DESCRIPTION="universal visual notification dockapp"
269 -HOMEPAGE="http://swapspace.net/~matt/wmmsg"
270 -SRC_URI="http://swapspace.net/~matt/wmmsg/${P}.tar.gz"
271 -
272 -LICENSE="GPL-2"
273 -SLOT="0"
274 -KEYWORDS="amd64 ppc ~sparc x86"
275 -IUSE=""
276 -
277 -RDEPEND="x11-libs/gtk+:2
278 - media-libs/imlib2[X]
279 - x11-libs/libXpm
280 - x11-libs/libXext
281 - x11-libs/libX11"
282 -DEPEND="${RDEPEND}
283 - virtual/pkgconfig
284 - x11-libs/libXt"
285 -
286 -DOCS=( AUTHORS ChangeLog README wmmsgrc )
287 -PATCHES=(
288 - "${FILESDIR}"/${P}-use_gtk2.patch
289 - "${FILESDIR}"/${P}-alt-desktop.patch
290 - "${FILESDIR}"/${P}-list.patch
291 - )
292 -
293 -src_prepare() {
294 - default
295 -
296 - eautoreconf
297 -}