1 |
commit: 84ada9d2878453ab45952286b551d7dc0cd005d9 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 2 17:02:37 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 2 17:02:59 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84ada9d2 |
7 |
|
8 |
x11-libs/wxGTK: remove old development cycle slot 2.9 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
x11-libs/wxGTK/Manifest | 3 - |
13 |
x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch | 75 --------- |
14 |
x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild | 177 --------------------- |
15 |
3 files changed, 255 deletions(-) |
16 |
|
17 |
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest |
18 |
index a929f527fc4..ff95ad27262 100644 |
19 |
--- a/x11-libs/wxGTK/Manifest |
20 |
+++ b/x11-libs/wxGTK/Manifest |
21 |
@@ -1,6 +1,3 @@ |
22 |
-DIST wxPython-docs-2.9.4.0.tar.bz2 15477636 SHA256 42a1683f253aa36ae9ee20b8d511d8704b4e45ba124fec256a7dfce38da9f75f SHA512 f996e69f24baaa8d35bf94ef77f31f6beda5dd4ddd65d6b71558e8dbe33098c951f995172b4ccd93ad08c81df07a9b529813eac5d39ffa06290f2a9ccc87620c WHIRLPOOL b6f6d65d319683f44b1eb4708077abaecd1a972a0d79fb6293b055099a0720d36e83506df6d075243f9e8b180849ae0d44badc8a22d5c764c956d5ecfe0cc6da |
23 |
DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 SHA256 9e9b32b7452f8f1885f0326c0382ec1878c68a251146b3e3997c7c3aa70caa57 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e WHIRLPOOL ac0b4cd1937c31803399f2d9172158f00f99886462becfb58c3553c263bfe93d54acf5f05662227aeda4fd44610ada0680127b05e165b261104b765f25185715 |
24 |
DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d |
25 |
-DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507 |
26 |
-DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811 |
27 |
DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d |
28 |
|
29 |
diff --git a/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch |
30 |
deleted file mode 100644 |
31 |
index 7657f9b58c6..00000000000 |
32 |
--- a/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch |
33 |
+++ /dev/null |
34 |
@@ -1,75 +0,0 @@ |
35 |
-Prevent file collisions between multiple installed SLOTs. |
36 |
- |
37 |
- - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. |
38 |
- - Version the bakefile preset filenames. Unversioned symlinks to these files |
39 |
- are handled by eselect. |
40 |
- - Version wx-config and wxrc. The unversioned forms are wrapper scripts |
41 |
- installed with eselect-wxwidgets. |
42 |
- - Version wxstd.mo and modify AddStdCatalog to use it. |
43 |
- |
44 |
---- a/Makefile.in |
45 |
-+++ b/Makefile.in |
46 |
-@@ -14774,10 +14774,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ |
47 |
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depna |
48 |
me) $(__cocoa_res___depname) |
49 |
- |
50 |
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) |
51 |
$(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) |
52 |
-- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal |
53 |
-- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) |
54 |
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets |
55 |
-- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) |
56 |
-+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ |
57 |
-+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ |
58 |
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) |
59 |
- $(DYLIB_RPATH_INSTALL) |
60 |
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx |
61 |
- for f in setup.h $(RCDEFS_H); do \ |
62 |
-@@ -15662,7 +15662,7 @@ install-wxconfig: |
63 |
- $(INSTALL_DIR) $(DESTDIR)$(bindir) |
64 |
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config |
65 |
- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config |
66 |
-- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) |
67 |
-+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) |
68 |
- |
69 |
- locale_install: |
70 |
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale |
71 |
-@@ -15670,7 +15670,7 @@ locale_install: |
72 |
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ |
73 |
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ |
74 |
- if test -f $(srcdir)/locale/$$l.mo ; then \ |
75 |
-- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ |
76 |
-+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ |
77 |
- fi ; \ |
78 |
- done |
79 |
- |
80 |
---- a/build/bakefiles/wx.bkl |
81 |
-+++ b/build/bakefiles/wx.bkl |
82 |
-@@ -138,7 +138,7 @@ |
83 |
- <using module="gettext"/> |
84 |
- <gettext-catalogs id="locale"> |
85 |
- <srcdir>$(SRCDIR)/locale</srcdir> |
86 |
-- <catalog-name>wxstd</catalog-name> |
87 |
-+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> |
88 |
- <linguas> |
89 |
- ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk |
90 |
- zh zh_CN zh_TW |
91 |
---- a/src/common/translation.cpp |
92 |
-+++ b/src/common/translation.cpp |
93 |
-@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c |
94 |
- |
95 |
- bool wxTranslations::AddStdCatalog() |
96 |
- { |
97 |
-- if ( !AddCatalog(wxS("wxstd")) ) |
98 |
-+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) |
99 |
- return false; |
100 |
- |
101 |
- // there may be a catalog with toolkit specific overrides, it is not |
102 |
---- a/utils/wxrc/Makefile.in |
103 |
-+++ b/utils/wxrc/Makefile.in |
104 |
-@@ -125,7 +125,6 @@ distclean: clean |
105 |
- @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
106 |
- @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) |
107 |
- @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
108 |
--@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) |
109 |
- |
110 |
- @COND_USE_XRC_1@uninstall_wxrc: |
111 |
- @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) |
112 |
|
113 |
diff --git a/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild |
114 |
deleted file mode 100644 |
115 |
index ee0de19d06c..00000000000 |
116 |
--- a/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild |
117 |
+++ /dev/null |
118 |
@@ -1,177 +0,0 @@ |
119 |
-# Copyright 1999-2017 Gentoo Foundation |
120 |
-# Distributed under the terms of the GNU General Public License v2 |
121 |
- |
122 |
-EAPI="5" |
123 |
- |
124 |
-inherit eutils flag-o-matic |
125 |
- |
126 |
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" |
127 |
-HOMEPAGE="http://wxwidgets.org/" |
128 |
- |
129 |
-# we use the wxPython tarballs because they include the full wxGTK sources and |
130 |
-# docs, and are released more frequently than wxGTK. |
131 |
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-2.9.4.0.tar.bz2 |
132 |
- doc? ( mirror://sourceforge/wxpython/wxPython-docs-2.9.4.0.tar.bz2 ) |
133 |
- mirror://sourceforge/wxpython/wxPython-src-${PV}.patch" |
134 |
- |
135 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
136 |
-IUSE="+X aqua doc debug gnome gstreamer opengl pch sdl tiff webkit" |
137 |
- |
138 |
-SLOT="2.9/2.9.4" |
139 |
- |
140 |
-RDEPEND=" |
141 |
- dev-libs/expat |
142 |
- sdl? ( media-libs/libsdl ) |
143 |
- X? ( |
144 |
- >=dev-libs/glib-2.22:2 |
145 |
- media-libs/libpng:0= |
146 |
- sys-libs/zlib |
147 |
- virtual/jpeg:0= |
148 |
- >=x11-libs/gtk+-2.18:2 |
149 |
- x11-libs/libSM |
150 |
- x11-libs/libXinerama |
151 |
- x11-libs/libXxf86vm |
152 |
- x11-libs/pango[X] |
153 |
- gnome? ( gnome-base/libgnomeprintui:2.2 ) |
154 |
- gstreamer? ( |
155 |
- media-libs/gstreamer:0.10 |
156 |
- media-libs/gst-plugins-base:0.10 ) |
157 |
- opengl? ( virtual/opengl ) |
158 |
- tiff? ( media-libs/tiff:0 ) |
159 |
- webkit? ( net-libs/webkit-gtk:2 ) |
160 |
- ) |
161 |
- aqua? ( |
162 |
- x11-libs/gtk+:2[aqua=] |
163 |
- virtual/jpeg:0= |
164 |
- tiff? ( media-libs/tiff:0 ) |
165 |
- )" |
166 |
- |
167 |
-DEPEND="${RDEPEND} |
168 |
- virtual/pkgconfig |
169 |
- opengl? ( virtual/glu ) |
170 |
- X? ( |
171 |
- x11-proto/xproto |
172 |
- x11-proto/xineramaproto |
173 |
- x11-proto/xf86vidmodeproto |
174 |
- )" |
175 |
-# test? ( dev-util/cppunit ) |
176 |
- |
177 |
-PDEPEND=">=app-eselect/eselect-wxwidgets-1.4" |
178 |
- |
179 |
-LICENSE="wxWinLL-3 |
180 |
- GPL-2 |
181 |
- doc? ( wxWinFDL-3 )" |
182 |
- |
183 |
-S="${WORKDIR}/wxPython-src-2.9.4.0" |
184 |
- |
185 |
-src_prepare() { |
186 |
- epatch "${FILESDIR}"/${P}-collision.patch |
187 |
- epatch "${DISTDIR}"/wxPython-src-${PV}.patch |
188 |
- epatch_user |
189 |
-} |
190 |
- |
191 |
-src_configure() { |
192 |
- local myconf |
193 |
- |
194 |
- append-flags -fno-strict-aliasing |
195 |
- |
196 |
- # X independent options |
197 |
- myconf="--enable-compat26 |
198 |
- --with-zlib=sys |
199 |
- --with-expat=sys |
200 |
- $(use_enable pch precomp-headers) |
201 |
- $(use_with sdl)" |
202 |
- |
203 |
- # debug in >=2.9 |
204 |
- # if USE="debug" set max debug level (wxDEBUG_LEVEL=2) |
205 |
- # if USE="-debug" use the default (wxDEBUG_LEVEL=1) |
206 |
- # do not use --disable-debug |
207 |
- # this means we always build debugging features into the library, and |
208 |
- # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. |
209 |
- # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. |
210 |
- # http://docs.wxwidgets.org/2.9/overview_debugging.html |
211 |
- # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c |
212 |
- use debug \ |
213 |
- && myconf="${myconf} --enable-debug=max" |
214 |
- |
215 |
- # wxGTK options |
216 |
- # --enable-graphics_ctx - needed for webkit, editra |
217 |
- # --without-gnomevfs - bug #203389 |
218 |
- use X && \ |
219 |
- myconf="${myconf} |
220 |
- --enable-graphics_ctx |
221 |
- --enable-gui |
222 |
- --with-libpng=sys |
223 |
- --with-libxpm=sys |
224 |
- --with-libjpeg=sys |
225 |
- --without-gnomevfs |
226 |
- $(use_enable gstreamer mediactrl) |
227 |
- $(use_enable webkit webview) |
228 |
- $(use_with opengl) |
229 |
- $(use_with gnome gnomeprint) |
230 |
- $(use_with !gnome gtkprint) |
231 |
- $(use_with tiff libtiff sys)" |
232 |
- |
233 |
- use aqua && \ |
234 |
- myconf="${myconf} |
235 |
- --enable-graphics_ctx |
236 |
- --enable-gui |
237 |
- --with-libpng=sys |
238 |
- --with-libxpm=sys |
239 |
- --with-libjpeg=sys |
240 |
- --with-mac |
241 |
- --with-opengl" |
242 |
- # cocoa toolkit seems to be broken |
243 |
- |
244 |
- # wxBase options |
245 |
- if use !X && use !aqua ; then |
246 |
- myconf="${myconf} |
247 |
- --disable-gui" |
248 |
- fi |
249 |
- |
250 |
- mkdir "${S}"/wxgtk_build |
251 |
- cd "${S}"/wxgtk_build |
252 |
- |
253 |
- ECONF_SOURCE="${S}" econf ${myconf} |
254 |
-} |
255 |
- |
256 |
-src_compile() { |
257 |
- cd "${S}"/wxgtk_build |
258 |
- emake |
259 |
-} |
260 |
- |
261 |
-# Currently fails - need to investigate |
262 |
-#src_test() { |
263 |
-# cd "${S}"/wxgtk_build/tests |
264 |
-# emake || die "failed building testsuite" |
265 |
-# ./test -d || ewarn "failed running testsuite" |
266 |
-#} |
267 |
- |
268 |
-src_install() { |
269 |
- cd "${S}"/wxgtk_build |
270 |
- |
271 |
- emake DESTDIR="${D}" install |
272 |
- |
273 |
- cd "${S}"/docs |
274 |
- dodoc changes.txt readme.txt |
275 |
- newdoc base/readme.txt base_readme.txt |
276 |
- newdoc gtk/readme.txt gtk_readme.txt |
277 |
- |
278 |
- if use doc; then |
279 |
- dohtml -r "${S}"/docs/doxygen/out/html/* |
280 |
- fi |
281 |
- |
282 |
- # Stray windows locale file, causes collisions |
283 |
- local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" |
284 |
- [[ -e ${wxmsw} ]] && rm "${wxmsw}" |
285 |
-} |
286 |
- |
287 |
-pkg_postinst() { |
288 |
- has_version app-eselect/eselect-wxwidgets \ |
289 |
- && eselect wxwidgets update |
290 |
-} |
291 |
- |
292 |
-pkg_postrm() { |
293 |
- has_version app-eselect/eselect-wxwidgets \ |
294 |
- && eselect wxwidgets update |
295 |
-} |