From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1670583-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE87E158083 for <garchives@archives.gentoo.org>; Sat, 14 Sep 2024 11:23:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16EB0E29A6; Sat, 14 Sep 2024 11:23:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0936E29A6 for <gentoo-commits@lists.gentoo.org>; Sat, 14 Sep 2024 11:23:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2894433EB78 for <gentoo-commits@lists.gentoo.org>; Sat, 14 Sep 2024 11:23:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 839BD1F40 for <gentoo-commits@lists.gentoo.org>; Sat, 14 Sep 2024 11:23:00 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1726312954.8bfa202e8b74643eeffec23c9c6ddc602254da2f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/simage/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/simage/simage-9999.ebuild X-VCS-Directories: media-libs/simage/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8bfa202e8b74643eeffec23c9c6ddc602254da2f X-VCS-Branch: master Date: Sat, 14 Sep 2024 11:23:00 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 67a31c07-22ee-4e13-83b3-cec205bee6ce X-Archives-Hash: 485430ffb3667daec7dc721256c783d0 commit: 8bfa202e8b74643eeffec23c9c6ddc602254da2f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Aug 31 18:25:35 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Sep 14 11:22:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfa202e media-libs/simage: Drop IUSE qt5 at least from 9999 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/simage/simage-9999.ebuild | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/media-libs/simage/simage-9999.ebuild b/media-libs/simage/simage-9999.ebuild index 484683446336..fce11a8bd619 100644 --- a/media-libs/simage/simage-9999.ebuild +++ b/media-libs/simage/simage-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,21 +19,14 @@ fi LICENSE="BSD-1" SLOT="0" -IUSE="gif jpeg png qt5 qt6 sndfile test tiff vorbis zlib" -REQUIRED_USE="qt5? ( !qt6 )" +IUSE="gif jpeg png qt6 sndfile test tiff vorbis zlib" RESTRICT="!test? ( test )" RDEPEND=" gif? ( media-libs/giflib:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - ) - qt6? ( - dev-qt/qtbase:6[gui] - ) + qt6? ( dev-qt/qtbase:6[gui] ) sndfile? ( media-libs/libsndfile media-libs/flac:= @@ -60,12 +53,6 @@ PATCHES=( DOCS=(AUTHORS ChangeLog NEWS README) src_configure() { - local use_qt - if use qt5 || use qt6 ; then - use_qt=ON - else - use_qt=OFF - fi local mycmakeargs=( -DSIMAGE_BUILD_SHARED_LIBS=ON -DSIMAGE_BUILD_EXAMPLES=OFF @@ -75,8 +62,9 @@ src_configure() { -DSIMAGE_USE_GDIPLUS=OFF # Windows -DSIMAGE_USE_CGIMAGE=OFF # OS X only -DSIMAGE_USE_QUICKTIME=OFF # OS X only - -DSIMAGE_USE_QIMAGE=${use_qt} - -DSIMAGE_USE_QT5=$(usex qt5) + -DSIMAGE_USE_QIMAGE=$(usex qt6) + -DSIMAGE_USE_QT4=OFF + -DSIMAGE_USE_QT5=OFF -DSIMAGE_USE_QT6=$(usex qt6) -DSIMAGE_USE_CPACK=OFF -DSIMAGE_USE_STATIC_LIBS=OFF