Bump ocaml dep to 4.02 (bug 541820, thanks Franz Fellner and Max Klinger), push recen...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index 141296ec26714a80c26206dfdce7fce692bb26c9..51550cd525b66cda511228a3727387d25cd98484 100644 (file)
--- a/app-text/llpp/ChangeLog
+++ b/app-text/llpp/ChangeLog
@@ -1,6 +1,10 @@
 # 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.66 2015/03/02 11:00:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.67 2015/03/17 07:46:15 xmw Exp $
+
+  17 Mar 2015; Michael Weber <xmw@gentoo.org> llpp-21.ebuild, llpp-9999.ebuild:
+  Bump ocaml dep to 4.02 (bug 541820, thanks Franz Fellner and Max Klinger),
+  push recent changes into -9999.
 
   02 Mar 2015; Michael Weber <xmw@gentoo.org> llpp-21.ebuild:
   Needs ocaml-4

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 64f6b748ac205b8913e8c4bfb8a42cc1773cadf9..234b39d685940c9cd45f79176f20210e50562752 100644 (file)
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -16,14 +16,14 @@ EBUILD llpp-17_p20140112.ebuild 2883 SHA256 ce801403b0ca89648b5b066507d8cd92aeb9
 EBUILD llpp-18.ebuild 2871 SHA256 c5869c9029413c6596e96503855a0db46d1a612fcc39ca7413d4f3bd7b086cac SHA512 e1c3d35010f90d7f2eaf733e7207ca8482e8fad613a04907f3c84e2b6dbb7de81fa36dcd22792d790e11b736705eac42ba25bad0f2182d9712e149bbdbbffc8e WHIRLPOOL 730ff7e3d2c9802b57d5959027e1090d30454fc52cd1af8079347179afdf0b870beb633358bae71bbb9c30e58823a4a7fb8e6538cb5790971ebb5e602b0f906f
 EBUILD llpp-19.ebuild 2981 SHA256 d1b5077712988cb16b727b803fa4961b5651d2e919c5d2c26a3c862ba068b1e5 SHA512 8760ffde426de44fdd16d9cad26e48ba433ab3d2465480f891f92d94c73e112eddc91e883736e1e8196a2780e3dfa65011d569240cc0b264dde1331344732b6b WHIRLPOOL 1f043778d97f5c56c2d38d7694c683dc25909b3f97a92fd97b9bc79483063dc421e2dd0baef2cacb7ae063a6e4fd25d83745106a07828c825a9c07b5e38f0ad7
 EBUILD llpp-20_p20140818.ebuild 3262 SHA256 505da7f6b76f2544b916e9737125adaa65c746056de40a49ef7d41d6357acdd7 SHA512 0a9522301d82bf6bf1c2fe45bbe90c34cacbddee5406a4836812733f7cbefed19e602600d2a758857b549a89d2bdd040855e356e98267e554a6e9038aac401a7 WHIRLPOOL 7bd996daa5f857bd9db231bbc7f71e0dd941dad3f3afc1d45c032e5aa0e8469884e6472167d7e68cbcd10327a96737aaf87ba7049e6ebf5de60e6c67521b05c0
