[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/

[Julian Ospald]

commit:     5489e6ac4ff415e800f03d7b624d91f5d16cb8bd
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 14:27:23 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 14:28:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5489e6ac

app-text/mupdf: add libressl support

 .../{mupdf-9999.ebuild => mupdf-1.7a-r1.ebuild}    | 22 ++++++++++++++--------
 app-text/mupdf/mupdf-9999.ebuild                   |  6 ++++--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app-text/mupdf/mupdf-9999.ebuild 
b/app-text/mupdf/mupdf-1.7a-r1.ebuild
similarity index 82%
copy from app-text/mupdf/mupdf-9999.ebuild
copy to app-text/mupdf/mupdf-1.7a-r1.ebuild
index 420f707..2bb7606 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-1.7a-r1.ebuild
@@ -4,27 +4,29 @@
 
 EAPI=5
 
-inherit eutils git-2 multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs vcs-snapshot
 
 DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="http://mupdf.com/";
-EGIT_REPO_URI="git://git.ghostscript.com/mupdf.git"
-#EGIT_HAS_SUBMODULES=1
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=987969ac033151810aade57d45c3d968dbf83d60;sf=tgz
 -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 MY_SOVER=1.7
 SLOT="0/${MY_SOVER}"
-KEYWORDS=""
-IUSE="X vanilla curl openssl static static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla +curl javascript libressl +openssl static static-libs"
 
-LIB_DEPEND="dev-libs/openssl[static-libs?]
+LIB_DEPEND="
+       !libressl? ( dev-libs/openssl:0[static-libs?] )
+       libressl? ( dev-libs/libressl[static-libs?] )
        media-libs/freetype:2[static-libs?]
        media-libs/jbig2dec[static-libs?]
        media-libs/openjpeg:2[static-libs?]
        net-misc/curl[static-libs?]
        virtual/jpeg[static-libs?]
        X? ( x11-libs/libX11[static-libs?]
-               x11-libs/libXext[static-libs?] )"
+               x11-libs/libXext[static-libs?] )
+       javascript? ( dev-lang/mujs )"
 RDEPEND="${LIB_DEPEND}"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
@@ -42,7 +44,8 @@ src_prepare() {
                "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
                "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
                "${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-               "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+               "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
+               "${FILESDIR}"/${PN}-1.7a-system-mujs.patch
 
        if has_version ">=media-libs/openjpeg-2.1:2" ; then
                epatch \
@@ -72,6 +75,9 @@ src_prepare() {
            -e "1iHAVE_X11 = $(usex X)" \
                -e "1iWANT_OPENSSL = $(usex openssl)" \
                -e "1iWANT_CURL = $(usex curl)" \
+               -e "1iHAVE_MUJS = $(usex javascript)" \
+               -e "1iMUJS_LIBS = -lmujs" \
+               -e "1iMUJS_CFLAGS =" \
                -i Makerules || die
 
        if use static-libs || use static ; then

diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 420f707..d275c29 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -15,9 +15,11 @@ LICENSE="AGPL-3"
 MY_SOVER=1.7
 SLOT="0/${MY_SOVER}"
 KEYWORDS=""
-IUSE="X vanilla curl openssl static static-libs"
+IUSE="X vanilla curl libressl openssl static static-libs"
 
-LIB_DEPEND="dev-libs/openssl[static-libs?]
+LIB_DEPEND="
+       !libressl? ( dev-libs/openssl:0[static-libs?] )
+       libressl? ( dev-libs/libressl[static-libs?] )
        media-libs/freetype:2[static-libs?]
        media-libs/jbig2dec[static-libs?]
        media-libs/openjpeg:2[static-libs?]