commit: a19934e9aa53eb87a6fc9d48bf86203e7d7bd29b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 05:18:11 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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}
