Bump ocaml dep to 4.02 (bug 541820, thanks Franz Fellner and Max Klinger), push recent changes into -9999.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

3 files changed, 20 insertions, 13 deletions

diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index 141296ec2671..51550cd525b6 100644
--- 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/llpp-21.ebuild b/app-text/llpp/llpp-21.ebuild
index 9974cc17bcb4..66e24b614e5b 100644
--- 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 8fb12234c9d6..2d494efa7fe1 100644
--- 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
 }