From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SBx1d-0005tg-78 for garchives@archives.gentoo.org; Sun, 25 Mar 2012 23:39:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DEAE8E062B; Sun, 25 Mar 2012 23:38:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9CCBAE062B for ; Sun, 25 Mar 2012 23:38:56 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF45A1B400D for ; Sun, 25 Mar 2012 23:38:55 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2275) id 332592004B; Sun, 25 Mar 2012 23:38:54 +0000 (UTC) From: "Michael Weber (xmw)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, xmw@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-text/llpp: llpp-9999.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: llpp-9999.ebuild ChangeLog X-VCS-Directories: app-text/llpp X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber Content-Type: text/plain; charset=utf8 Message-Id: <20120325233854.332592004B@flycatcher.gentoo.org> Date: Sun, 25 Mar 2012 23:38:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8b639e3a-285b-4d98-8a61-11bdef9e0c9d X-Archives-Hash: 3b0354935f289bfe2a5d817d36569335 xmw 12/03/25 23:38:54 Modified: llpp-9999.ebuild ChangeLog Log: Update LiveVCS ebuild. =20 (Portage version: 2.1.10.49/cvs/Linux x86_64) Revision Changes Path 1.11 app-text/llpp/llpp-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp= -9999.ebuild?rev=3D1.11&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp= -9999.ebuild?rev=3D1.11&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp= -9999.ebuild?r1=3D1.10&r2=3D1.11 Index: llpp-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- llpp-9999.ebuild 28 Jan 2012 23:27:25 -0000 1.10 +++ llpp-9999.ebuild 25 Mar 2012 23:38:53 -0000 1.11 @@ -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 $ =20 -EAPI=3D3 +EAPI=3D4 =20 EGIT_REPO_URI=3D"git://repo.or.cz/llpp.git" =20 @@ -17,48 +17,35 @@ KEYWORDS=3D"" IUSE=3D"" =20 -RDEPEND=3D"=3Dapp-text/mupdf-9999 - dev-ml/lablgl[glut] - dev-lang/ocaml[ocamlopt] +RDEPEND=3D"media-libs/freetype media-libs/jbig2dec media-libs/openjpeg + virtual/jpeg + x11-libs/libX11 x11-misc/xsel" -DEPEND=3D"${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=3D"${RDEPEND} + =3Dapp-text/mupdf-9999 + dev-lang/ocaml[ocamlopt] + dev-ml/lablgl[glut]" =20 src_compile() { ocaml str.cma keystoml.ml KEYS > help.ml || die printf 'let version =3D"%s";;\n' $(git describe --tags --dirty) >> help= .ml || die =20 local myccopt=3D"$(freetype-config --cflags) -O -include ft2build.h -D_= GNU_SOURCE" - local mycclib=3D"-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfree= type" - #if use ocamlopt ; then - mycclib=3D"${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=3D"-lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lX= 11 -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 } =20 src_install() { - dobin ${PN} || die - dodoc KEYS README Thanks fixme || die + dobin ${PN} + dodoc KEYS README Thanks fixme } 1.21 app-text/llpp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/Chan= geLog?rev=3D1.21&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/Chan= geLog?rev=3D1.21&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/Chan= geLog?r1=3D1.20&r2=3D1.21 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ChangeLog 25 Mar 2012 23:27:33 -0000 1.20 +++ ChangeLog 25 Mar 2012 23:38:53 -0000 1.21 @@ -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/0= 3/25 23:27:33 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.21 2012/0= 3/25 23:38:53 xmw Exp $ + + 25 Mar 2012; Michael Weber llpp-9999.ebuild: + Update LiveVCS ebuild. =20 *llpp-11 (25 Mar 2012) =20