Update to git-2 eclass, fix src_compile

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

diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index f9eac5ecedf40211113c4d5b3961940cc16653f6..a285d765169b09153c68b2eb1ed17baf6c3e81a3 100644 (file)
--- a/app-text/llpp/ChangeLog
+++ b/app-text/llpp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/llpp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.8 2011/08/09 03:25:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.9 2011/08/09 03:36:53 xmw Exp $
+
+  09 Aug 2011; Michael Weber <xmw@gentoo.org> llpp-9999.ebuild:
+  Update to git-2 eclass, fix src_compile
 
 *llpp-5 (09 Aug 2011)
 

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 64cb9f2fad16f95bce1fedbcf9f275abdbf8b258..645297c85589f704c8accb0afce0b368db006e41 100644 (file)
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -5,13 +5,13 @@ DIST llpp-0_p20110504.tar.bz2 25459 RMD160 579dbf029088e70bd8040c1266c87e9b8b8ec
 DIST llpp-5.tar.gz 28895 RMD160 9db80e88755879ab8a962e3fd74ca34418aeed69 SHA1 710f5f4972f4e36e31512ea024ae2df3b082199d SHA256 05997619d219b62ecdf7941fd3f2ad609c2603b19c56170e2d932e0031926b6b
 EBUILD llpp-0_p20110504.ebuild 978 RMD160 8575f70ccc5e18220095fba2f88860e067478af0 SHA1 627c8f524204913c786a47a77c5d60cba3f72396 SHA256 604a185cbb5ed53ed77446cce98faa11b8f9252858ab766d0b0a3e0b437cde91
 EBUILD llpp-5.ebuild 1075 RMD160 72a7be1d2065a27c0c8dffbfe87da052f981280b SHA1 64416fc2cb8b6e8453ea1407484ddd5a63ab3d41 SHA256 668d3ba6587e26b9f986773e214b7c95a2308c3880b6f9cb5c1262a0646cdcb0
-EBUILD llpp-9999.ebuild 979 RMD160 4b2c8db48ef210027b9661388f45145379e83bb8 SHA1 e9d8ce5e78583e6aed4d28c374aecd1e5565d002 SHA256 c95d0336862e9797af74c85bb5922268520753caea0c7be4894c923f77c1a009
-MISC ChangeLog 1485 RMD160 2d85e14febc26b7d3c19c01ee783280fae20026c SHA1 7d6a1b3e3e46f600bb97aa8f94ed3fcf58a6dfc2 SHA256 b7b3cc8a34c0e7bc79a4ebca249bdb5a81f5cddcfde2b8dfd03e4224048f7e34
+EBUILD llpp-9999.ebuild 1036 RMD160 2aef5d7220145523a93a7eeece4f75fc4a0debd8 SHA1 4f40c88980ebfd5d6ffafd464b8a02f906732768 SHA256 93be31814554010f0e9a82240118fdb7bfef5f32665396545dacd29565c6727b
+MISC ChangeLog 1592 RMD160 bcbdf4ba7a8cd17c332dda495ea842a1b4eec556 SHA1 7b95632c825c385197d7449c04c5186956c70f38 SHA256 bd3c4f79351e57c63af552c1f98772a61c9ee248192666847d8960746b2dfc8e
 MISC metadata.xml 250 RMD160 645ad5d42480ce40b7a4489492c766bbf141ca2c SHA1 ee670f38920df6f9fd58e4d396cf18473e948b73 SHA256 3de95efc65f52204c931a656e6a38b39a0bd977126383f919076465e2b407543
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5AqJoACgkQknrdDGLu8JCS3gD/RE53v7oBQ9en0fAMZa8Yx0eY
-APsFz3MLuleYrXCblF4A/j7qdvPp92St6qi0xNu+flf7TIbSoZAhFuiPPuspE0tX
-=CwsU
+iF4EAREIAAYFAk5Aq1sACgkQknrdDGLu8JCDagD/XTdmJzOFFdE+rtRBdAGuCi+l
+xNJ5LS3/SvJka92EGUsA/ieZVpoCofh9f9jdG9CsWtpjw9tegWieIZyIP+qqoB12
+=OzBq
 -----END PGP SIGNATURE-----

diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index d0830b87f92077a2176f1ad418b75d8ef6da597e..b3edbbbec140bba454b68a85fb6559d311f18314 100644 (file)
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 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.5 2011/06/12 16:08:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.6 2011/08/09 03:36:53 xmw Exp $
 
 EAPI=3
 
 EGIT_REPO_URI="git://repo.or.cz/llpp.git"
 
-inherit git toolchain-funcs
+inherit git-2 toolchain-funcs
 
 DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
 HOMEPAGE="http://repo.or.cz/w/llpp.git"
@@ -26,12 +26,13 @@ DEPEND="${RDEPEND}"
 
 src_compile() {
        ocamlopt -c -o link.o -ccopt -O link.c || die
+       ocamlopt -c -o parser.cmo parser.ml || die
        ocamlopt -c -o main.cmo -I +lablGL main.ml || die
 
        ocamlopt -o llpp \
                -I +lablGL str.cmxa unix.cmxa lablgl.cmxa lablglut.cmxa link.o \
                -cclib "-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lpthread" \
-               main.cmx || die
+               parser.cmx main.cmx || die
 }
 
 src_install() {