commit: 46950238707e951af8fc5592d16401d9510d002e
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 00:09:45 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 00:09:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46950238
app-text/llpp: Version bump.
Package-Manager: portage-2.2.26
app-text/llpp/Manifest | 1 +
app-text/llpp/{llpp-9999.ebuild => llpp-22.ebuild} | 25 +++++++++++++---------
app-text/llpp/llpp-9999.ebuild | 11 +++++-----
3 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index ec7ef24..7860e37 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,3 +1,4 @@
DIST llpp-20_p20140818.tar.gz 127805 SHA256
959862916f6ee4261903bd8192dd7b6203cf9b5fa989b4bb3c19377e61fe23ea SHA512
f529414ce1731f2f155e80615792a1d79e62f58f40238b83f0c5fd59e65429a8a95fe02f6556e7b1c51619f0cac670494e4844b444b428ea3ddb991361268790
WHIRLPOOL
e190b8bbed54b8e5157c477bc071bcb16681017838cb0c0295bccddff2244be426ff4c925c3effab43dd2939e5ceb0397e2d860c6e53538139d38f340dd05a71
DIST llpp-21.tar.gz 130945 SHA256
bb846ce57269848e830d2665400df107bc23146f4004a755e16fb70d90c3a971 SHA512
8194b9806fecf3f1387aa15f6bbff65ae72df545e8e79fa9244a0c6ea58bf0b96632db11a3abec8afe315acd88c41bd11f17c3b12cf76384b398fd4401f7a909
WHIRLPOOL
c24c28df50669f5d684b58d0c90b497430e644b6ef61a9642a1da80324511657fbc01356b36a10754f658ead676105e4e46f94207bd422a462d7a56cc5eb37ef
DIST llpp-21_p20150427.tar.gz 132728 SHA256
c8f1eb8eb0f8fb2e92140be7c177be9418b7cf9641f2649e7aee82101e0f0997 SHA512
8eb3c5d21cc1ae5a1d7b6d1d28cd3f8147fba62c98456d25039c90814665afdf417bb2d3ef5eb738c2561a62454f9ce8c663444d889510609cab93deaea77e81
WHIRLPOOL
1ffe07c520393fb36801f9047aa53db8ff1c48c48885e4f1972f485470781d17673b96217ef16d4e08967f5edabe15fb20ffc1e47678ddd17ed31e53251a33eb
+DIST llpp-22.tar.gz 153700 SHA256
06dff0377bb47c172f5cb498f8bce0f362cca910f90e8663fcd3f1500ce8fa0e SHA512
8db70d7c9f10094aef0928b5f69bd9544c3cac427710d409c593708f18e06a96c0f0051b255eb81f1cb3ad9cd2e5c627121bd897db0fac6a9ade1698f9a78738
WHIRLPOOL
d8a2dfb889abeebe6a8b7d9bcd57f15198d84cd16de3f9519962c6de84e67722d911b26064c0f70c9fc7087ef5631d8d82d4ec38af0fc752c644facd12ee0aaa
diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-22.ebuild
similarity index 75%
copy from app-text/llpp/llpp-9999.ebuild
copy to app-text/llpp/llpp-22.ebuild
index 6ae222a..5043975 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-22.ebuild
@@ -4,16 +4,17 @@
EAPI=5
-inherit eutils git-2 multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs vcs-snapshot
-DESCRIPTION="a graphical PDF viewer which aims to superficially resemble
less(1)"
+DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
HOMEPAGE="http://repo.or.cz/w/llpp.git";
-EGIT_REPO_URI="git://repo.or.cz/llpp.git"
+SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/561dc5673cea431e930668b0d87b0c4b31a36b39.tar.gz
-> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
+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]
@@ -23,6 +24,7 @@ LIB_DEPEND=">=app-text/mupdf-1.7a:0=[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}
@@ -46,11 +48,15 @@ src_compile() {
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 | sed 's:-L::g') )
- for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf
x11 fontconfig) -ljpeg -ljbig2dec ; do
+ 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"
@@ -62,14 +68,13 @@ src_compile() {
esac
done
else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 fontconfig)
-lpthread"
+ 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 sh mkhelp.sh KEYS ${PV} > 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
@@ -80,7 +85,7 @@ src_compile() {
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}
+ help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo}
main.${cmo}
}
src_install() {
diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index 6ae222a..fc2df01 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -49,8 +49,8 @@ src_compile() {
if use static ; then
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 fontconfig) -ljpeg -ljbig2dec ; do
+ 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"
@@ -62,14 +62,13 @@ src_compile() {
esac
done
else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 fontconfig)
-lpthread"
+ 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 sh mkhelp.sh KEYS ${PV} > 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
@@ -80,7 +79,7 @@ src_compile() {
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}
+ help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo}
main.${cmo}
}
src_install() {
