xmw 14/07/21 22:00:02 Modified: mupdf-9999.ebuild metadata.xml ChangeLog Added: mupdf-1.5.ebuild mupdf-1.4-r1.ebuild Removed: mupdf-1.4.ebuild Log: Fix USE=-X for >1.4 (bug 514202, thanks patrick) and .so names, Version bump to 1.5, USE=openssl and curl for >=1.5. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path 1.47 app-text/mupdf/mupdf-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?rev=1.47&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?rev=1.47&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?r1=1.46&r2=1.47 Index: mupdf-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mupdf-9999.ebuild 5 Jun 2014 11:04:14 -0000 1.46 +++ mupdf-9999.ebuild 21 Jul 2014 22:00:02 -0000 1.47 @@ -1,10 +1,10 @@ # Copyright 1999-2014 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.46 2014/06/05 11:04:14 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.47 2014/07/21 22:00:02 xmw Exp $ EAPI=5 -inherit eutils git-2 flag-o-matic multilib toolchain-funcs +inherit eutils git-2 multilib toolchain-funcs DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" HOMEPAGE="http://mupdf.com/"; @@ -12,9 +12,9 @@ #EGIT_HAS_SUBMODULES=1 LICENSE="AGPL-3" -SLOT="0/1.3" +SLOT="0/1.5" KEYWORDS="" -IUSE="X vanilla static static-libs" +IUSE="X vanilla curl openssl static static-libs" LIB_DEPEND="dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] @@ -41,7 +41,7 @@ "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \ "${FILESDIR}"/${PN}-1.4-old-debian-files.patch \ "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ - "${FILESDIR}"/${PN}-1.3-sys_curl.patch + "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ @@ -54,21 +54,19 @@ sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ -i platform/debian/${PN}.desktop || die - sed -e "\$aOS = Linux" \ - -e "\$aCC = $(tc-getCC)" \ - -e "\$aLD = $(tc-getCC)" \ - -e "\$aAR = $(tc-getAR)" \ - -e "\$averbose = true" \ - -e "\$abuild = debug" \ - -e "\$aprefix = ${ED}usr" \ - -e "\$alibdir = ${ED}usr/$(get_libdir)" \ + 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 "1iHAVE_X11 = $(usex X)" \ + -e "1iWANT_OPENSSL = $(usex openssl)" \ + -e "1iWANT_CURL = $(usex curl)" \ -i Makerules || die - if ! use X ; then - sed -e "\$aNOX11 = yes" \ - -i Makerules || die - fi - if use static-libs || use static ; then cp -a "${S}" "${S}"-static || die #add missing Libs.private for xcb and freetype @@ -78,8 +76,8 @@ -i "${S}"-static/Makerules || die fi - my_soname=libmupdf.so.1.3 - my_soname_js_none=libmupdf-js-none.so.1.3 + my_soname=libmupdf.so.1.5 + my_soname_js_none=libmupdf-js-none.so.1.5 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}:" \ 1.5 app-text/mupdf/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/metadata.xml?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/metadata.xml?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/metadata.xml?r1=1.4&r2=1.5 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/metadata.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- metadata.xml 8 Jun 2013 03:04:34 -0000 1.4 +++ metadata.xml 21 Jul 2014 22:00:02 -0000 1.5 @@ -5,5 +5,8 @@ <email>x...@gentoo.org</email> <name>Michael Weber</name> </maintainer> +<use> + <flag name="openssl">Use dev-libs/openssl crypto backend</flag> +</use> </pkgmetadata> 1.106 app-text/mupdf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.106&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.106&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?r1=1.105&r2=1.106 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- ChangeLog 5 Jun 2014 11:04:14 -0000 1.105 +++ ChangeLog 21 Jul 2014 22:00:02 -0000 1.106 @@ -1,6 +1,15 @@ # ChangeLog for app-text/mupdf # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.105 2014/06/05 11:04:14 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.106 2014/07/21 22:00:02 xmw Exp $ + +*mupdf-1.4-r1 (21 Jul 2014) +*mupdf-1.5 (21 Jul 2014) + + 21 Jul 2014; Michael Weber <x...@gentoo.org> + +files/mupdf-1.5-Makerules-openssl-curl.patch, +mupdf-1.4-r1.ebuild, + +mupdf-1.5.ebuild, -mupdf-1.4.ebuild, metadata.xml, mupdf-9999.ebuild: + Fix USE=-X for >1.4 (bug 514202, thanks patrick) and .so names, Version bump + to 1.5, USE=openssl and curl for >=1.5. 05 Jun 2014; Michael Weber <x...@gentoo.org> +files/mupdf-1.4-old-debian-files.patch, mupdf-9999.ebuild: 1.1 app-text/mupdf/mupdf-1.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild?rev=1.1&content-type=text/plain Index: mupdf-1.5.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild,v 1.1 2014/07/21 22:00:02 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=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> ${P}.tar.gz" LICENSE="AGPL-3" SLOT="0/1.5" 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.4-old-debian-files.patch \ "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch 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 "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.1.5 my_soname_js_none=libmupdf-js-none.so.1.5 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}:" \ -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} } 1.1 app-text/mupdf/mupdf-1.4-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.4-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.4-r1.ebuild?rev=1.1&content-type=text/plain Index: mupdf-1.4-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.4-r1.ebuild,v 1.1 2014/07/21 22:00:02 xmw Exp $ EAPI=5 inherit eutils flag-o-matic 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=eebc3385ebfa60574d78cf41badd6622987c1121;sf=tgz -> ${P}.tar.gz" LICENSE="AGPL-3" SLOT="0/1.4" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X vanilla 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.3-openjpeg2.patch \ "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ "${FILESDIR}"/${PN}-1.3-sys_curl.patch 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 \ "${FILESDIR}"/${PN}-1.3-forward_back.patch #http://bugs.ghostscript.com/show_bug.cgi?id=693467 sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ -i platform/debian/${PN}.desktop || die sed -e "\$aOS = Linux" \ -e "\$aCC = $(tc-getCC)" \ -e "\$aLD = $(tc-getCC)" \ -e "\$aAR = $(tc-getAR)" \ -e "\$averbose = yes" \ -e "\$abuild = debug" \ -e "\$aprefix = ${ED}usr" \ -e "\$alibdir = ${ED}usr/$(get_libdir)" \ -i Makerules || die sed -e "\$aHAVE_X11 = $(usex X yes no)" \ -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.1.4 my_soname_js_none=libmupdf-js-none.so.1.4 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}:" \ -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 dobin platform/debian/${PN}-select-file 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} }
