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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 85E001382C5 for ; Sat, 9 Jan 2021 03:19:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9ECE2E082F; Sat, 9 Jan 2021 03:19:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23702E082F for ; Sat, 9 Jan 2021 03:19:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8B793410A9 for ; Sat, 9 Jan 2021 03:19:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80343C3 for ; Sat, 9 Jan 2021 03:19:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1610162382.29e431ff23fb34cd62855bb2e7362fe065d8eadc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/mupdf/mupdf-1.17.0.ebuild X-VCS-Directories: app-text/mupdf/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 29e431ff23fb34cd62855bb2e7362fe065d8eadc X-VCS-Branch: master Date: Sat, 9 Jan 2021 03:19:45 +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: 293490d6-668f-47b7-99f4-62ad414fc201 X-Archives-Hash: f5694a31c1a5650a7069881ee1f180cf commit: 29e431ff23fb34cd62855bb2e7362fe065d8eadc Author: Sam James gentoo org> AuthorDate: Sat Jan 9 03:19:29 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 9 03:19:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e431ff app-text/mupdf: drop static-libs from 1.17 too This is blocking removal of static-libs from X. Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.17.0.ebuild | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild b/app-text/mupdf/mupdf-1.17.0.ebuild index 7841103a97a..01332031c1e 100644 --- a/app-text/mupdf/mupdf-1.17.0.ebuild +++ b/app-text/mupdf/mupdf-1.17.0.ebuild @@ -13,33 +13,32 @@ S="${WORKDIR}/${P}-source" LICENSE="AGPL-3" SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos" -IUSE="X +javascript libressl opengl ssl static-libs" +IUSE="X +javascript libressl opengl ssl" # Although we use the bundled, patched version of freeglut in mupdf (because of # bug #653298), the best way to ensure that its dependencies are present is to # install system's freeglut. BDEPEND="virtual/pkgconfig" RDEPEND=" - >=dev-lang/mujs-1.0.7:=[static-libs?] - media-libs/freetype:2=[static-libs?] - media-libs/harfbuzz:=[static-libs?,truetype] - media-libs/jbig2dec:=[static-libs?] - media-libs/libpng:0=[static-libs?] - >=media-libs/openjpeg-2.1:2=[static-libs?] - virtual/jpeg[static-libs?] + >=dev-lang/mujs-1.0.7:= + media-libs/freetype:2= + media-libs/harfbuzz:=[truetype] + media-libs/jbig2dec:= + media-libs/libpng:0= + >=media-libs/openjpeg-2.1:2= + virtual/jpeg opengl? ( >=media-libs/freeglut-3.0.0:= ) ssl? ( - libressl? ( >=dev-libs/libressl-3.2.0:0=[static-libs?] ) - !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) + libressl? ( >=dev-libs/libressl-3.2.0:0= ) + !libressl? ( >=dev-libs/openssl-1.1:0= ) ) X? ( - x11-libs/libX11[static-libs?] - x11-libs/libXext[static-libs?] - )" + x11-libs/libX11 + x11-libs/libXext + ) +" DEPEND="${RDEPEND}" -REQUIRED_USE="opengl? ( !static-libs )" - PATCHES=( "${FILESDIR}"/${PN}-1.15-CFLAGS.patch "${FILESDIR}"/${PN}-1.15-Makefile.patch @@ -113,9 +112,6 @@ _emake() { src_compile() { _emake XCFLAGS="-fpic" - - use static-libs && \ - _emake build/debug/lib${PN}.a } src_install() { @@ -130,8 +126,6 @@ src_install() { dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so - use static-libs && \ - dolib.a build/debug/lib${PN}.a if use opengl ; then einfo "mupdf symlink points to mupdf-gl (bug 616654)" dosym ${PN}-gl /usr/bin/${PN}