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 4C479138359 for ; Tue, 3 Nov 2020 04:07:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61966E0AA3; Tue, 3 Nov 2020 04:07:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 12CEBE0AA3 for ; Tue, 3 Nov 2020 04:07:00 +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 AADE833BEB9 for ; Tue, 3 Nov 2020 04:06:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 395353B2 for ; Tue, 3 Nov 2020 04:06:58 +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: <1604376407.25455c2f11c5722c2e68e37e0a100bb99eb4996e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/mupdf/Manifest app-text/mupdf/mupdf-1.16.1.ebuild X-VCS-Directories: app-text/mupdf/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 25455c2f11c5722c2e68e37e0a100bb99eb4996e X-VCS-Branch: master Date: Tue, 3 Nov 2020 04:06:58 +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: cc3ceff6-4163-4dba-b885-dcfad0fd7cf3 X-Archives-Hash: e4e950ad5b845f64ba3586b72d57fc05 commit: 25455c2f11c5722c2e68e37e0a100bb99eb4996e Author: Sam James gentoo org> AuthorDate: Tue Nov 3 04:06:47 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 3 04:06:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25455c2f app-text/mupdf: cleanup old Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> app-text/mupdf/Manifest | 1 - app-text/mupdf/mupdf-1.16.1.ebuild | 128 ------------------------------------- 2 files changed, 129 deletions(-) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 7c07b736ec9..e0a595dc861 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,3 +1,2 @@ -DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50 DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9 SHA512 39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8 diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.16.1.ebuild deleted file mode 100644 index a073710586e..00000000000 --- a/app-text/mupdf/mupdf-1.16.1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs xdg desktop - -DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C" -HOMEPAGE="https://mupdf.com/" -SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz" - -LICENSE="AGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="X +javascript libressl opengl ssl static-libs" - -# 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. -RDEPEND=" - 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:= ) - ssl? ( - libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] ) - !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) - ) - X? ( - x11-libs/libX11[static-libs?] - x11-libs/libXext[static-libs?] - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="opengl? ( !static-libs )" - -S=${WORKDIR}/${P}-source - -PATCHES=( - "${FILESDIR}"/${PN}-1.15-CFLAGS.patch - "${FILESDIR}"/${PN}-1.15-Makefile.patch - "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch - # See bugs #662352 - "${FILESDIR}"/${PN}-1.15-openssl-x11.patch - "${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch -) - -src_prepare() { - xdg_src_prepare - use hppa && append-cflags -ffunction-sections - - use javascript || \ - sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \ - -i include/mupdf/fitz/config.h - - # See bug #670832 - use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch - - sed -e "1iOS = Linux" \ - -e "1iCC = $(tc-getCC)" \ - -e "1iLD = $(tc-getLD)" \ - -e "1iAR = $(tc-getAR)" \ - -e "1iverbose = yes" \ - -e "1ibuild = debug" \ - -e "1iprefix = ${ED}/usr" \ - -e "1ilibdir = ${ED}/usr/$(get_libdir)" \ - -e "1idocdir = ${ED}/usr/share/doc/${PF}" \ - -i Makerules || die -} - -_emake() { - # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. - - # We don't use system's freeglut because upstream has a special modified - # version of it that gives mupdf clipboard support. See bug #653298 - - # As of v1.15.0, mupdf started using symbols in mujs that were not part - # of any release. We thus go back to using the bundled version of it. - # Bug #685244 - emake \ - GENTOO_PV=${PV} \ - HAVE_GLUT=$(usex opengl) \ - HAVE_LIBCRYPTO=$(usex ssl) \ - HAVE_X11=$(usex X) \ - USE_SYSTEM_LIBS=yes \ - USE_SYSTEM_MUJS=no \ - USE_SYSTEM_GLUT=no \ - HAVE_OBJCOPY=no \ - "$@" -} - -src_compile() { - _emake XCFLAGS="-fpic" - - use static-libs && \ - _emake build/debug/lib${PN}.a -} - -src_install() { - if use X || use opengl ; then - domenu platform/debian/${PN}.desktop - doicon platform/debian/${PN}.xpm - else - rm docs/man/${PN}.1 - fi - - _emake 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} - elif use X ; then - einfo "mupdf symlink points to mupdf-x11 (bug 616654)" - dosym ${PN}-x11 /usr/bin/${PN} - fi - insinto /usr/$(get_libdir)/pkgconfig - doins platform/debian/${PN}.pc - - dodoc README CHANGES CONTRIBUTORS -}