From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2018 19:58:07 +0000 Subject: gentoo resync : 24.02.2018 --- x11-libs/wxGTK/Manifest | 4 +- x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild | 165 --------------------------------- x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild | 161 ++++++++++++++++++++++++++++++++ x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild | 2 +- 4 files changed, 164 insertions(+), 168 deletions(-) delete mode 100644 x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild create mode 100644 x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild (limited to 'x11-libs/wxGTK') diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 6008e704e019..57ff24bba2bb 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -18,7 +18,7 @@ DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aa DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1 EBUILD wxGTK-2.8.12.1-r2.ebuild 4790 BLAKE2B 556048e9d98cf57dbbf2cf5097101e1640576a0df596e296f0e500d672b417ab530f37469e8bd5cb8c656fe902c572ee4998782bd6a7b8dfd735f87d2f85e681 SHA512 688c1121691fcfd701f6b396aff2425e8aac5eaa644cf1e8d216145b975fb7edef709eae4e9ef0e847f1c3c189685b75f86791487dd4ac71edca579a49f896ee -EBUILD wxGTK-3.0.2.0-r3.ebuild 4539 BLAKE2B 2ec974f3cc0b2e4426030ca1a16564e2c9e215ce5f2479180fe88b4e04a91c4cbbe91c789e21ae738139554a482c4c45801ac63fa598d319bab09b549e091928 SHA512 442db7de10d3d4b069ef19485cb882966c0b20f7da41f36cf00a054b74214f81b04915fcf637190458a91e00b22acc0d33114dc40dad557ce856962e41cd5204 -EBUILD wxGTK-3.0.3-r300.ebuild 5176 BLAKE2B 80083420300535ba88704b9c25271931de3ce9da76ac40db0aae31cafccf5794fb737e10bb1ebd0f4a443d73a0cfbc510228d056ffc367ac8d9872beae59d870 SHA512 bc531ed938cc83bbd6ec1fcd30b71991f718cafdc6e6701ce9fa8b32e5f937feac8dbf1092fc87b3b41112ddb9fae5b7ba7dd95cb88b5df9f5da89588387fd80 +EBUILD wxGTK-3.0.2.0-r4.ebuild 4207 BLAKE2B d1e31b2efdb825a38f49f21c2f146f73ae2f5fd00cd6dd688a84a2d6b76dcf9180d6eca26ce852faba79a0093b8df6d9e605daec8850273fbcfcddba3f011246 SHA512 4fe3a3b228b345d0e90981af6f37f8d3ded479cd811f14a5e06ff4e1ba6f458926ca8b64983a61a7a7e29c34bbe37b0f50f256548c4b5c37ae6a175d1af8cde8 +EBUILD wxGTK-3.0.3-r300.ebuild 5172 BLAKE2B 001d07bebf5f31143f78f1424f46ee936bad83ec22c18cba6f32f57151ec4834dd120824f724b7d395514f0275cbbc0926c2273239ac7a33288f7ae2ce709995 SHA512 411764eb989a09185de0dbf994cddb5ab9423b4bde2117b7e96aa679c21ad63ad8f6e18a1d897758679673a6c6957e3014da09f4dfd45412732402bda23aa471 EBUILD wxGTK-3.0.3.ebuild 4098 BLAKE2B 9751d264684c71af4570f2d2e63b5315a742783b932e1309982e78c29ead4bfa6b2cca8aad966c30f2994c3ee5a8b309874704bdb70cb6b1e81ec9a6fd78024c SHA512 ee3b41aa5d4a91961e6f9b184653b5ff5402e032e2ba87cfde6b21942fe8fdd85954e0c4b7b265c9e1dc4e0ead21486abbee23aede30555e6f613d95f196ec49 MISC metadata.xml 856 BLAKE2B 9f03dc05155eba5aee9ca7233d96dc7d0929df2a016dce4131b3b639358eea8ebbecfb5e7f59e7382f5467259885c14bcdc3df416a678f213cd58cd3096b4252 SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild deleted file mode 100644 index 194ded56acc6..000000000000 --- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit autotools eutils multilib-minimal - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" -HOMEPAGE="https://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 ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~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[${MULTILIB_USEDEP}] - sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) - X? ( - >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}] - gstreamer? ( - media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] ) - libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) - opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - webkit? ( net-libs/webkit-gtk:2 ) - ) - aqua? ( - x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}] - opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) - X? ( - x11-proto/xproto[${MULTILIB_USEDEP}] - x11-proto/xineramaproto[${MULTILIB_USEDEP}] - x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] - )" - -PDEPEND=">=app-eselect/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 - epatch "${FILESDIR}"/${P}-webview-fixes.patch - epatch "${FILESDIR}"/${P}-gcc6.patch - epatch_user - - for f in $(find "${S}" -name configure.in); do - mv "${f}" "${f/in/ac}" || die - done - AT_M4DIR="${S}/build/aclocal" eautoreconf - - # https://bugs.gentoo.org/536004 - sed \ - -e 's:3\.0\.1:3.0.2:g' \ - -e 's:^wx_release_number=1$:wx_release_number=2:' \ - -i "${S}"/configure || die - -} - -multilib_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 - # 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 - --with-gtkprint - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --without-gnomevfs - $(use_enable gstreamer mediactrl) - $(multilib_native_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 - - ECONF_SOURCE="${S}" econf ${myconf} -} - -multilib_src_install_all() { - cd "${S}"/docs || die - dodoc changes.txt readme.txt - newdoc base/readme.txt base_readme.txt - newdoc gtk/readme.txt gtk_readme.txt - - if use doc; then - dodoc -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 -} diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild new file mode 100644 index 000000000000..e9f06730d38e --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit autotools eutils multilib-minimal + +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="https://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="arm" +IUSE="+X aqua doc debug libnotify opengl sdl tiff" + +SLOT="3.0" + +RDEPEND=" + dev-libs/expat[${MULTILIB_USEDEP}] + sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) + X? ( + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/jpeg:0=[${MULTILIB_USEDEP}] + >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + x11-libs/pango[${MULTILIB_USEDEP}] + libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) + opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + ) + aqua? ( + x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] + virtual/jpeg:0=[${MULTILIB_USEDEP}] + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig[${MULTILIB_USEDEP}] + opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) + X? ( + x11-proto/xproto[${MULTILIB_USEDEP}] + x11-proto/xineramaproto[${MULTILIB_USEDEP}] + x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] + )" + +PDEPEND=">=app-eselect/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 + epatch "${FILESDIR}"/${P}-webview-fixes.patch + epatch "${FILESDIR}"/${P}-gcc6.patch + epatch_user + + for f in $(find "${S}" -name configure.in); do + mv "${f}" "${f/in/ac}" || die + done + AT_M4DIR="${S}/build/aclocal" eautoreconf + + # https://bugs.gentoo.org/536004 + sed \ + -e 's:3\.0\.1:3.0.2:g' \ + -e 's:^wx_release_number=1$:wx_release_number=2:' \ + -i "${S}"/configure || die + +} + +multilib_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 + # 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 + --with-gtkprint + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --without-gnomevfs + --disable-webview + --disable-mediactrl + $(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 + + ECONF_SOURCE="${S}" econf ${myconf} +} + +multilib_src_install_all() { + cd "${S}"/docs || die + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + if use doc; then + dodoc -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 +} diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild index 24f12cd85a90..b55dd0fc58c9 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +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 gstreamer libnotify opengl sdl tiff webkit" WXSUBVERSION=${PV}.0-gtk3 # 3.0.3.0-gtk3 -- cgit v1.2.3