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 1FEE6138359 for ; Tue, 10 Nov 2020 05:18:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22623E0821; Tue, 10 Nov 2020 05:18:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 AFAF2E0821 for ; Tue, 10 Nov 2020 05:18:25 +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 CF00D340CD6 for ; Tue, 10 Nov 2020 05:18:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E506F43D for ; Tue, 10 Nov 2020 05:18:20 +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: <1604985497.a19934e9aa53eb87a6fc9d48bf86203e7d7bd29b.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.18.0-r1.ebuild app-text/mupdf/mupdf-1.18.0-r2.ebuild X-VCS-Directories: app-text/mupdf/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a19934e9aa53eb87a6fc9d48bf86203e7d7bd29b X-VCS-Branch: master Date: Tue, 10 Nov 2020 05:18:20 +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: 1bcb8e15-b70d-42b9-ae1e-c3f3fa2f86cb X-Archives-Hash: 7c5f63a8af8471fc0764343bb66e5449 commit: a19934e9aa53eb87a6fc9d48bf86203e7d7bd29b Author: Sam James gentoo org> AuthorDate: Tue Nov 10 05:18:11 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 10 05:18:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19934e9 app-text/mupdf: drop static-libs; conditional mujs Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> ...pdf-1.18.0-r1.ebuild => mupdf-1.18.0-r2.ebuild} | 35 ++++++++-------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/app-text/mupdf/mupdf-1.18.0-r1.ebuild b/app-text/mupdf/mupdf-1.18.0-r2.ebuild similarity index 84% rename from app-text/mupdf/mupdf-1.18.0-r1.ebuild rename to app-text/mupdf/mupdf-1.18.0-r2.ebuild index 8cf09e0b061..7c2796e99eb 100644 --- a/app-text/mupdf/mupdf-1.18.0-r1.ebuild +++ b/app-text/mupdf/mupdf-1.18.0-r2.ebuild @@ -13,34 +13,32 @@ S="${WORKDIR}/${P}-source" LICENSE="AGPL-3" SLOT="0/${PV}" KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86" -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?] dev-libs/gumbo - 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?] - opengl? ( >=media-libs/freeglut-3.0.0:= ) + media-libs/freetype:2= + media-libs/harfbuzz:=[truetype] + media-libs/jbig2dec:= + media-libs/libpng:0= + >=media-libs/openjpeg-2.1:2= + virtual/jpeg + javascript? ( >=dev-lang/mujs-1.0.7:= ) + opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( - libressl? ( >=dev-libs/libressl-3.1.4:0=[static-libs?] ) - !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) + libressl? ( >=dev-libs/libressl-3.1.4: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.18-Makefile.patch @@ -78,7 +76,6 @@ src_prepare() { _emake() { # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. - # Bundled libs # * General # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's @@ -102,7 +99,6 @@ _emake() { # # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9 # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt - emake \ GENTOO_PV=${PV} \ HAVE_GLUT=$(usex opengl) \ @@ -117,9 +113,6 @@ _emake() { src_compile() { _emake XCFLAGS="-fpic" - - use static-libs && \ - _emake build/debug/lib${PN}.a } src_install() { @@ -134,8 +127,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}