gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-text/mupdf: [QA] Fix USE=libressl semantics

Browse Source 
Closes: https://bugs.gentoo.org/683986
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert
2019-04-27 18:35:03 +02:00
parent d3cf1502c0
commit ffc9ba4599
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app-text/mupdf/metadata.xml
View File

@@ -5,7 +5,4 @@
<email>vdupras@gentoo.org</email>
<name>Virgil Dupras</name>
</maintainer>
<use>
<flag name="openssl">Use dev-libs/openssl crypto backend</flag>
</use>
</pkgmetadata>

10
app-text/mupdf/mupdf-1.14.0-r2.ebuild
View File

@@ -12,7 +12,7 @@ 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 curl +javascript libressl opengl +openssl static-libs +vanilla"
IUSE="X curl +javascript libressl opengl +ssl static-libs +vanilla"
RDEPEND="
>=dev-lang/mujs-1.0.4
@@ -23,9 +23,11 @@ RDEPEND="
>=media-libs/openjpeg-2.1:2=[static-libs?]
virtual/jpeg[static-libs?]
curl? ( net-misc/curl[static-libs?] )
!libressl? ( dev-libs/openssl:0=[static-libs?] )
libressl? ( dev-libs/libressl:0=[static-libs?] )
opengl? ( >=media-libs/freeglut-3.0.0:= )
ssl? (
libressl? ( dev-libs/libressl:0=[static-libs?] )
!libressl? ( dev-libs/openssl:0=[static-libs?] )
)
X? (
x11-libs/libX11[static-libs?]
x11-libs/libXext[static-libs?]
@@ -78,7 +80,7 @@ _emake() {
GENTOO_PV=${PV} \
HAVE_GLUT=$(usex opengl yes no) \
WANT_CURL=$(usex curl) \
WANT_OPENSSL=$(usex openssl) \
WANT_OPENSSL=$(usex ssl) \
WANT_X11=$(usex X) \
USE_SYSTEM_LIBS=yes \
USE_SYSTEM_MUJS=yes \

17
app-text/mupdf/mupdf-1.14.0-r3.ebuild
View File

@@ -12,7 +12,7 @@ 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 curl +javascript libressl opengl openssl static-libs +vanilla"
IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
RDEPEND="
>=dev-lang/mujs-1.0.4
@@ -23,9 +23,11 @@ RDEPEND="
>=media-libs/openjpeg-2.1:2=[static-libs?]
virtual/jpeg[static-libs?]
curl? ( net-misc/curl[static-libs?] )
libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
opengl? ( >=media-libs/freeglut-3.0.0:= )
openssl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
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?]
@@ -34,7 +36,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
REQUIRED_USE="
libressl? ( !openssl )
opengl? ( !static-libs )
curl? ( X )"
@@ -62,7 +63,7 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.3-zoom-2.patch
# See bug #670832
use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
sed -e "1iOS = Linux" \
-e "1iCC = $(tc-getCC)" \
@@ -78,15 +79,11 @@ src_prepare() {
_emake() {
# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
local have_libcrypto=no
if use openssl || use libressl ; then
have_libcrypto=yes
fi
emake \
GENTOO_PV=${PV} \
HAVE_GLUT=$(usex opengl) \
HAVE_CURL=$(usex curl) \
HAVE_LIBCRYPTO=$have_libcrypto \
HAVE_LIBCRYPTO=$(usex ssl) \
HAVE_X11=$(usex X) \
USE_SYSTEM_LIBS=yes \
USE_SYSTEM_MUJS=yes \