xmw 15/06/05 13:29:03 Modified: llpp-21.ebuild llpp-9999.ebuild ChangeLog Added: llpp-21_p20150427.ebuild Log: Version bump for mupdf-1.7a (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path 1.6 app-text/llpp/llpp-21.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-21.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-21.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-21.ebuild?r1=1.5&r2=1.6 Index: llpp-21.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-21.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- llpp-21.ebuild 17 Apr 2015 14:51:10 -0000 1.5 +++ llpp-21.ebuild 5 Jun 2015 13:29:03 -0000 1.6 @@ -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/llpp/llpp-21.ebuild,v 1.5 2015/04/17 14:51:10 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-21.ebuild,v 1.6 2015/06/05 13:29:03 xmw Exp $ EAPI=5 @@ -57,7 +57,6 @@ local cclib="" local slib="" local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') ) - ewarn ${spath} for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do case ${slib} in -lm|-ldl|-lpthread) 1.29 app-text/llpp/llpp-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-9999.ebuild?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-9999.ebuild?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-9999.ebuild?r1=1.28&r2=1.29 Index: llpp-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- llpp-9999.ebuild 17 Mar 2015 07:46:15 -0000 1.28 +++ llpp-9999.ebuild 5 Jun 2015 13:29:03 -0000 1.29 @@ -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/llpp/llpp-9999.ebuild,v 1.28 2015/03/17 07:46:15 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.29 2015/06/05 13:29:03 xmw Exp $ EAPI=5 @@ -15,7 +15,7 @@ KEYWORDS="" IUSE="+ocamlopt static" -LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs] +LIB_DEPEND=">=app-text/mupdf-1.7a:0=[static-libs] media-libs/openjpeg:2[static-libs] media-libs/fontconfig:1.0[static-libs] media-libs/freetype:2[static-libs] @@ -50,7 +50,7 @@ local cclib="" local slib="" local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') ) - for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do + for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 fontconfig) -ljpeg -ljbig2dec ; do case ${slib} in -lm|-ldl|-lpthread) einfo "${slib}: shared" 1.69 app-text/llpp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?rev=1.69&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?rev=1.69&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?r1=1.68&r2=1.69 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- ChangeLog 17 Apr 2015 14:51:10 -0000 1.68 +++ ChangeLog 5 Jun 2015 13:29:03 -0000 1.69 @@ -1,6 +1,12 @@ # ChangeLog for app-text/llpp # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.68 2015/04/17 14:51:10 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.69 2015/06/05 13:29:03 xmw Exp $ + +*llpp-21_p20150427 (05 Jun 2015) + + 05 Jun 2015; Michael Weber <[email protected]> +llpp-21_p20150427.ebuild, + llpp-21.ebuild, llpp-9999.ebuild: + Version bump for mupdf-1.7a 17 Apr 2015; Michael Weber <[email protected]> llpp-21.ebuild: Adjust mupdf dependency 1.1 app-text/llpp/llpp-21_p20150427.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-21_p20150427.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-21_p20150427.ebuild?rev=1.1&content-type=text/plain Index: llpp-21_p20150427.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-21_p20150427.ebuild,v 1.1 2015/06/05 13:29:03 xmw Exp $ EAPI=5 inherit eutils multilib toolchain-funcs vcs-snapshot DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)" HOMEPAGE="http://repo.or.cz/w/llpp.git"; SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/66868744188151eaa433d42c807e1efc5f623aa4.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="+ocamlopt static" #IUSE="egl +ocamlopt static" LIB_DEPEND=">=app-text/mupdf-1.7a:0=[static-libs] media-libs/openjpeg:2[static-libs] media-libs/fontconfig:1.0[static-libs] media-libs/freetype:2[static-libs] media-libs/jbig2dec[static-libs] sys-libs/zlib[static-libs] virtual/jpeg:0[static-libs] x11-libs/libX11[static-libs]" # egl? ( media-libs/mesa[static-libs] ) RDEPEND="x11-misc/xsel !static? ( ${LIB_DEPEND//\[static-libs]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} app-arch/bzip2[static-libs] media-libs/libXcm[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libXmu[static-libs] ) >=dev-lang/ocaml-4.02[ocamlopt?] dev-ml/lablgl[glut,ocamlopt?]" RESTRICT="!ocamlopt? ( strip )" src_prepare() { epatch "${FILESDIR}"/${PN}-20-WM_CLASS.patch } src_compile() { local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt) local cmo=$(usex ocamlopt cmx cmo) local cma=$(usex ocamlopt cmxa cma) local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG" #if use egl ; then # ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)" # local egl="egl" #fi if use static ; then local cclib="" local slib="" local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') ) for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do case ${slib} in -lm|-ldl|-lpthread) einfo "${slib}: shared" cclib+="${slib} " ;; *) local ccnew=$(find ${spath} -name "lib${slib/-l}.a") einfo "${slib}: use ${ccnew}" cclib+="${ccnew} " ;; esac done else local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread" fi verbose() { echo "$@" >&2 ; "$@" || die ; } verbose ocaml str.cma keystoml.ml < KEYS > help.ml verbose printf 'let version ="%s";;\n' ${PV} >> help.ml verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c verbose ${ocaml} -c -o bo.${cmo} le/bo.ml verbose ${ocaml} -c -o help.${cmo} help.ml verbose ${ocaml} -c -o utils.${cmo} utils.ml verbose ${ocaml} -c -o wsi.cmi wsi.mli verbose ${ocaml} -c -o wsi.${cmo} wsi.ml verbose ${ocaml} -c -o parser.${cmo} parser.ml verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL main.ml verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\ str.${cma} unix.${cma} lablgl.${cma} link.o \ -cclib "${cclib}" \ bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo} } src_install() { dobin ${PN} misc/${PN}ac dodoc KEYS README Thanks fixme }
