1 |
commit: b5f4edb22fa3845eff88fef95f2691bcfd87f587 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 6 00:36:34 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 6 00:37:27 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5f4edb2 |
7 |
|
8 |
x11-wm/icewm: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
x11-wm/icewm/Manifest | 1 - |
13 |
x11-wm/icewm/files/icewm-1.3.9-uclibc.patch | 64 -------------- |
14 |
x11-wm/icewm/icewm-1.3.11.ebuild | 125 ---------------------------- |
15 |
3 files changed, 190 deletions(-) |
16 |
|
17 |
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest |
18 |
index 330098a..8e8e800 100644 |
19 |
--- a/x11-wm/icewm/Manifest |
20 |
+++ b/x11-wm/icewm/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST icewm-1.3.11.tar.gz 930484 SHA256 a8e697e92e1697109522eb286eaa282bee10dcdb747b18bbb26d7d21a3d99588 SHA512 d64d324a51f793d8c1c820fb406c310fd7f3cfe9d9e328226103958d9f266830d08cd92fac1a0785e68e1055cdd22cd64e15d0c844008f6f1505473219bb348b WHIRLPOOL 9f4d5e8f9ee16f8e7d96f7b5e5012049190dfa6eb178859262835383c672e27d1915c8faf5258953bf1afe86fb23adb329e934f0cf98c3db7ea69fda90976cd9 |
23 |
DIST icewm-1.3.12.tar.gz 944617 SHA256 e7e0fe0fb07e297fa40f0c9d149c0cf6da19e13b98178fc779dca9ed81b3b232 SHA512 b2704ab69a1910cab6711ca11b79fa32f66747fe04468eff86813812fa855423ed43144ab0290e245221520a919755c0e153b60ff238ace60f9546af595063ee WHIRLPOOL bc7ec26e2a9de14e2b67da60de741205e2716233074a77465ce490e291d9a19deee61fa896ac31c1489d181b5929a325c1df7b30a0e3c428b0b6bf6bcd8fdccf |
24 |
DIST icewm-1.3.8.tar.gz 905680 SHA256 17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18 SHA512 ce9bf3e736a2f3fad4bbf731647b4e4ad0168cd2c4af66b1c43beef9ceeee39d14909714d2fc73ab13f6c285a74dfe31fffc9677ae8bd2d1077716cd6d6afb72 WHIRLPOOL 5bb0f6fa830ea10978bb8fd31805596c849a370d619626736e1218e844de72e142ed1aaa87b2f2aeb40603fcf2cfaa88ffae242c726ae1151045c6a792d5cf6c |
25 |
|
26 |
diff --git a/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch |
27 |
deleted file mode 100644 |
28 |
index 5019b68..00000000 |
29 |
--- a/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch |
30 |
+++ /dev/null |
31 |
@@ -1,64 +0,0 @@ |
32 |
-diff -Naur a/configure.ac b/configure.ac |
33 |
---- a/configure.ac 2015-01-02 16:27:05.093088172 +0000 |
34 |
-+++ b/configure.ac 2015-01-02 16:29:58.563094214 +0000 |
35 |
-@@ -75,6 +75,7 @@ |
36 |
- AC_CHECK_HEADERS([libgen.h]) |
37 |
- AC_CHECK_HEADERS([machine/apmvar.h]) |
38 |
- AC_CHECK_HEADERS([machine/apm_bios.h]) |
39 |
-+AC_CHECK_HEADERS([execinfo.h]) |
40 |
- |
41 |
- # Checks for typedefs, structures, and compiler characteristics. |
42 |
- AC_CHECK_HEADER_STDBOOL |
43 |
-diff -Naur a/src/acpustatus.cc b/src/acpustatus.cc |
44 |
---- a/src/acpustatus.cc 2014-09-01 10:21:57.000000000 +0000 |
45 |
-+++ b/src/acpustatus.cc 2015-01-02 16:28:35.738091329 +0000 |
46 |
-@@ -25,17 +25,12 @@ |
47 |
- #include "sysdep.h" |
48 |
- #include "default.h" |
49 |
- |
50 |
--#if defined(linux) |
51 |
--//#include <linux/kernel.h> |
52 |
--#include <sys/sysinfo.h> |
53 |
--#endif |
54 |
- #if defined(sun) && defined(SVR4) |
55 |
- #include <sys/loadavg.h> |
56 |
- #endif |
57 |
- #ifdef HAVE_KSTAT_H |
58 |
- #include <sys/resource.h> |
59 |
- #include <kstat.h> |
60 |
--#include <sys/sysinfo.h> |
61 |
- #endif |
62 |
- |
63 |
- #ifdef HAVE_SYS_PARAM_H |
64 |
-@@ -56,6 +51,10 @@ |
65 |
- #include <dirent.h> |
66 |
- #include "intl.h" |
67 |
- |
68 |
-+#if defined(linux) || defined(HAVE_KSTAT_H) |
69 |
-+#include <sys/sysinfo.h> |
70 |
-+#endif |
71 |
-+ |
72 |
- #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME) |
73 |
- |
74 |
- extern ref<YPixmap> taskbackPixmap; |
75 |
-diff -Naur a/src/misc.cc b/src/misc.cc |
76 |
---- a/src/misc.cc 2014-09-01 10:21:57.000000000 +0000 |
77 |
-+++ b/src/misc.cc 2015-01-02 16:31:00.722096379 +0000 |
78 |
-@@ -15,7 +15,7 @@ |
79 |
- #include <libgen.h> |
80 |
- #endif |
81 |
- |
82 |
--#ifdef linux |
83 |
-+#if defined(linux) && defined(HAVE_EXECINFO_H) |
84 |
- #include <execinfo.h> |
85 |
- #endif |
86 |
- |
87 |
-@@ -543,7 +543,7 @@ |
88 |
- } |
89 |
- |
90 |
- void show_backtrace() { |
91 |
--#ifdef linux |
92 |
-+#if defined(linux) && defined(HAVE_EXECINFO_H) |
93 |
- void *array[20]; |
94 |
- |
95 |
- fprintf(stderr, "\nbacktrace:\n"); |
96 |
|
97 |
diff --git a/x11-wm/icewm/icewm-1.3.11.ebuild b/x11-wm/icewm/icewm-1.3.11.ebuild |
98 |
deleted file mode 100644 |
99 |
index 32e1aea..00000000 |
100 |
--- a/x11-wm/icewm/icewm-1.3.11.ebuild |
101 |
+++ /dev/null |
102 |
@@ -1,125 +0,0 @@ |
103 |
-# Copyright 1999-2015 Gentoo Foundation |
104 |
-# Distributed under the terms of the GNU General Public License v2 |
105 |
-# $Id$ |
106 |
- |
107 |
-EAPI=5 |
108 |
-PYTHON_COMPAT=( python2_7 ) |
109 |
- |
110 |
-inherit autotools eutils python-single-r1 |
111 |
- |
112 |
-DESCRIPTION="Ice Window Manager with Themes" |
113 |
-HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm" |
114 |
-LICENSE="GPL-2" |
115 |
-SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
116 |
- |
117 |
-SLOT="0" |
118 |
-KEYWORDS="~amd64 ~ppc ~x86" |
119 |
-IUSE="bidi debug doc gnome minimal nls truetype uclibc xinerama" |
120 |
-REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )" |
121 |
- |
122 |
-# Tests broken in all versions, patches welcome, bug #323907, #389533 |
123 |
-RESTRICT="test" |
124 |
- |
125 |
-#fix for icewm preversion package names |
126 |
-S=${WORKDIR}/${P/_} |
127 |
- |
128 |
-RDEPEND=" |
129 |
- media-libs/fontconfig |
130 |
- x11-libs/gdk-pixbuf:2[X] |
131 |
- x11-libs/libX11 |
132 |
- x11-libs/libXrandr |
133 |
- x11-libs/libXext |
134 |
- x11-libs/libXpm |
135 |
- x11-libs/libXrender |
136 |
- x11-libs/libXft |
137 |
- x11-libs/libSM |
138 |
- x11-libs/libICE |
139 |
- xinerama? ( x11-libs/libXinerama ) |
140 |
- bidi? ( dev-libs/fribidi ) |
141 |
- gnome? ( |
142 |
- ${PYTHON_DEPS} |
143 |
- dev-python/pyxdg |
144 |
- gnome-base/gnome-desktop:2 |
145 |
- gnome-base/gnome-menus |
146 |
- gnome-base/libgnomeui ) |
147 |
-" |
148 |
-DEPEND="${RDEPEND} |
149 |
- >=sys-apps/sed-4 |
150 |
- x11-proto/xproto |
151 |
- x11-proto/xextproto |
152 |
- doc? ( app-text/linuxdoc-tools ) |
153 |
- nls? ( >=sys-devel/gettext-0.19.5 ) |
154 |
- truetype? ( >=media-libs/freetype-2.0.9 ) |
155 |
- xinerama? ( x11-proto/xineramaproto ) |
156 |
-" |
157 |
- |
158 |
-pkg_setup() { |
159 |
- if use truetype && use minimal; then |
160 |
- ewarn "You have both 'truetype' and 'minimal' use flags enabled." |
161 |
- ewarn "If you really want a minimal install, you will have to turn off" |
162 |
- ewarn "the truetype flag for this package." |
163 |
- fi |
164 |
-} |
165 |
- |
166 |
-PATCHES=( |
167 |
- "${FILESDIR}"/${PN}-1.3.10-menu.patch |
168 |
-) |
169 |
- |
170 |
-src_prepare() { |
171 |
- epatch "${PATCHES[@]}" |
172 |
- |
173 |
- # Fix bug #486710 |
174 |
- use uclibc && epatch "${FILESDIR}/${PN}-1.3.8-uclibc.patch" |
175 |
- |
176 |
- if ! use doc ; then |
177 |
- sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die |
178 |
- fi |
179 |
- |
180 |
- eautoreconf |
181 |
-} |
182 |
- |
183 |
-src_configure() { |
184 |
- if use truetype ; then |
185 |
- myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations" |
186 |
- else |
187 |
- myconf="${myconf} --disable-xfreetype --enable-corefonts |
188 |
- $(use_enable minimal lite)" |
189 |
- fi |
190 |
- |
191 |
- myconf="${myconf} |
192 |
- --with-libdir=/usr/share/icewm |
193 |
- --with-cfgdir=/etc/icewm |
194 |
- --with-docdir=/usr/share/doc/${PF}/html |
195 |
- $(use_enable bidi fribidi) |
196 |
- $(use_enable debug) |
197 |
- $(use_enable gnome menus-gnome2) |
198 |
- $(use_enable nls i18n) |
199 |
- $(use_enable nls) |
200 |
- $(use_enable xinerama)" |
201 |
- |
202 |
- CXXFLAGS="${CXXFLAGS}" econf ${myconf} |
203 |
- |
204 |
- sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die |
205 |
- sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed" |
206 |
-} |
207 |
- |
208 |
-src_install(){ |
209 |
- default |
210 |
- |
211 |
- if use gnome; then |
212 |
- dobin "${FILESDIR}"/icewm-xdg-menu |
213 |
- exeinto /usr/share/icewm/ |
214 |
- newexe "${FILESDIR}"/icewm-startup startup |
215 |
- fi |
216 |
- |
217 |
- dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION |
218 |
- |
219 |
- if ! use doc ; then |
220 |
- dohtml -a html,sgml doc/* |
221 |
- cp doc/${PN}.man "${T}"/${PN}.1 |
222 |
- doman "${T}"/${PN}.1 |
223 |
- fi |
224 |
- |
225 |
- exeinto /etc/X11/Sessions |
226 |
- doexe "${FILESDIR}/icewm" |
227 |
-} |