From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 0C3B2158030 for ; Thu, 2 Mar 2023 14:10:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C290E07DB; Thu, 2 Mar 2023 14:10:21 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 32E07E07DB for ; Thu, 2 Mar 2023 14:10:21 +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 329CD33BEBE for ; Thu, 2 Mar 2023 14:10:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D0AB807 for ; Thu, 2 Mar 2023 14:10:18 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1677766123.71c8bc0770a49db8767a7e42fe0892b25607648c.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/p7zip/p7zip-17.05.ebuild X-VCS-Directories: app-arch/p7zip/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 71c8bc0770a49db8767a7e42fe0892b25607648c X-VCS-Branch: master Date: Thu, 2 Mar 2023 14:10:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2926155c-de98-4298-b666-a76005ee3e6d X-Archives-Hash: 3c17ea57c160f1989c68981c0497a530 commit: 71c8bc0770a49db8767a7e42fe0892b25607648c Author: Matthew Thode gentoo org> AuthorDate: Thu Mar 2 14:08:43 2023 +0000 Commit: Matthew Thode gentoo org> CommitDate: Thu Mar 2 14:08:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c8bc07 app-arch/p7zip: remove gui support only cli is currently supported Bug: https://bugs.gentoo.org/898650 Signed-off-by: Matthew Thode gentoo.org> app-arch/p7zip/p7zip-17.05.ebuild | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/app-arch/p7zip/p7zip-17.05.ebuild b/app-arch/p7zip/p7zip-17.05.ebuild index dc0b336a3d08..0d5e544d4797 100644 --- a/app-arch/p7zip/p7zip-17.05.ebuild +++ b/app-arch/p7zip/p7zip-17.05.ebuild @@ -4,7 +4,7 @@ EAPI=7 WX_GTK_VER="3.0-gtk3" -inherit multilib toolchain-funcs wrapper wxwidgets xdg +inherit multilib toolchain-funcs wrapper xdg DESCRIPTION="Port of 7-Zip archiver for Unix" HOMEPAGE="https://github.com/p7zip-project/p7zip" @@ -14,10 +14,8 @@ SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="LGPL-2.1 rar? ( unRAR )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris" -IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets" -REQUIRED_USE="kde? ( wxwidgets )" +IUSE="abi_x86_x32 doc +pch rar static" -RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" DEPEND="${RDEPEND}" BDEPEND=" abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) @@ -75,19 +73,10 @@ src_prepare() { if use static; then sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die fi - - if use kde || use wxwidgets; then - setup-wxwidgets unicode - einfo "Preparing dependency list" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" depend - fi } src_compile() { emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all3 - if use kde || use wxwidgets; then - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -- 7zG - fi } src_test() { @@ -100,26 +89,6 @@ src_install() { make_wrapper 7za /usr/$(get_libdir)/p7zip/7za make_wrapper 7z /usr/$(get_libdir)/p7zip/7z - if use kde || use wxwidgets; then - make_wrapper 7zG /usr/$(get_libdir)/p7zip/7zG - - dobin GUI/p7zipForFilemanager - exeinto /usr/$(get_libdir)/p7zip - doexe bin/7zG - - insinto /usr/$(get_libdir)/p7zip - doins -r GUI/Lang - - insinto /usr/share/icons/hicolor/16x16/apps/ - newins GUI/p7zip_16_ok.png p7zip.png - - if use kde; then - rm GUI/kde4/p7zip_compress.desktop || die - insinto /usr/share/kservices5/ServiceMenus - doins GUI/kde4/*.desktop - fi - fi - dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1