diff options
author | Michael Weber <xmw@gentoo.org> | 2015-02-26 13:53:42 +0000 |
---|---|---|
committer | Michael Weber <xmw@gentoo.org> | 2015-02-26 13:53:42 +0000 |
commit | 7e9465765c1b057d18d180b55227a84a919fb205 (patch) | |
tree | 98a85c3994435f95e859d87530f6e694f95c067c /app-text/mupdf | |
parent | Drop COPYING and force /usr/share/doc/${PF} (thanks Roger, bug 526508) (diff) | |
download | gentoo-2-7e9465765c1b057d18d180b55227a84a919fb205.tar.gz gentoo-2-7e9465765c1b057d18d180b55227a84a919fb205.tar.bz2 gentoo-2-7e9465765c1b057d18d180b55227a84a919fb205.zip |
Version bump (thanks sping, bug 526508), update ebuilds.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'app-text/mupdf')
-rw-r--r-- | app-text/mupdf/ChangeLog | 8 | ||||
-rw-r--r-- | app-text/mupdf/mupdf-1.5-r1.ebuild | 9 | ||||
-rw-r--r-- | app-text/mupdf/mupdf-1.6.ebuild | 127 | ||||
-rw-r--r-- | app-text/mupdf/mupdf-9999.ebuild | 14 |
4 files changed, 147 insertions, 11 deletions
diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog index 7f1178101ead..b249f3e88b37 100644 --- a/app-text/mupdf/ChangeLog +++ b/app-text/mupdf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/mupdf # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.114 2015/02/26 13:35:32 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.115 2015/02/26 13:53:42 xmw Exp $ + +*mupdf-1.6 (26 Feb 2015) + + 26 Feb 2015; Michael Weber <xmw@gentoo.org> +mupdf-1.6.ebuild, + mupdf-1.5-r1.ebuild, mupdf-9999.ebuild: + Version bump (thanks sping, bug 526508), update ebuilds. 26 Feb 2015; Michael Weber <xmw@gentoo.org> mupdf-1.5-r1.ebuild: Drop COPYING and force /usr/share/doc/${PF} (thanks Roger, bug 526508) diff --git a/app-text/mupdf/mupdf-1.5-r1.ebuild b/app-text/mupdf/mupdf-1.5-r1.ebuild index 82a18ce55511..3e3b1fde0c9f 100644 --- a/app-text/mupdf/mupdf-1.5-r1.ebuild +++ b/app-text/mupdf/mupdf-1.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild,v 1.2 2015/02/26 13:35:32 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild,v 1.3 2015/02/26 13:53:42 xmw Exp $ EAPI=5 @@ -11,7 +11,8 @@ HOMEPAGE="http://mupdf.com/" SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> ${P}.tar.gz" LICENSE="AGPL-3" -SLOT="0/1.5" +MY_SOVER=1.5 +SLOT="0/${MY_SOVER}" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X vanilla +curl +openssl static static-libs" @@ -81,8 +82,8 @@ src_prepare() { -i "${S}"-static/Makerules || die fi - my_soname=libmupdf.so.1.5 - my_soname_js_none=libmupdf-js-none.so.1.5 + my_soname=libmupdf.so.${MY_SOVER} + my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ diff --git a/app-text/mupdf/mupdf-1.6.ebuild b/app-text/mupdf/mupdf-1.6.ebuild new file mode 100644 index 000000000000..e8a56807075c --- /dev/null +++ b/app-text/mupdf/mupdf-1.6.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.6.ebuild,v 1.1 2015/02/26 13:53:42 xmw Exp $ + +EAPI=5 + +inherit eutils multilib toolchain-funcs vcs-snapshot + +DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" +HOMEPAGE="http://mupdf.com/" +SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=9268b59ffcb5e5a276324d692c9d63c0e2f1e3ce;sf=tgz -> ${P}.tar.gz" + +LICENSE="AGPL-3" +MY_SOVER=1.6 +SLOT="0/${MY_SOVER}" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="X vanilla +curl +openssl static static-libs" + +LIB_DEPEND="dev-libs/openssl[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?] )" +RDEPEND="${LIB_DEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig + static-libs? ( ${LIB_DEPEND} ) + static? ( ${LIB_DEPEND//?} + app-arch/bzip2[static-libs] + x11-libs/libXau[static-libs] + x11-libs/libXdmcp[static-libs] + x11-libs/libxcb[static-libs] )" + +src_prepare() { + rm -rf thirdparty || die + + epatch \ + "${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 + + if has_version ">=media-libs/openjpeg-2.1:2" ; then + epatch \ + "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch + fi + + sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ + -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ + -i platform/debian/${PN}.pc || die + + use vanilla || epatch \ + "${FILESDIR}"/${PN}-1.3-zoom-2.patch + + #http://bugs.ghostscript.com/show_bug.cgi?id=693467 + sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ + -i platform/debian/${PN}.desktop || die + + sed -e "1iOS = Linux" \ + -e "1iCC = $(tc-getCC)" \ + -e "1iLD = $(tc-getCC)" \ + -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}" \ + -e "1iHAVE_X11 = $(usex X)" \ + -e "1iWANT_OPENSSL = $(usex openssl)" \ + -e "1iWANT_CURL = $(usex curl)" \ + -i Makerules || die + + if use static-libs || use static ; then + cp -a "${S}" "${S}"-static || die + #add missing Libs.private for xcb and freetype + sed -e 's:\(pkg-config --libs\):\1 --static:' \ + -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \ + -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \ + -i "${S}"-static/Makerules || die + fi + + my_soname=libmupdf.so.${MY_SOVER} + my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} + sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ + -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ + -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ + -e "\$a\$(MUPDF_JS_NONE_LIB):" \ + -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ + -e "/install/s: COPYING : :" \ + -i Makefile || die +} + +src_compile() { + emake XCFLAGS="-fpic" + use static-libs && \ + emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a + use static && \ + emake -C "${S}"-static XLIBS="-static" +} + +src_install() { + if use X ; then + domenu platform/debian/${PN}.desktop + doicon platform/debian/${PN}.xpm + else + rm docs/man/${PN}.1 + fi + + emake install + dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so + + use static-libs && \ + dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a + if use static ; then + dobin "${S}"-static/build/debug/mu{tool,draw} + use X && dobin "${S}"-static/build/debug/${PN}-x11 + fi + use X && dosym ${PN}-x11 /usr/bin/${PN} + + insinto /usr/$(get_libdir)/pkgconfig + doins platform/debian/${PN}.pc + + dodoc README docs/*.{txt,c} +} diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild index 9595846d6b7c..903e0bb9bfbc 100644 --- a/app-text/mupdf/mupdf-9999.ebuild +++ b/app-text/mupdf/mupdf-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.49 2014/10/10 13:50:49 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.50 2015/02/26 13:53:42 xmw Exp $ EAPI=5 @@ -12,7 +12,8 @@ EGIT_REPO_URI="git://git.ghostscript.com/mupdf.git" #EGIT_HAS_SUBMODULES=1 LICENSE="AGPL-3" -SLOT="0/1.5" +MY_SOVER=1.6 +SLOT="0/${MY_SOVER}" KEYWORDS="" IUSE="X vanilla curl openssl static static-libs" @@ -67,6 +68,7 @@ src_prepare() { -e "1ibuild = debug" \ -e "1iprefix = ${ED}usr" \ -e "1ilibdir = ${ED}usr/$(get_libdir)" \ + -e "1idocdir = ${ED}usr/share/doc/${PF}" \ -e "1iHAVE_X11 = $(usex X)" \ -e "1iWANT_OPENSSL = $(usex openssl)" \ -e "1iWANT_CURL = $(usex curl)" \ @@ -81,14 +83,14 @@ src_prepare() { -i "${S}"-static/Makerules || die fi - my_soname=libmupdf.so.1.5 - my_soname_js_none=libmupdf-js-none.so.1.5 + my_soname=libmupdf.so.${MY_SOVER} + my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ -e "\$a\$(MUPDF_JS_NONE_LIB):" \ -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ - -e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \ + -e "/install/s: COPYING : :" \ -i Makefile || die } |