From ac0493722b8ca5c8b1a8b7f00fab0733c0e0cc5a Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 2 Feb 2015 16:26:44 +0000 Subject: [PATCH] x11-libs/wxGTK: 3.0.2.0-r1 (bug #536004) Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x401A1600 --- x11-libs/wxGTK/ChangeLog | 9 +- x11-libs/wxGTK/Manifest | 9 +- x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild | 174 +++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 6 deletions(-) create mode 100644 x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index c7b983c6aab0..0ac1d5b3abf4 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/wxGTK -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.316 2014/12/31 17:37:49 floppym Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.317 2015/02/02 16:26:17 sping Exp $ + +*wxGTK-3.0.2.0-r1 (02 Feb 2015) + + 02 Feb 2015; Sebastian Pipping +wxGTK-3.0.2.0-r1.ebuild: + Stop 3.0.2 from pretending to be 3.0.1 (bug #536004) *wxGTK-3.0.2.0 (31 Dec 2014) diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 59f30b1d72b2..0cba1f6f300c 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -22,13 +22,14 @@ EBUILD wxGTK-2.8.12.1-r1.ebuild 4283 SHA256 a49d689c730ed51e3d63ca2725942a48fe9b EBUILD wxGTK-2.9.4.1-r1.ebuild 4429 SHA256 273c5ecd1b39f848dc92d8a31ab6e0a4426de8d04d1252feb0c1bc67a876333d SHA512 034f9b9054daed770e0e749f88f16faeb53c378e1dd989daaebacfb7b6f8da5f2d7ebc19105f49ec5ade803b8b8d2685e9da51813ea84f740f9f0138f4d595ca WHIRLPOOL 98a45e0c80b1bf5fddc2109d7bccdbff1012ecb9fdc58fdebdddff3385958f51679fc6439801ded6f9cc1cfb09809629765aa5a71c27667549d6b76cb9a20f3f EBUILD wxGTK-3.0.0.0.ebuild 4053 SHA256 4a8505666e109f4a2122870022977c556540a6cc88d9e08d13fe83747f443ca5 SHA512 574e0d41210a346bd576b55e04009ed2b2931b60f82950dff6ab83603b459d23e5cc2dc74c591f44e59e51f565ebc5a9a637b4cb003550587f8b42c75845e65c WHIRLPOOL a6e3fa63abcce49ea1415ca99527e5a30ea7531d228eb387592f78273cbf19cceedc8afbcedf4cbab4572b4beaed1329a0ff75db80ef2be8bed370b7760c7b01 EBUILD wxGTK-3.0.1.1.ebuild 4061 SHA256 cf2c823b180178390c177da563d7aae9c1f545a75250f9991d8cc23fb5d3bc50 SHA512 cd6b0a10670e7ee0f3b408b02b4aa02d78cdc882803cc5f6d4b8c8586705a199298c987c1997dc40b01db0ed9074c6952c66c60e229d708d28a3f9d9aa8a44aa WHIRLPOOL 08e17a4ca619d14e2aa3581452d4e3488bab1b694ff8817e862c1c2f96dcfe575b828dab6eeb0e5570683839b9fa6a2303e49c2616403d619c623fce6b1ce4fe +EBUILD wxGTK-3.0.2.0-r1.ebuild 4188 SHA256 64c9d79fc6df665c54daf4f5bc5a8f3c28bd04aad484ee48151c28730d3476d5 SHA512 819885b1037ea5a8783b6c92279892b87b779353f51ab3c781e588cae925c07a5402a8e690960798f47b891daf2bafec29f599bdbee602714b408fdb3990d0eb WHIRLPOOL 9c6227c6f30f9311b23ca685bb7f982a8e2a5b3d65f7a7e5ab2a992d6ea7d7647418fc05877b450af57791a82f7e264308213c63fab5eff87d88eed10e867ed4 EBUILD wxGTK-3.0.2.0.ebuild 4064 SHA256 d4b5be9ab74cb14918cdce71f1ea8d0fd8b203eff82d9368dcec1b3ef320152c SHA512 4d07ac375a714fcb9069bd983d90c33e51f3dff0936280a978b0c0aa8a92dfcc47fb5a0c74632b2377b306d52a6a654c41406df8b825597e9a43e1dedd333afc WHIRLPOOL fc8d21b5269b30a997446a9f3843fa388ef383e766c41bb307eae75c0462fd3d7f6448467c84ae6c1e26324e4daae21aa1e72a3f62d70a87362ceb3bc6513d67 -MISC ChangeLog 49585 SHA256 b1a6c166496e4b2ff51a3989a8e74b897e79f60c08f38b6a7f0ee292338ffa4e SHA512 3a11a9407ef13f9a7971db0bac13ea946b7b1e7dd196a67430f9a6d2de90e5b60f4332a91049beec0888ebfb08d1ad51078369a4bf953e9aa33ae938c2bef504 WHIRLPOOL b647befe2849befd9d2c0d3b12e7034fc0736b25e86d69a9b6a96b103c672e1b13df1c52416ebd9f82afbb566385e89bce071636336bc061f458d03cb5ef4aa3 +MISC ChangeLog 49750 SHA256 f8ac59357d0358577a57cfd9a23e58a6746365e10c2536497ab806179d5f8f82 SHA512 4ea11507cea516e211db767819bc80821c87f3bc3431d3c00eb01b945e34358e22d92dd7bcbc28403bab2d2f7c121b35d6fe7bfe8c51fcd0525e0c610215ef48 WHIRLPOOL 0a9464f13438a80f9b4601a200d98934ddcfa2b7d4de537b6356335a9e02de40f22400a3657b2c2b14cab28870cde5ae480ff00480120a736ee669721ee88d7f MISC metadata.xml 670 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 SHA512 37ec56d00b488857a285a61c894f8c28dde61efce48d79b7767a207f5c533ad01f2ef09ebecc98dd5b803b4545e1d7f513ffb48e5ead4818ecb607129339c907 WHIRLPOOL cbcc9d2aea988f0b8e1a0615918903cf332976b192156296051c9f5ac5563e9ab512376453a52ad02db0fe3465b9b30d88d6808e38bea52bb58abe6fed316586 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlSkNG8ACgkQC77qH+pIQ6TEiAD+MGA01yqjwSp9MTj1+/6k3xUc -HYZG2OOJZYBVLEQ+V5YBAKU3rl77sFRyX3SZX1U7Xr3CqDig+t3lX8wsH52Qzk/h -=YZjE +iEYEAREIAAYFAlTPpUEACgkQsAvGakAaFgCvxACeJcGxTDQocHF8K+SO03oRaKRI +WwIAnjqieJsvRU8xb9m7n+I3Sqbk166w +=P7H1 -----END PGP SIGNATURE----- diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild new file mode 100644 index 000000000000..acc941ab16e4 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild,v 1.1 2015/02/02 16:26:17 sping Exp $ + +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-${PV}.tar.bz2 + doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" + +SLOT="3.0" + +RDEPEND=" + dev-libs/expat + sdl? ( media-libs/libsdl ) + X? ( + >=dev-libs/glib-2.22:2 + media-libs/libpng:0= + sys-libs/zlib + virtual/jpeg + >=x11-libs/gtk+-2.18:2 + x11-libs/gdk-pixbuf + x11-libs/libSM + x11-libs/libXxf86vm + x11-libs/pango[X] + gstreamer? ( + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 ) + libnotify? ( x11-libs/libnotify ) + opengl? ( virtual/opengl ) + tiff? ( media-libs/tiff:0 ) + webkit? ( net-libs/webkit-gtk:2 ) + ) + aqua? ( + >=x11-libs/gtk+-2.4[aqua=] + virtual/jpeg + tiff? ( media-libs/tiff:0 ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + opengl? ( virtual/glu ) + X? ( + x11-proto/xproto + x11-proto/xineramaproto + x11-proto/xf86vidmodeproto + )" + +PDEPEND=">=app-admin/eselect-wxwidgets-20131230" + +LICENSE="wxWinLL-3 + GPL-2 + doc? ( wxWinFDL-3 )" + +S="${WORKDIR}/wxPython-src-${PV}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch + + # https://bugs.gentoo.org/421851 + # https://bugs.gentoo.org/499984 + # https://bugs.gentoo.org/536004 + sed \ + -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \ + -e 's:3\.0\.1:3.0.2:g' \ + -e 's:^wx_release_number=1$:wx_release_number=2:' \ + -i configure || die + + epatch_user +} + +src_configure() { + local myconf + + # X independent options + myconf=" + --with-zlib=sys + --with-expat=sys + --enable-compat28 + $(use_with sdl)" + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # http://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 + --with-gtkprint + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(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 +} + +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-admin/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version app-admin/eselect-wxwidgets \ + && eselect wxwidgets update +} -- 2.26.2