gentoo auto-resync : 10:07:2022 - 01:26:11

2 files changed, 42 insertions, 47 deletions

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 0377ea1e3985..6ec61044f7f8 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -7,7 +7,7 @@ DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
 DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651e652b127ad9d548a00a498f06a4d4f868dc3bc33411ded2602c04c8329e927550d032bdbe633c2c7d1a7f89265874685d3cb3d9b SHA512 f839e67660f2b08aa28d1596a3b7af2c35f7c2c0505c6e6d45888845397212b3dd71c8d34115321e9a4347b9d92a0ce767bb76defd14c172e51c2a3df96cc3ac
 DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d
-EBUILD wxGTK-3.0.4-r2.ebuild 3607 BLAKE2B 83963b67bbfb51328ac4c2713620a043b73f761218d2815e9c3c40e351ffeec67136ffd878406ebcef7901a90a42d53772070a4ad3baa9b31ba01f2ed4c8bdc8 SHA512 b28ca15b70efd4893a9e3c238bb9c8dc470a6266ff0c813668f26103804aa07cec1aee4508536f9f0ac79c1eab037ffa4f11f2ba1aaf11b51ab1c971f0b73f36
+EBUILD wxGTK-3.0.4-r3.ebuild 3533 BLAKE2B 50e1a0c8e924bdd7ca33ce04b4801ba307126b2222417fbce268410716cfeab830cd5efe15bdb8b61c4f5e89e0eb84ce819323d776a87d2d7d5577cca404b5c7 SHA512 8eecb7934630c5990f92cccc60cfbc3397ad130cbe308a1f3d8adf54c2c7a2fbddcf1a65a27104e04b6e65027b9e5aaeec000767d9439ed667436c3afb7e5edf
 EBUILD wxGTK-3.0.4-r302.ebuild 4824 BLAKE2B bc5a1a4266fe8dad373ed7efc86ed6b4df84e119047146b2aceb2ddd085399184ff38b9bdf7adf1b1543f907db56d210a271e67d8ba025331802d453ae603207 SHA512 9d3c39b3a9c5350eb75f35822898f29f1e7941bb449ec8e1221edfd75a4c51bfd4649128163827c3ba76b1c23eba03444e00e45f519d4929fc6b417897d7e6bf
 EBUILD wxGTK-3.0.4-r303.ebuild 4970 BLAKE2B e0494ec1cf4ea602048cc4d344efe7fc55f17dc9d35845f1629700e155c0483d47f04f5b908a3fa1e269a55390a356c2d2697924fb72edf5742f4c0525fe403d SHA512 9e4fb18d9f6aa3f5123a9e988fe9957845779961764e29360e76909559f14ff8a4bcd6d022a9ba38a074c26c5707a72c78993e9323decd97bdbbd94fa5a5ef0b
 EBUILD wxGTK-3.0.5.1.ebuild 4992 BLAKE2B 9a854f361c2969dae991050de21a4086ca28d63e9c0c9f6d5bc3c6a05929f299fe4e70515c2521d9fbf5887b30ede38c363854cc820a44930656b7cc4bc452f3 SHA512 9867d2a4a2a5a2fad1bfddde166ceb092619eccef75d31194add4373efddff88ac7addfdfd19b8fae4ec5d60f0b35be3a7e11cd4ed51bf1080dd1890cc99b619
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r3.ebuild
index ce1c918692a7..990923e26230 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r3.ebuild
@@ -1,52 +1,51 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit multilib-minimal
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
+SRC_URI="
+	https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
+S="${WORKDIR}/wxWidgets-${PV}"
 
+LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
+SLOT="3.0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X doc debug gstreamer libnotify opengl sdl tiff"
 
-SLOT="3.0"
-
 RDEPEND="
 	dev-libs/expat[${MULTILIB_USEDEP}]
 	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
+		media-libs/libpng:=[${MULTILIB_USEDEP}]
 		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+: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:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
+			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		)
 		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
 		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
 		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	)"
+DEPEND="
+	${RDEPEND}
 	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
 	X? ( x11-base/xorg-proto )"
-
+BDEPEND="virtual/pkgconfig"
 PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
 
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
 PATCHES=(
 	"${WORKDIR}"/wxGTK-3.0.4_p20190713/
 	"${FILESDIR}"/${PN}-3.0.5-collision.patch
@@ -54,14 +53,13 @@ PATCHES=(
 )
 
 multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
+	local myconf=(
+		# X independent options
+		--with-zlib=sys
+		--with-expat=sys
+		--enable-compat28
+		$(use_with sdl)
+	)
 
 	# debug in >=2.9
 	# there is no longer separate debug libraries (gtk2ud)
@@ -70,17 +68,16 @@ multilib_src_configure() {
 	# 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"
+	use debug && myconf+=( --enable-debug=max )
 
 	# wxGTK options
 	#   --enable-graphics_ctx - needed for webkit, editra
 	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
+	if use X; then
+		myconf+=(
+			--enable-gui
 			--enable-graphics_ctx
 			--with-gtkprint
-			--enable-gui
 			--with-libpng=sys
 			--with-libxpm=sys
 			--with-libjpeg=sys
@@ -89,37 +86,35 @@ multilib_src_configure() {
 			$(use_enable gstreamer mediactrl)
 			$(use_with libnotify)
 			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	# wxBase options
-	if use !X ; then
-		myconf="${myconf}
-			--disable-gui"
+			$(use_with tiff libtiff sys)
+		)
+	else
+		# wxBase options
+		myconf+=( --disable-gui )
 	fi
 
-	ECONF_SOURCE="${S}" econf ${myconf}
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install_all() {
-	cd "${S}"/docs || die
+	cd docs || die
 	dodoc changes.txt readme.txt
 	newdoc base/readme.txt base_readme.txt
 	newdoc gtk/readme.txt gtk_readme.txt
 
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
+	use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. )
 	einstalldocs
 
 	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+	rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo || die
 }
 
 pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
+	has_version app-eselect/eselect-wxwidgets &&
+		eselect wxwidgets update
 }
 
 pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
+	has_version app-eselect/eselect-wxwidgets &&
+		eselect wxwidgets update
 }