Update LiveVCS ebuild.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 30 insertions, 40 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/Manifest b/app-text/llpp/Manifest
index 56e17f072484..deb090cd8058 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -7,13 +7,13 @@ DIST llpp-11.tar.gz 94957 RMD160 d16e4defdc1d8d8d850d27b8a1e6ca89727ae144 SHA1 e
 DIST llpp-7.tar.gz 46931 RMD160 8887de279c19f33c6e4390a1a793f0c3f00f993b SHA1 512675c5865667cbf7430f050e7e62dd11dc74f7 SHA256 b359380afda9deaec85353e3ca0b603f2c512956b9f7f70970847aec2dfd5a5a
 EBUILD llpp-11.ebuild 1634 RMD160 31221e1c918c4de55e009d28670bc09286db2d68 SHA1 93f5055423abdd5d5871c6cec800fa8f1b5b4e5c SHA256 edd1cd152e8b7b489e803f01e31a90f29d87f0945b0c319da6b1cb96ca4f9962
 EBUILD llpp-7.ebuild 1974 RMD160 a5b8ff00760b2af17949b93aa038140746ff276c SHA1 915f8569ff20e7675116df1d72e3027ec697f30d SHA256 e387a5b3a320671b3442b498682bf22bc574103431a7d4e20c4158f234a084dd
-EBUILD llpp-9999.ebuild 1944 RMD160 b0df3206bf56c9a236f957cfdf0f2d974519ea24 SHA1 4ec3467321bb2046d920d0383ce287e5ce2a712c SHA256 20c746d1b25363337b0e9306148ad36bc880a9186ffb3ab3d0c2e016789b3c0f
-MISC ChangeLog 3039 RMD160 49f31598faff9bb56cdb49b2e4a71623184aa279 SHA1 43155c170abe7ca2b081d49dcb03cc804763f98f SHA256 61bfcf9ae694ac496e2eb9a77997dc59076fbf8b58f8eead2819e5fa4b35d622
+EBUILD llpp-9999.ebuild 1509 RMD160 133dd237a8142a1ea279b56a0ed3b845c7efd5db SHA1 ee3ceed9957dc0afe8b473fa94e0072732d93609 SHA256 48ef5a6f7a4543089479217682bc5737ebd5bed4f527fa668608323590fd93de
+MISC ChangeLog 3129 RMD160 c0cfd94b002db1919467ed626d67248fce497179 SHA1 15b1c570a4bffc7178a621f7f4e7180012df4886 SHA256 19b8b404d3a8ffa5b377b1e5ebd5b8a82354483e4dbe6d2df9d099c09b103d9a
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9vqesACgkQknrdDGLu8JB2PwEAj0shcDzg3EH4Uv2w+fqKB1JG
-AbAUAM79ig8RoE3zDZgA/3qsnx6xIAUOMlVnz3Q5dPM/ugbDpQSxDrJUNjQ29eCC
-=nn0g
+iF4EAREIAAYFAk9vrJQACgkQknrdDGLu8JCjIgD/dQBfHGJ/LqiYN8RUqRFOWymW
+Ge/kk7WQy5t+zjVWJBkA/1g3reH+PJxWsFSFZ5yJ99/l3P3lSRL09GH9pypjt7oG
+=Wi1v
 -----END PGP SIGNATURE-----
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
 }