-EBUILD llpp-21.ebuild 3256 SHA256 8711413f3dda318d76b497d9b963f08e62979c604b5c0b5207c14f47a4a03473 SHA512 7188c03f8bfbd591dd1330f1a6323ad6b05c81936f03d790245cacb235f08dfe681ee7adb9a546706cf9c8d88251635b1a42f84b6183197552d3df667a0d133e WHIRLPOOL d61f2c4202cb1229f793d6ec87db5264078972fa031a00e5d61b8528dba9f712912980e9b798265d689cd4fdd45cfc3a844d4c491a70224d1a32b7ce9c9f1fe5
-EBUILD llpp-9999.ebuild 2724 SHA256 da248ac48adc856fa78c3ba4b64398d976af9015a7043378d2d387c95e4c2813 SHA512 7baa29e6ad9a9e910ec776722711d54f6610c346c95d61eb9a66fb1447625da8a65d4e7cbaaf17253fb8a5e2d1cf47bc3bd66daa9ed37289dd22e61c1d0cb003 WHIRLPOOL 348953b1fd337dc6d7d9a24a4ac0e17e74412caa4c6effa0d64b3b059924b8c65b1cdfcf6c8b3533ea8c2ee72bd79aab67c3e212a45285d2d430203691e391af
-MISC ChangeLog 8739 SHA256 4f5618eae492ac6cf36c95bac68d0279a09800610c262cba89bbdea9f09822a0 SHA512 22fc4ee850996f61a820bc9ffc6ba47d762c4d351b8b26345cb0c9c65c3a2cf74e183d253cb5c83d85cbb08ddef57168bb56596b5ea2d0cd4e15f97a3e58fc9a WHIRLPOOL 3931e0988d1bed72ae45d9918cd7a2b1c137b25e31f4a50acca42c378c00fea4b2a9ef534f8bc3d3dbd935eb59a9234fe5f7613949070f466b7191056e306794
+EBUILD llpp-21.ebuild 3259 SHA256 9c499fd7acb9fdcc39e64a483789ebc9401aead670af1c2bb5a218f9d9ecefc8 SHA512 d30ad2df34c72f300c16038d4fd30f47d531bbd7f8e9ae00c32ced167860d46ffa8626083c450ec96a1a0b8034db02ff2dcd058fc836e175304c3c4c03d9674c WHIRLPOOL eb7467705b77e72703411b0f44c9ea4aceaf348a2dc302cea880014128682d8df019a95ace0ff1374e54d1be51a5088bb37727bac1184d3ca0a17273c609894a
+EBUILD llpp-9999.ebuild 2959 SHA256 1df68f31faae92626dc0d90ee3141d9271a5e4c0b9f672fbf1b62042dffb017f SHA512 f7ebc7490e5df3821907709b7959f3b9f75f7d33696faff0f8c61d3b7857c02c524a9ebf7a95066722dd5803eeb8c37659db12cd08b7a08f2255520e51e45e76 WHIRLPOOL 46cba7ac9372a0d456172593515b927939ad05b01f3c05645d9494d01bc70800208c09e072ded318901e4f40e05cdba2c0d6a7fa4ae3ff96e1178dcfa093cdc8
+MISC ChangeLog 8931 SHA256 a1b83b31c553c57e02ff3a11d6449b9d2a3b4e25e979ec35d030d81471ba20a6 SHA512 388ae63c3599edaee4f5bcf6fb1d620e34ced00242274f20f9d84009974724bc9a7837a3306aca7afccd2497653d00edb2508ffeb29994cc01357c2a0ee03079 WHIRLPOOL 882556276c6641082805c88b6d85a8e4f9b6cccc875ae16d936f81e2075e638b00b626e89ba967c4cfd3b3b5372541240210d328debb225788700310063e8345
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlT0QtEACgkQknrdDGLu8JApRQD8DKEWV0x9SCbpDaiaPyONQLYA
-TqQ+VH8C+T9OdEF/AcEA/RzVrlY/Uoeqph4/BkZklu1VfVu2Te/X45IK8VQjLCoR
-=/P29
+iF4EAREIAAYFAlUH28sACgkQknrdDGLu8JCq5AD/YverHBq+DBpf6SM+Si4p0cvS
+Xj7z8J2vBWyLWf3/ypgA/1gxZoGUzhv7FeTRHis17M/bovhIIbuQdYouSB8fucVK
+=+R1U
 -----END PGP SIGNATURE-----

diff --git a/app-text/llpp/llpp-21.ebuild b/app-text/llpp/llpp-21.ebuild
index 9974cc17bcb440c716eef5ccfc3a8afbd7bd7d9f..66e24b614e5b538ff9a409afac1ce7ec3a9078cf 100644 (file)
--- a/app-text/llpp/llpp-21.ebuild
+++ b/app-text/llpp/llpp-21.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/llpp/llpp-21.ebuild,v 1.2 2015/03/02 11:00:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-21.ebuild,v 1.3 2015/03/17 07:46:15 xmw Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
                x11-libs/libXau[static-libs]
                x11-libs/libXdmcp[static-libs]
                x11-libs/libXmu[static-libs] )
-       >=dev-lang/ocaml-4[ocamlopt?]
+       >=dev-lang/ocaml-4.02[ocamlopt?]
        dev-ml/lablgl[glut,ocamlopt?]"
 
 RESTRICT="!ocamlopt? ( strip )"

diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index 8fb12234c9d616e5b155ad9e6571255d41c2a487..2d494efa7fe12f56ffdb34d52636013dd432d436 100644 (file)
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 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/llpp/llpp-9999.ebuild,v 1.27 2013/08/29 05:54:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.28 2015/03/17 07:46:15 xmw Exp $
 
 EAPI=5
 
@@ -15,8 +15,9 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+ocamlopt static"
 
-LIB_DEPEND=">=app-text/mupdf-1.3:=[static-libs]
+LIB_DEPEND=">=app-text/mupdf-1.5: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]
@@ -31,20 +32,20 @@ DEPEND="${RDEPEND}
                x11-libs/libXau[static-libs]
                x11-libs/libXdmcp[static-libs]
                x11-libs/libXmu[static-libs] )
-       dev-lang/ocaml[ocamlopt?]
+       >=dev-lang/ocaml-4.02[ocamlopt?]
        dev-ml/lablgl[glut,ocamlopt?]"
 
 RESTRICT="!ocamlopt? ( strip )"
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
+       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"
+       local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG"
        if use static ; then
                local cclib=""
                local slib=""
@@ -61,26 +62,28 @@ src_compile() {
                        esac
                done
        else
-               local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
+               local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 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 main.${cmo} -I +lablGL main.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}" \
-               help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
+               bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
 }
 
 src_install() {
-       dobin ${PN}
+       dobin ${PN} misc/${PN}ac
        dodoc KEYS README Thanks fixme
 }