Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/icewm/files/, x11-wm/icewm/
Date: Fri, 30 Aug 2019 07:00:04
Message-Id: 1567148387.8fc06541fd27281e4ae3d821f75204f06dc04136.polynomial-c@gentoo
1 commit: 8fc06541fd27281e4ae3d821f75204f06dc04136
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 30 06:59:47 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 30 06:59:47 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc06541
7
8 x11-wm/icewm: Removed old
9
10 Package-Manager: Portage-2.3.73, Repoman-2.3.17
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 x11-wm/icewm/Manifest | 1 -
14 x11-wm/icewm/files/icewm-1.3.10-menu.patch | 22 ------
15 x11-wm/icewm/files/icewm-1.3.8-uclibc.patch | 64 ----------------
16 x11-wm/icewm/icewm-1.4.2.ebuild | 114 ----------------------------
17 4 files changed, 201 deletions(-)
18
19 diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
20 index 091ed8cc69c..3c7b5ef93c4 100644
21 --- a/x11-wm/icewm/Manifest
22 +++ b/x11-wm/icewm/Manifest
23 @@ -1,3 +1,2 @@
24 -DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
25 DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
26 DIST icewm-1.6.1.tar.lz 1651274 BLAKE2B 85c3bda7bacf8f2e1e6ed250fc1b66d151bb030118c56300fc2ce9ad1a54c8693c3e0f83c81cec1f1878f0c0b300c25ac78bdb6440e235877a18586e07601de3 SHA512 dfc221d9afa6c7949dda983c06bdac5527f8cdb93dd20babdc1de75a7ab6cf9b3b1fe8e8d617cb70bd93ebe9aec70ac419d915b76b564b31dbec42b57d6f6011
27
28 diff --git a/x11-wm/icewm/files/icewm-1.3.10-menu.patch b/x11-wm/icewm/files/icewm-1.3.10-menu.patch
29 deleted file mode 100644
30 index 721a15d25ee..00000000000
31 --- a/x11-wm/icewm/files/icewm-1.3.10-menu.patch
32 +++ /dev/null
33 @@ -1,22 +0,0 @@
34 ---- icewm-1.3.10/lib/menu.in
35 -+++ icewm-1.3.10/lib/menu.in
36 -@@ -4,14 +4,9 @@
37 - # since modifications to this file will be discarded when you
38 - # (re)install icewm.
39 - #
40 --prog xterm xterm xterm
41 --prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
42 --prog fte fte fte
43 --prog NEdit nedit nedit
44 --prog Mozilla mozilla mozilla
45 --prog XChat xchat xchat
46 --prog Gimp gimp gimp
47 -+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
48 -+"Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
49 - separator
50 --menuprog "Desktop Apps" folder icewm-menu-fdo
51 --menufile Programs folder programs
52 --menufile Tool_bar folder toolbar
53 -+prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
54 -+separator
55 -+menufile Programs folder programs.autogen
56
57 diff --git a/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
58 deleted file mode 100644
59 index e790842faed..00000000000
60 --- a/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
61 +++ /dev/null
62 @@ -1,64 +0,0 @@
63 -diff -Naur icewm-1.3.7.orig/configure.in icewm-1.3.7/configure.in
64 ---- icewm-1.3.7.orig/configure.in 2010-10-31 10:09:37.000000000 -0400
65 -+++ icewm-1.3.7/configure.in 2013-10-19 06:20:22.947520430 -0400
66 -@@ -113,6 +113,7 @@
67 - AC_CHECK_HEADERS(libgen.h) dnl -- basename() for FreeBSD
68 - AC_CHECK_HEADERS(machine/apmvar.h)
69 - AC_CHECK_HEADERS(machine/apm_bios.h)
70 -+AC_CHECK_HEADERS(execinfo.h)
71 -
72 - AC_CHECK_HEADERS(kstat.h,
73 - [ CORE_LIBS="${CORE_LIBS} -lkstat"
74 -diff -Naur icewm-1.3.7.orig/src/acpustatus.cc icewm-1.3.7/src/acpustatus.cc
75 ---- icewm-1.3.7.orig/src/acpustatus.cc 2010-10-31 10:09:36.000000000 -0400
76 -+++ icewm-1.3.7/src/acpustatus.cc 2013-10-19 06:20:18.355519888 -0400
77 -@@ -25,17 +25,12 @@
78 - #include "sysdep.h"
79 - #include "default.h"
80 -
81 --#if defined(linux)
82 --//#include <linux/kernel.h>
83 --#include <sys/sysinfo.h>
84 --#endif
85 - #if defined(sun) && defined(SVR4)
86 - #include <sys/loadavg.h>
87 - #endif
88 - #ifdef HAVE_KSTAT_H
89 - #include <sys/resource.h>
90 - #include <kstat.h>
91 --#include <sys/sysinfo.h>
92 - #endif
93 -
94 - #ifdef HAVE_SYS_PARAM_H
95 -@@ -56,6 +51,10 @@
96 - #include <dirent.h>
97 - #include "intl.h"
98 -
99 -+#if defined(linux) || defined(HAVE_KSTAT_H)
100 -+#include <sys/sysinfo.h>
101 -+#endif
102 -+
103 - #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME)
104 -
105 - extern ref<YPixmap> taskbackPixmap;
106 -diff -Naur icewm-1.3.7.orig/src/misc.cc icewm-1.3.7/src/misc.cc
107 ---- icewm-1.3.7.orig/src/misc.cc 2010-10-31 10:09:36.000000000 -0400
108 -+++ icewm-1.3.7/src/misc.cc 2013-10-19 06:20:22.947520430 -0400
109 -@@ -15,7 +15,7 @@
110 - #include <libgen.h>
111 - #endif
112 -
113 --#ifdef linux
114 -+#if defined(linux) && defined(HAVE_EXECINFO_H)
115 - #include <execinfo.h>
116 - #endif
117 -
118 -@@ -503,7 +503,7 @@
119 - }
120 -
121 - void show_backtrace() {
122 --#ifdef linux
123 -+#if defined(linux) && defined(HAVE_EXECINFO_H)
124 - const char head[] = "\nbacktrace:\n";
125 - const char tail[] = "end\n";
126 - void *array[20];
127
128 diff --git a/x11-wm/icewm/icewm-1.4.2.ebuild b/x11-wm/icewm/icewm-1.4.2.ebuild
129 deleted file mode 100644
130 index e3ae5642b7f..00000000000
131 --- a/x11-wm/icewm/icewm-1.4.2.ebuild
132 +++ /dev/null
133 @@ -1,114 +0,0 @@
134 -# Copyright 1999-2018 Gentoo Authors
135 -# Distributed under the terms of the GNU General Public License v2
136 -
137 -EAPI=6
138 -
139 -inherit autotools eutils
140 -
141 -DESCRIPTION="Ice Window Manager with Themes"
142 -HOMEPAGE="https://ice-wm.org/ https://github.com/bbidulock/icewm"
143 -LICENSE="GPL-2"
144 -SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
145 -
146 -SLOT="0"
147 -KEYWORDS="amd64 ppc sparc x86"
148 -IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
149 -
150 -# Tests broken in all versions, patches welcome, bug #323907, #389533
151 -RESTRICT="test"
152 -
153 -#fix for icewm preversion package names
154 -S="${WORKDIR}/${P/_}"
155 -
156 -RDEPEND="
157 - media-libs/fontconfig
158 - x11-libs/gdk-pixbuf:2[X]
159 - x11-libs/libICE
160 - x11-libs/libSM
161 - x11-libs/libX11
162 - x11-libs/libXext
163 - x11-libs/libXft
164 - x11-libs/libXpm
165 - x11-libs/libXrandr
166 - x11-libs/libXrender
167 - bidi? ( dev-libs/fribidi )
168 - xinerama? ( x11-libs/libXinerama )
169 -"
170 -DEPEND="
171 - ${RDEPEND}
172 - x11-base/xorg-proto
173 - doc? ( app-text/linuxdoc-tools )
174 - nls? ( >=sys-devel/gettext-0.19.6 )
175 - truetype? ( >=media-libs/freetype-2.0.9 )
176 -"
177 -
178 -pkg_setup() {
179 - if use truetype && use minimal ; then
180 - ewarn "You have both 'truetype' and 'minimal' use flags enabled."
181 - ewarn "If you really want a minimal install, you will have to turn off"
182 - ewarn "the truetype flag for this package."
183 - fi
184 -}
185 -
186 -PATCHES=(
187 - "${FILESDIR}"/${PN}-1.3.10-menu.patch
188 -)
189 -
190 -src_prepare() {
191 - # Fix bug #486710
192 - use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
193 -
194 - default
195 -
196 - if ! use doc ; then
197 - sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
198 - fi
199 -
200 - eautoreconf
201 -}
202 -
203 -src_configure() {
204 - local myconf=(
205 - --disable-menus-gnome2
206 - --with-libdir=/usr/share/icewm
207 - --with-cfgdir=/etc/icewm
208 - --with-docdir=/usr/share/doc/${PF}/html
209 - $(use_enable bidi fribidi)
210 - $(use_enable debug)
211 - $(use_enable nls i18n)
212 - $(use_enable nls)
213 - $(use_enable xinerama)
214 - )
215 - if use truetype ; then
216 - myconf+=(
217 - --enable-gradients
218 - --enable-shape
219 - --enable-shaped-decorations
220 - )
221 - else
222 - myconf+=(
223 - --disable-xfreetype
224 - --enable-corefonts
225 - $(use_enable minimal lite)
226 - )
227 - fi
228 -
229 - CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
230 -
231 - sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
232 - sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
233 -}
234 -
235 -src_install(){
236 - local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
237 -
238 - default
239 -
240 - if ! use doc ; then
241 - cp doc/${PN}.man "${T}"/${PN}.1 || die
242 - doman "${T}"/${PN}.1
243 - fi
244 -
245 - exeinto /etc/X11/Sessions
246 - doexe "${FILESDIR}/icewm"
247 -}