summaryrefslogtreecommitdiff
path: root/app-text/mupdf
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-04-28 09:54:45 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-04-28 09:54:45 +0100
commitb7ebc951da8800f711142f69d9d958bde67a112d (patch)
treee318514216845acb8f2e49fff7a5cba4027e9d91 /app-text/mupdf
parentdc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
gentoo resync : 28.04.2019
Diffstat (limited to 'app-text/mupdf')
-rw-r--r--app-text/mupdf/Manifest6
-rw-r--r--app-text/mupdf/metadata.xml3
-rw-r--r--app-text/mupdf/mupdf-1.14.0-r2.ebuild10
-rw-r--r--app-text/mupdf/mupdf-1.14.0-r3.ebuild17
4 files changed, 16 insertions, 20 deletions
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index a6c9fb604e7c..29bd120ac70a 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -7,6 +7,6 @@ AUX mupdf-1.14-openssl-curl-x11.patch 1799 BLAKE2B 62ae64baad844a13379f8dd1e1a1f
AUX mupdf-1.14-r3-openssl-curl-x11.patch 1256 BLAKE2B 49bfda1f434fbfcf85c7b38b714b3c471d8d4ce02d625a6716582e0a9b3d1d0f623d401a0e9f4fc8ce4a1a6109925199c9c2b188be8739f274804217fb829efb SHA512 387f282fdd2e450585743de7fa297c24685d12c199c801f930da37795c6406aa9ee0bee335c54ca6ccef46726ebf6b49b389753f061542cf7e5381c979e0786d
AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
-EBUILD mupdf-1.14.0-r2.ebuild 3111 BLAKE2B 0431380b280fd111a1599aa1cc165a54c077d6881ac67dc99b76a2923ac001e5bfb3da3318f01178c708e0468f8940ee322b35956e51a76949771ca7c8eb3e4f SHA512 322240be76b53cf7f7f81dc04ada3463f6ba3ea00b7396d031b34d7343e7920b908c8eeb6e04f6192bd5187ffa211ac318efa5d01ce8df71c4fcbd57e215ee91
-EBUILD mupdf-1.14.0-r3.ebuild 3333 BLAKE2B edad471b5ec05e9932bf734b352bf4a7d99115fcc214f843b452f71e9c39dfb27b6b631fae9316a1bf2e4a6020d7424998666d2c433ade867182b303a4643afe SHA512 9e15ca3d84f0a04999127a8a4327de7dd55498aa0d59e3e8a0ca70bc09fbe222ea498894736e6fb9acf2e6c8a8523c419fe1f443f0bdf10344a0e8ca996d795a
-MISC metadata.xml 325 BLAKE2B b1481395199609bf3f4f01f21946866005eeb2a5df124c1ded940702808cfba176494e7b801ad5fef4ea61c93ce47e7415548a3e86d0d41b28c16ea1d064a152 SHA512 8b7c565857b47f585fa4059e99087efdbf1a88cc61fc2370a489ebf6c46e3a1271eb23b2173354054c82317ce7305d9372f6d05afd4749b0467635030cd5ea1e
+EBUILD mupdf-1.14.0-r2.ebuild 3116 BLAKE2B 1700ed8f0eacc1c986393b597df20d4b45a2158ddedbe472281e900d8dc79ce4a76aafc5be0e3f35977afd6cecb643b7a382c6a7e0a422987d23b20bf2697343 SHA512 442a258938c868062ddd3de127da51c475c89908f466aa12d8baf44b4c29fa961c99f3e1eb3649672e1855cc447eb1b30f2aa31ed80ff1c2c751716b743ee6d8
+EBUILD mupdf-1.14.0-r3.ebuild 3238 BLAKE2B 8abeb9aed58d3222403f305c51b2ac04c2b2e03ae933e2fdf4bfd7f12abf32ff09ef1b1e0204c28a25eedbf17397b02037dfc60cc6bbe29404fe5d34b4bca0d7 SHA512 a2cacbc18f138ec601bb09b2760d949af8aeb78486f54f8c6a9dd069dca563e175c80d587f75622038e94f096d345258bd9738da4ae37ef86df285f0dcad76e9
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 5866930fdf0c..88de5fc462b1 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -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>
diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index 0200aa416b3c..8e081a7e46aa 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -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 \
diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index 1b153620923f..34e7a6e9d187 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -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 \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 11:21:58 +0000