diff options
author | Mart Raudsepp <leio@gentoo.org> | 2017-03-02 19:02:37 +0200 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2017-03-02 19:02:59 +0200 |
commit | 84ada9d2878453ab45952286b551d7dc0cd005d9 (patch) | |
tree | e66126d797ad571eb5b7df073210a7e5a0f98f39 /x11-libs/wxGTK | |
parent | dev-python/wxpython: dev-python/wxpython: remove old development cycle slot 2.9 (diff) | |
download | gentoo-84ada9d2878453ab45952286b551d7dc0cd005d9.tar.gz gentoo-84ada9d2878453ab45952286b551d7dc0cd005d9.tar.bz2 gentoo-84ada9d2878453ab45952286b551d7dc0cd005d9.zip |
x11-libs/wxGTK: remove old development cycle slot 2.9
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r-- | x11-libs/wxGTK/Manifest | 3 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch | 75 | ||||
-rw-r--r-- | x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild | 177 |
3 files changed, 0 insertions, 255 deletions
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index a929f527fc44..ff95ad27262b 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,6 +1,3 @@ -DIST wxPython-docs-2.9.4.0.tar.bz2 15477636 SHA256 42a1683f253aa36ae9ee20b8d511d8704b4e45ba124fec256a7dfce38da9f75f SHA512 f996e69f24baaa8d35bf94ef77f31f6beda5dd4ddd65d6b71558e8dbe33098c951f995172b4ccd93ad08c81df07a9b529813eac5d39ffa06290f2a9ccc87620c WHIRLPOOL b6f6d65d319683f44b1eb4708077abaecd1a972a0d79fb6293b055099a0720d36e83506df6d075243f9e8b180849ae0d44badc8a22d5c764c956d5ecfe0cc6da DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 SHA256 9e9b32b7452f8f1885f0326c0382ec1878c68a251146b3e3997c7c3aa70caa57 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e WHIRLPOOL ac0b4cd1937c31803399f2d9172158f00f99886462becfb58c3553c263bfe93d54acf5f05662227aeda4fd44610ada0680127b05e165b261104b765f25185715 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d -DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507 -DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d 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 deleted file mode 100644 index 7657f9b58c63..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch +++ /dev/null @@ -1,75 +0,0 @@ -Prevent file collisions between multiple installed SLOTs. - - - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. - - Version the bakefile preset filenames. Unversioned symlinks to these files - are handled by eselect. - - Version wx-config and wxrc. The unversioned forms are wrapper scripts - installed with eselect-wxwidgets. - - Version wxstd.mo and modify AddStdCatalog to use it. - ---- a/Makefile.in -+++ b/Makefile.in -@@ -14774,10 +14774,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ - 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___depname) $(__cocoa_res___depname) - - 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) $(__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) -- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal -- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -- (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) -+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ -+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) - $(DYLIB_RPATH_INSTALL) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - for f in setup.h $(RCDEFS_H); do \ -@@ -15662,7 +15662,7 @@ install-wxconfig: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config -- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) - - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale -@@ -15670,7 +15670,7 @@ locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - ---- a/build/bakefiles/wx.bkl -+++ b/build/bakefiles/wx.bkl -@@ -138,7 +138,7 @@ - <using module="gettext"/> - <gettext-catalogs id="locale"> - <srcdir>$(SRCDIR)/locale</srcdir> -- <catalog-name>wxstd</catalog-name> -+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> - <linguas> - ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk - zh zh_CN zh_TW ---- a/src/common/translation.cpp -+++ b/src/common/translation.cpp -@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c - - bool wxTranslations::AddStdCatalog() - { -- if ( !AddCatalog(wxS("wxstd")) ) -+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not ---- a/utils/wxrc/Makefile.in -+++ b/utils/wxrc/Makefile.in -@@ -125,7 +125,6 @@ distclean: clean - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) - @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) - @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) --@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) - - @COND_USE_XRC_1@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild deleted file mode 100644 index ee0de19d06cc..000000000000 --- a/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="http://wxwidgets.org/" - -# we use the wxPython tarballs because they include the full wxGTK sources and -# docs, and are released more frequently than wxGTK. -SRC_URI="mirror://sourceforge/wxpython/wxPython-src-2.9.4.0.tar.bz2 - doc? ( mirror://sourceforge/wxpython/wxPython-docs-2.9.4.0.tar.bz2 ) - mirror://sourceforge/wxpython/wxPython-src-${PV}.patch" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="+X aqua doc debug gnome gstreamer opengl pch sdl tiff webkit" - -SLOT="2.9/2.9.4" - -RDEPEND=" - dev-libs/expat - sdl? ( media-libs/libsdl ) - X? ( - >=dev-libs/glib-2.22:2 - media-libs/libpng:0= - sys-libs/zlib - virtual/jpeg:0= - >=x11-libs/gtk+-2.18:2 - x11-libs/libSM - x11-libs/libXinerama - x11-libs/libXxf86vm - x11-libs/pango[X] - gnome? ( gnome-base/libgnomeprintui:2.2 ) - gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) - opengl? ( virtual/opengl ) - tiff? ( media-libs/tiff:0 ) - webkit? ( net-libs/webkit-gtk:2 ) - ) - aqua? ( - x11-libs/gtk+:2[aqua=] - virtual/jpeg:0= - tiff? ( media-libs/tiff:0 ) - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - opengl? ( virtual/glu ) - X? ( - x11-proto/xproto - x11-proto/xineramaproto - x11-proto/xf86vidmodeproto - )" -# test? ( dev-util/cppunit ) - -PDEPEND=">=app-eselect/eselect-wxwidgets-1.4" - -LICENSE="wxWinLL-3 - GPL-2 - doc? ( wxWinFDL-3 )" - -S="${WORKDIR}/wxPython-src-2.9.4.0" - -src_prepare() { - epatch "${FILESDIR}"/${P}-collision.patch - epatch "${DISTDIR}"/wxPython-src-${PV}.patch - epatch_user -} - -src_configure() { - local myconf - - append-flags -fno-strict-aliasing - - # X independent options - myconf="--enable-compat26 - --with-zlib=sys - --with-expat=sys - $(use_enable pch precomp-headers) - $(use_with sdl)" - - # debug in >=2.9 - # if USE="debug" set max debug level (wxDEBUG_LEVEL=2) - # if USE="-debug" use the default (wxDEBUG_LEVEL=1) - # do not use --disable-debug - # this means we always build debugging features into the library, and - # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. - # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. - # http://docs.wxwidgets.org/2.9/overview_debugging.html - # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c - use debug \ - && myconf="${myconf} --enable-debug=max" - - # wxGTK options - # --enable-graphics_ctx - needed for webkit, editra - # --without-gnomevfs - bug #203389 - use X && \ - myconf="${myconf} - --enable-graphics_ctx - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --without-gnomevfs - $(use_enable gstreamer mediactrl) - $(use_enable webkit webview) - $(use_with opengl) - $(use_with gnome gnomeprint) - $(use_with !gnome gtkprint) - $(use_with tiff libtiff sys)" - - use aqua && \ - myconf="${myconf} - --enable-graphics_ctx - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --with-mac - --with-opengl" - # cocoa toolkit seems to be broken - - # wxBase options - if use !X && use !aqua ; then - myconf="${myconf} - --disable-gui" - fi - - mkdir "${S}"/wxgtk_build - cd "${S}"/wxgtk_build - - ECONF_SOURCE="${S}" econf ${myconf} -} - -src_compile() { - cd "${S}"/wxgtk_build - emake -} - -# Currently fails - need to investigate -#src_test() { -# cd "${S}"/wxgtk_build/tests -# emake || die "failed building testsuite" -# ./test -d || ewarn "failed running testsuite" -#} - -src_install() { - cd "${S}"/wxgtk_build - - emake DESTDIR="${D}" install - - cd "${S}"/docs - dodoc changes.txt readme.txt - newdoc base/readme.txt base_readme.txt - newdoc gtk/readme.txt gtk_readme.txt - - if use doc; then - dohtml -r "${S}"/docs/doxygen/out/html/* - fi - - # Stray windows locale file, causes collisions - local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" - [[ -e ${wxmsw} ]] && rm "${wxmsw}" -} - -pkg_postinst() { - has_version app-eselect/eselect-wxwidgets \ - && eselect wxwidgets update -} - -pkg_postrm() { - has_version app-eselect/eselect-wxwidgets \ - && eselect wxwidgets update -} |