Update LiveVCS ebuild.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

2 files changed, 25 insertions, 35 deletions

diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index c2e6ad80aec7..e1ff2ed15236 100644
--- a/app-text/llpp/ChangeLog
+++ b/app-text/llpp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/llpp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.20 2012/03/25 23:27:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.21 2012/03/25 23:38:53 xmw Exp $
+
+  25 Mar 2012; Michael Weber <xmw@gentoo.org> llpp-9999.ebuild:
+  Update LiveVCS ebuild.
 
 *llpp-11 (25 Mar 2012)
 
diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index eed73472b424..f7a01152ac2d 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.10 2012/01/28 23:27:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.11 2012/03/25 23:38:53 xmw Exp $
 
-EAPI=3
+EAPI=4
 
 EGIT_REPO_URI="git://repo.or.cz/llpp.git"
 
@@ -17,48 +17,35 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="=app-text/mupdf-9999
-	dev-ml/lablgl[glut]
-	dev-lang/ocaml[ocamlopt]
+RDEPEND="media-libs/freetype
 	media-libs/jbig2dec
 	media-libs/openjpeg
+	virtual/jpeg
+	x11-libs/libX11
 	x11-misc/xsel"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e s/pdf_xref/pdf_document/ \
-		-e s/pdf_open_xref/pdf_open_document/ \
-		-e s/pdf_free_xref/pdf_close_document/ \
-		-i link.c || die
-}
+DEPEND="${RDEPEND}
+	=app-text/mupdf-9999
+	dev-lang/ocaml[ocamlopt]
+	dev-ml/lablgl[glut]"
 
 src_compile() {
 	ocaml str.cma keystoml.ml KEYS > help.ml || die
 	printf 'let version ="%s";;\n' $(git describe --tags --dirty) >> help.ml || die
 
 	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
-	local mycclib="-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype"
-	#if use ocamlopt ; then
-		mycclib="${mycclib} -lpthread"
-		ocamlopt -c -o link.o -ccopt "${myccopt}" link.c || die
-		ocamlopt -c -o help.cmx help.ml || die
-		ocamlopt -c -o parser.cmx parser.ml || die
-		ocamlopt -c -o main.cmx -I +lablGL main.ml || die
-	    ocamlopt -o llpp -I +lablGL \
-			str.cmxa unix.cmxa lablgl.cmxa lablglut.cmxa link.o \
-		    -cclib "${mycclib}" help.cmx parser.cmx main.cmx || die
-	#else
-	#	ocamlc -c -o link.o -ccopt "${myccopt}" link.c || die
-	#	ocamlc -c -o help.cmo help.ml || die
-	#	ocamlc -c -o parser.cmo parser.ml || die
-	#	ocamlc -c -o main.cmo -I +lablGL main.ml || die
-	#	ocamlc -custom -o llpp -I +lablGL \
-	#		str.cma unix.cma lablgl.cma lablglut.cma link.o \
-	#		-cclib "${mycclib}" help.cmo parser.cmo main.cmo || die
-	#fi
+	local mycclib="-lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lX11 -lpthread"
+	ocamlopt.opt -c -o link.o -ccopt "${myccopt}" link.c || die
+	ocamlopt.opt -c -o help.cmx help.ml || die
+	ocamlopt.opt -c -o wsi.cmi wsi.mli || die
+	ocamlopt.opt -c -o wsi.cmx wsi.ml || die
+	ocamlopt.opt -c -o parser.cmx parser.ml || die
+	ocamlopt.opt -c -o main.cmx -I +lablGL main.ml || die
+    ocamlopt.opt -o llpp -I +lablGL \
+		str.cmxa unix.cmxa lablgl.cmxa link.o \
+	    -cclib "${mycclib}" help.cmx parser.cmx wsi.cmx main.cmx || die
 }
 
 src_install() {
-	dobin ${PN} || die
-	dodoc KEYS README Thanks fixme || die
+	dobin ${PN}
+	dodoc KEYS README Thanks fixme
 }