Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xfe/, x11-misc/xfe/files/
Date: Mon, 19 Apr 2021 20:54:42
Message-Id: 1618865625.df85c2585c90886f55d7ae7ffdcfbf919fb561d3.sam@gentoo
1 commit: df85c2585c90886f55d7ae7ffdcfbf919fb561d3
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 19 20:06:28 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 19 20:53:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df85c258
7
8 x11-misc/xfe: drop 1.42, 1.43.1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 x11-misc/xfe/Manifest | 2 -
13 ...e-1.42-use_pkgconfig_for_freetype_and_xft.patch | 57 ----------------
14 x11-misc/xfe/xfe-1.42.ebuild | 78 ----------------------
15 x11-misc/xfe/xfe-1.43.1.ebuild | 75 ---------------------
16 4 files changed, 212 deletions(-)
17
18 diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
19 index a5ce6bfabb4..071ab3b972a 100644
20 --- a/x11-misc/xfe/Manifest
21 +++ b/x11-misc/xfe/Manifest
22 @@ -1,3 +1 @@
23 -DIST xfe-1.42.tar.gz 2727833 BLAKE2B fbca14c77b04cb367173907dd4ae9c210cd88768276e5b7391338b29dc988288f866419f57d1189db6235941e4e2f91608835351000a42d46ed3e7c4c236c69f SHA512 858dd761e45ff09d32d2a230304be0817eab4b6a772376b08d778bb8e1eef681228e5d88e53c441f9b8722d8b7eeae96980e30f8c5e8bb603d4d9a3b3d267351
24 -DIST xfe-1.43.1.tar.gz 2776237 BLAKE2B fc82e2ea21643ecc3875512538af24daddb0db0e8829ce23c7589dc90d68e896282f70d771dcf885ea746acfa88adbb7abe6a0c354e74afa5f722dcfacf77350 SHA512 3c697ff5d0246c8bab86c9824dd4a3475ed3775d2933c63eb8e78f02b4455edb4ca98f86123eac77f611eee6ad660bf0a909c4c2791af19506a4f1744395008e
25 DIST xfe-1.43.2.tar.gz 2834576 BLAKE2B 5ac7ebf229febb75a99e4829a38a3675d6674ec6eced13dc5be70d2b68ce88f6394621dffec2d8359e72da7eace582883b72491e90597ab4a8925685cb577fcb SHA512 ad7b450d0828747f801219c23824b0751fc2a7f0eea791369c4adb3090ffe1279056fa8804ef97b25a2f810e00d37357efc962dc9d4087c3d7cc5f8ffb37d51d
26
27 diff --git a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
28 deleted file mode 100644
29 index 615f7b01bbe..00000000000
30 --- a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
31 +++ /dev/null
32 @@ -1,57 +0,0 @@
33 ---- a/configure.ac
34 -+++ b/configure.ac
35 -@@ -29,6 +29,7 @@
36 - AC_PROG_INSTALL
37 - AC_PROG_LN_S
38 - AC_PROG_MAKE_SET
39 -+PKG_PROG_PKG_CONFIG
40 -
41 -
42 - # Internationalization
43 -@@ -109,16 +110,13 @@
44 -
45 - echo "checking whether FOX was compiled with Xft support... yes"
46 -
47 -- # Check for FreeType2 headers
48 -- freetype_config=''
49 -- AC_CHECK_PROGS(freetype_config,freetype-config,)
50 -- if test -n "$freetype_config"; then
51 -- freetype_cflags=`$freetype_config --cflags`
52 -- freetype_libs=`$freetype_config --libs`
53 -- LIBS="$LIBS $freetype_libs"
54 -- CPPFLAGS="$freetype_cflags $CPPFLAGS"
55 -- fi
56 -- AC_CHECK_HEADER(config/ftheader.h,,[AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h not found"))])
57 -+ # Check for FreeType2
58 -+ PKG_CHECK_MODULES(FREETYPE, freetype2, [
59 -+ freetype_cflags="$FREETYPE_CFLAGS"
60 -+ freetype_libs="$FREETYPE_LIBS"
61 -+ LIBS="$LIBS $freetype_libs"
62 -+ CPPFLAGS="$freetype_cflags $CPPFLAGS"
63 -+ ], AC_MSG_ERROR("freetype not found"))
64 -
65 - # Check for Xft headers
66 - xft_config=''
67 -@@ -131,15 +129,13 @@
68 - CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
69 - else
70 - # On some systems (e.g. Fedora) xft-config is deprecated and pkg-config should be used instead
71 -- pkg_config=''
72 -- AC_CHECK_PROGS(pkg_config,pkg-config,)
73 -- if test -n "$pkg_config"; then
74 -- xft_cflags=`$pkg_config --cflags xft`
75 -- xft_libs=`$pkg_config --libs xft`
76 -- LIBS="$LIBS $xft_libs"
77 -- CPPFLAGS="$xft_cflags $CPPFLAGS"
78 -- CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
79 -- fi
80 -+ PKG_CHECK_MODULES(XFT, xft, [
81 -+ xft_cflags="$XFT_CFLAGS"
82 -+ xft_libs="$XFT_LIBS"
83 -+ LIBS="$LIBS $xft_libs"
84 -+ CPPFLAGS="$xft_cflags $CPPFLAGS"
85 -+ CXXFLAGS="$CXXFLAGS -DHAVE_XFT_H"
86 -+ ], AC_MSG_ERROR("Xft not found"))
87 - fi
88 - AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found"))
89 -
90
91 diff --git a/x11-misc/xfe/xfe-1.42.ebuild b/x11-misc/xfe/xfe-1.42.ebuild
92 deleted file mode 100644
93 index c2619c850cc..00000000000
94 --- a/x11-misc/xfe/xfe-1.42.ebuild
95 +++ /dev/null
96 @@ -1,78 +0,0 @@
97 -# Copyright 1999-2019 Gentoo Authors
98 -# Distributed under the terms of the GNU General Public License v2
99 -
100 -EAPI=6
101 -
102 -PLOCALES="
103 - bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr
104 - zh_CN zh_TW
105 -"
106 -inherit autotools eutils l10n
107 -
108 -DESCRIPTION="MS-Explorer-like minimalist file manager for X"
109 -HOMEPAGE="http://roland65.free.fr/xfe"
110 -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
111 -
112 -LICENSE="GPL-2"
113 -SLOT="0"
114 -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
115 -IUSE="debug nls startup-notification"
116 -
117 -RDEPEND="
118 - media-libs/libpng:0
119 - x11-libs/fox:1.6[png,truetype]
120 - x11-libs/libX11
121 - x11-libs/libXft
122 - startup-notification? ( x11-libs/startup-notification )
123 -"
124 -DEPEND="
125 - ${RDEPEND}
126 - virtual/pkgconfig
127 - nls? (
128 - dev-util/intltool
129 - sys-devel/gettext
130 - )
131 -"
132 -
133 -DOCS=( AUTHORS BUGS ChangeLog README TODO )
134 -
135 -PATCHES=( "${FILESDIR}/${PN}-1.42-use_pkgconfig_for_freetype_and_xft.patch" )
136 -
137 -src_prepare() {
138 - default
139 -
140 - cat >po/POTFILES.skip <<-EOF
141 - src/icons.cpp
142 - xfe.desktop.in.in
143 - xfi.desktop.in.in
144 - xfp.desktop.in.in
145 - xfv.desktop.in.in
146 - xfw.desktop.in.in
147 - EOF
148 -
149 - # malformed LINGUAS file
150 - # recent intltool expects newline for every linguas
151 - sed -i \
152 - -e '/^#/!s:\s\s*:\n:g' \
153 - po/LINGUAS || die
154 -
155 - # remove not selected locales
156 - rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;}
157 - l10n_for_each_disabled_locale_do rm_locale
158 -
159 - sed -i \
160 - -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
161 - configure.ac || die
162 -
163 - eautoreconf
164 -}
165 -
166 -src_configure() {
167 - local myeconfargs=(
168 - $(use_enable debug)
169 - $(use_enable nls)
170 - $(use_enable startup-notification sn)
171 - --enable-minimalflags
172 - )
173 - econf "${myeconfargs[@]}"
174 -}
175
176 diff --git a/x11-misc/xfe/xfe-1.43.1.ebuild b/x11-misc/xfe/xfe-1.43.1.ebuild
177 deleted file mode 100644
178 index 0a9e382f69b..00000000000
179 --- a/x11-misc/xfe/xfe-1.43.1.ebuild
180 +++ /dev/null
181 @@ -1,75 +0,0 @@
182 -# Copyright 1999-2018 Gentoo Foundation
183 -# Distributed under the terms of the GNU General Public License v2
184 -
185 -EAPI=6
186 -PLOCALES="
187 - bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr
188 - zh_CN zh_TW
189 -"
190 -inherit l10n xdg-utils
191 -
192 -DESCRIPTION="MS-Explorer-like minimalist file manager for X"
193 -HOMEPAGE="http://roland65.free.fr/xfe"
194 -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
195 -
196 -LICENSE="GPL-2"
197 -SLOT="0"
198 -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
199 -IUSE="debug nls startup-notification"
200 -
201 -RDEPEND="
202 - media-libs/libpng:0
203 - x11-libs/fox:1.6[png,truetype]
204 - x11-libs/libX11
205 - x11-libs/libXft
206 - startup-notification? ( x11-libs/startup-notification )
207 -"
208 -DEPEND="
209 - ${RDEPEND}
210 - virtual/pkgconfig
211 - nls? (
212 - dev-util/intltool
213 - sys-devel/gettext
214 - )
215 -"
216 -
217 -DOCS=( AUTHORS BUGS ChangeLog README TODO )
218 -
219 -src_prepare() {
220 - default
221 -
222 - cat >po/POTFILES.skip <<-EOF
223 - src/icons.cpp
224 - xfe.desktop.in.in
225 - xfi.desktop.in.in
226 - xfp.desktop.in.in
227 - xfv.desktop.in.in
228 - xfw.desktop.in.in
229 - EOF
230 -
231 - # malformed LINGUAS file
232 - # recent intltool expects newline for every linguas
233 - sed -i \
234 - -e '/^#/!s:\s\s*:\n:g' \
235 - po/LINGUAS || die
236 -
237 - # remove not selected locales
238 - rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;}
239 - l10n_for_each_disabled_locale_do rm_locale
240 -}
241 -
242 -src_configure() {
243 - econf \
244 - $(use_enable debug) \
245 - $(use_enable nls) \
246 - $(use_enable startup-notification sn) \
247 - --enable-minimalflags
248 -}
249 -
250 -pkg_postinst() {
251 - xdg_desktop_database_update
252 -}
253 -
254 -pkg_postrm() {
255 - xdg_desktop_database_update
256 -}