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-libs/fox/, x11-libs/fox/files/
Date: Wed, 25 Nov 2015 12:03:46
Message-Id: 1448453015.f606697478b4d340576e3c0964e30737b9f897f6.polynomial-c@gentoo
1 commit: f606697478b4d340576e3c0964e30737b9f897f6
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 25 12:02:39 2015 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 25 12:03:35 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6066974
7
8 x11-libs/fox: Removed old.
9
10 Package-Manager: portage-2.2.26
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 x11-libs/fox/Manifest | 3 --
14 x11-libs/fox/files/fox-1.6.40-libpng15.patch | 32 ----------------
15 x11-libs/fox/fox-1.6.45.ebuild | 42 ---------------------
16 x11-libs/fox/fox-1.7.45.ebuild | 55 ----------------------------
17 x11-libs/fox/fox-1.7.47.ebuild | 55 ----------------------------
18 5 files changed, 187 deletions(-)
19
20 diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
21 index f68aaed..e0d7104 100644
22 --- a/x11-libs/fox/Manifest
23 +++ b/x11-libs/fox/Manifest
24 @@ -1,7 +1,4 @@
25 -DIST fox-1.6.45.tar.gz 4372554 SHA256 ec2ec7042c3198f78adea25b8958027955af4e3f8371733d1ff43fe5289bc4d6 SHA512 a5fbe6b27ac8bf2b0419e670f80dec2ae39c25988193d3910b62612776e932f8a3289694a2032124394cc367415aa2e6a8820b83a61a78f6bc78b4749f0b2e72 WHIRLPOOL f447cbb19efd3d3bc2b54d4c43f5d4f03884c2b272f27a71304c0360b4a30b4f393947e8c826c1bb5e88a8b039294fbf9e5d54b33dbb184dc9815a3944e3b48a
26 DIST fox-1.6.49.tar.gz 4383152 SHA256 3679ecd23064958259fbef5898aabb048d63b2dcb796de1d8801fe0b51e5a90e SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8 WHIRLPOOL 1592d2560a7967c491dcfeda40e66a45d2811424e222c5f1e768b28c8ce147d7815f46d22006ac9809b967d0c825b7828aad206ab55bcb80cae064f646fd3608
27 DIST fox-1.6.50.tar.gz 4381855 SHA256 342c751d2a7edab136ad26cb4483329da3c16c7abf2f283f318d666ef12d0887 SHA512 195751d223e9af7d76a3bd3192ae7566a129cfe254f0ba3035b4f7e189c68b43daa8276edad95ebf2b1b403b6212a755000eebf1716a11bb7f06845fde4aceae WHIRLPOOL e1b0d855f5b2105c3739f64dd4aac5388450cc9fa36f1739e2a917e6d7bec4ab5273f2d227bb14b3db78b6a58d0088d2bfff9d8cf37c47b33d1f8e7257d282c9
28 -DIST fox-1.7.45.tar.gz 5254563 SHA256 78f2b5f609a52d21da08e693d45b8eeb9d4ceed52ad86e451ef4485f2375c829 SHA512 ec8acf0eb0b1882254f7df2abdcb87445992fc9fb8165afcc08b8dd52a718cb31953849efc7a530bd682e6265687bdf4dc9fb5c930557b9405235182894684b0 WHIRLPOOL 08808e67e0e31c7389b1d4ac097d7d707fb48a925df233021913bc80363002c0c4ce19c8630f4bd5c87ebb5bc5c010dc7f3260f415dfa5b60390c5aae316de78
29 -DIST fox-1.7.47.tar.gz 5271135 SHA256 7f1de8566b88b0010137ea1172168d53494d2d14bfa03fe32f7796146a31a2a3 SHA512 8802c7a21ba35b48a638fb87354da3de54c82ebdd3f931a601f55473fe1f7c16bfa2df253e8531af2058665d9b6f31adf52f6973c2d94f435cc90ac112af22ed WHIRLPOOL fbcf4540b268e95fa4d70ed335d8f499ec46e18390cdc090c98c21b4be5ff3ec576439265cfcf8b90c037fed7937c3a5f19f8544db1906cf86a3f255b8092d62
30 DIST fox-1.7.49.tar.gz 5336321 SHA256 2435c56cde3ba6617c638af4f3bac39e8f4d5dd5a5c6d0805d274c7ba05c520c SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9 WHIRLPOOL 53ad3d34e57507702fc2ac9bd7b446021a99e3dff5b337cda090a670b06d4733abce2bbca88a7586e8af2d00f16ee84b0bd3c42f66fd6e430cc6d342bb76b1ff
31 DIST fox-1.7.53.tar.gz 5366794 SHA256 2cde33d1e72c731ff2f31a8d55769536c5494376f8922833ba57b3f9c8f37340 SHA512 835117497e48fe66790be6e985bb8ef80ae1b34966585355b0d72f907863610de9d89792062ae91297488f0e24e77c08102afe253a59e67ca65a071b2a5890c4 WHIRLPOOL 508d25ba996aa5ea8be7e43b0771df32af2ea04bb37d84a7dc80362bc685032ac6f42d0c3b7eb36a4a9408a75c68bc927c00b1cb50a36375195b741fca6c0e5f
32
33 diff --git a/x11-libs/fox/files/fox-1.6.40-libpng15.patch b/x11-libs/fox/files/fox-1.6.40-libpng15.patch
34 deleted file mode 100644
35 index 2411226..0000000
36 --- a/x11-libs/fox/files/fox-1.6.40-libpng15.patch
37 +++ /dev/null
38 @@ -1,32 +0,0 @@
39 ---- src/fxpngio.cpp
40 -+++ src/fxpngio.cpp
41 -@@ -75,7 +75,11 @@
42 - static void user_error_fn(png_structp png_ptr,png_const_charp){
43 - FXStream* store=(FXStream*)png_get_error_ptr(png_ptr);
44 - store->setError(FXStreamFormat); // Flag this as a format error in FXStream
45 -+#if (PNG_LIBPNG_VER < 10500)
46 - longjmp(png_ptr->jmpbuf,1); // Bail out
47 -+#else
48 -+ png_longjmp(png_ptr,1); // Bail out
49 -+#endif
50 - }
51 -
52 -
53 -@@ -118,7 +122,7 @@
54 - }
55 -
56 - // Set error handling
57 -- if(setjmp(png_ptr->jmpbuf)){
58 -+ if(setjmp(png_jmpbuf(png_ptr))){
59 -
60 - // Free all of the memory associated with the png_ptr and info_ptr
61 - png_destroy_read_struct(&png_ptr,&info_ptr,(png_infopp)NULL);
62 -@@ -231,7 +235,7 @@
63 - }
64 -
65 - // Set error handling.
66 -- if(setjmp(png_ptr->jmpbuf)){
67 -+ if(setjmp(png_jmpbuf(png_ptr))){
68 - png_destroy_write_struct(&png_ptr,&info_ptr);
69 - return false;
70 - }
71
72 diff --git a/x11-libs/fox/fox-1.6.45.ebuild b/x11-libs/fox/fox-1.6.45.ebuild
73 deleted file mode 100644
74 index f587f59..0000000
75 --- a/x11-libs/fox/fox-1.6.45.ebuild
76 +++ /dev/null
77 @@ -1,42 +0,0 @@
78 -# Copyright 1999-2013 Gentoo Foundation
79 -# Distributed under the terms of the GNU General Public License v2
80 -# $Id$
81 -
82 -EAPI="4"
83 -
84 -inherit eutils fox
85 -
86 -LICENSE="LGPL-2.1"
87 -SLOT="1.6"
88 -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
89 -IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
90 -
91 -RDEPEND="x11-libs/libXrandr
92 - x11-libs/libXcursor
93 - x11-libs/fox-wrapper
94 - bzip2? ( >=app-arch/bzip2-1.0.2 )
95 - jpeg? ( virtual/jpeg )
96 - opengl? ( virtual/glu virtual/opengl )
97 - png? ( >=media-libs/libpng-1.2.5 )
98 - tiff? ( >=media-libs/tiff-3.5.7 )
99 - truetype? ( =media-libs/freetype-2*
100 - x11-libs/libXft )
101 - zlib? ( >=sys-libs/zlib-1.1.4 )"
102 -DEPEND="${RDEPEND}
103 - x11-proto/xextproto
104 - x11-libs/libXt"
105 -
106 -src_prepare() {
107 - sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac"
108 - fox_src_prepare
109 -}
110 -
111 -src_configure() {
112 - FOXCONF="$(use_enable bzip2 bz2lib) \
113 - $(use_enable jpeg) \
114 - $(use_with opengl) \
115 - $(use_enable png) \
116 - $(use_enable tiff) \
117 - $(use_with truetype xft) \
118 - $(use_enable zlib)" fox_src_configure
119 -}
120
121 diff --git a/x11-libs/fox/fox-1.7.45.ebuild b/x11-libs/fox/fox-1.7.45.ebuild
122 deleted file mode 100644
123 index af94a5f..0000000
124 --- a/x11-libs/fox/fox-1.7.45.ebuild
125 +++ /dev/null
126 @@ -1,55 +0,0 @@
127 -# Copyright 1999-2014 Gentoo Foundation
128 -# Distributed under the terms of the GNU General Public License v2
129 -# $Id$
130 -
131 -EAPI=5
132 -
133 -inherit fox
134 -
135 -LICENSE="LGPL-2.1"
136 -SLOT="1.7"
137 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
138 -IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
139 -
140 -# newish autoconf needed for working mmap check
141 -RDEPEND="x11-libs/libXrandr
142 - x11-libs/libXcursor
143 - x11-libs/fox-wrapper
144 - >=sys-devel/autoconf-2.67
145 - bzip2? ( app-arch/bzip2 )
146 - jpeg? ( virtual/jpeg )
147 - opengl? ( virtual/glu virtual/opengl )
148 - png? ( media-libs/libpng )
149 - tiff? ( media-libs/tiff )
150 - truetype? ( media-libs/freetype:2
151 - x11-libs/libXft )
152 - zlib? ( sys-libs/zlib )"
153 -DEPEND="${RDEPEND}
154 - x11-proto/xextproto
155 - x11-libs/libXt"
156 -
157 -src_configure() {
158 - FOXCONF="$(use_enable bzip2 bz2lib) \
159 - $(use_enable jpeg) \
160 - $(use_with opengl) \
161 - $(use_enable png) \
162 - $(use_enable tiff) \
163 - $(use_with truetype xft) \
164 - $(use_enable zlib)" fox_src_configure
165 -}
166 -
167 -src_install() {
168 - fox_src_install
169 - CP="${ED}/usr/bin/ControlPanel"
170 - if [[ -f ${CP} ]] ; then
171 - mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
172 - die "Failed to install ControlPanel"
173 - fi
174 -}
175 -
176 -pkg_postinst() {
177 - fox_pkg_postinst
178 -
179 - einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
180 - einfo "with other packages."
181 -}
182
183 diff --git a/x11-libs/fox/fox-1.7.47.ebuild b/x11-libs/fox/fox-1.7.47.ebuild
184 deleted file mode 100644
185 index af94a5f..0000000
186 --- a/x11-libs/fox/fox-1.7.47.ebuild
187 +++ /dev/null
188 @@ -1,55 +0,0 @@
189 -# Copyright 1999-2014 Gentoo Foundation
190 -# Distributed under the terms of the GNU General Public License v2
191 -# $Id$
192 -
193 -EAPI=5
194 -
195 -inherit fox
196 -
197 -LICENSE="LGPL-2.1"
198 -SLOT="1.7"
199 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
200 -IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
201 -
202 -# newish autoconf needed for working mmap check
203 -RDEPEND="x11-libs/libXrandr
204 - x11-libs/libXcursor
205 - x11-libs/fox-wrapper
206 - >=sys-devel/autoconf-2.67
207 - bzip2? ( app-arch/bzip2 )
208 - jpeg? ( virtual/jpeg )
209 - opengl? ( virtual/glu virtual/opengl )
210 - png? ( media-libs/libpng )
211 - tiff? ( media-libs/tiff )
212 - truetype? ( media-libs/freetype:2
213 - x11-libs/libXft )
214 - zlib? ( sys-libs/zlib )"
215 -DEPEND="${RDEPEND}
216 - x11-proto/xextproto
217 - x11-libs/libXt"
218 -
219 -src_configure() {
220 - FOXCONF="$(use_enable bzip2 bz2lib) \
221 - $(use_enable jpeg) \
222 - $(use_with opengl) \
223 - $(use_enable png) \
224 - $(use_enable tiff) \
225 - $(use_with truetype xft) \
226 - $(use_enable zlib)" fox_src_configure
227 -}
228 -
229 -src_install() {
230 - fox_src_install
231 - CP="${ED}/usr/bin/ControlPanel"
232 - if [[ -f ${CP} ]] ; then
233 - mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
234 - die "Failed to install ControlPanel"
235 - fi
236 -}
237 -
238 -pkg_postinst() {
239 - fox_pkg_postinst
240 -
241 - einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
242 - einfo "with other packages."
243 -}