diff options
| -rw-r--r-- | app-text/llpp/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/llpp/Manifest | 12 | ||||
| -rw-r--r-- | app-text/llpp/llpp-0_p20110504.ebuild | 38 | ||||
| -rw-r--r-- | app-text/llpp/llpp-5.ebuild | 41 | ||||
| -rw-r--r-- | app-text/llpp/llpp-7.ebuild | 4 |
5 files changed, 9 insertions, 93 deletions
diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog index 4eaefd971965..dc996391b73b 100644 --- a/app-text/llpp/ChangeLog +++ b/app-text/llpp/ChangeLog @@ -1,6 +1,11 @@ # 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.16 2011/11/17 18:47:08 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.17 2011/11/18 03:32:27 xmw Exp $ + + 18 Nov 2011; Michael Weber <xmw@gentoo.org> -llpp-0_p20110504.ebuild, + -llpp-5.ebuild, llpp-7.ebuild: + Fix x86 compilation bug (thanks to David Abbott for the report, bug 390823). + Remove old versions. 17 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> llpp-7.ebuild: x86 stable wrt bug #390683 diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest index 88f04c90cfa5..14cb4719d930 100644 --- a/app-text/llpp/Manifest +++ b/app-text/llpp/Manifest @@ -1,20 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - AUX llpp-WM_CLASS.patch 839 RMD160 1db1e1b3242b83a076c99e5a68e7b6a0114fff88 SHA1 445cd3e727269d2369bc3d5174ac1baecbfdfc0e SHA256 48ccdba58d12a1efbc4f60b0e3252843bc661d3002229e9aaa5b2e32e94d2af2 DIST llpp-0_p20110504.tar.bz2 25459 RMD160 579dbf029088e70bd8040c1266c87e9b8b8ec316 SHA1 82567ad727ac84f5c3a3b383e210cd0488ea8b2f SHA256 6ce2c2f2a70143fbfb8434e9ca48288a87e6cc32f445c35af78b193106e7fa70 DIST llpp-5.tar.gz 28895 RMD160 9db80e88755879ab8a962e3fd74ca34418aeed69 SHA1 710f5f4972f4e36e31512ea024ae2df3b082199d SHA256 05997619d219b62ecdf7941fd3f2ad609c2603b19c56170e2d932e0031926b6b DIST llpp-7.tar.gz 46931 RMD160 8887de279c19f33c6e4390a1a793f0c3f00f993b SHA1 512675c5865667cbf7430f050e7e62dd11dc74f7 SHA256 b359380afda9deaec85353e3ca0b603f2c512956b9f7f70970847aec2dfd5a5a EBUILD llpp-0_p20110504.ebuild 979 RMD160 567ac8fd33774d05e955c739e690c0d478f65cf7 SHA1 2bdfa1837001bbaa3be69ce6691681cdd15824b7 SHA256 30b5abb2227cae86d0d308abba1a05b69171f9658dac3dbb2d7e641ccf227812 EBUILD llpp-5.ebuild 1075 RMD160 72a7be1d2065a27c0c8dffbfe87da052f981280b SHA1 64416fc2cb8b6e8453ea1407484ddd5a63ab3d41 SHA256 668d3ba6587e26b9f986773e214b7c95a2308c3880b6f9cb5c1262a0646cdcb0 -EBUILD llpp-7.ebuild 1971 RMD160 61e66333190abf534f4b3b464a88adf690d15079 SHA1 392ff7cf0d3d68f17b8fae4aac7e9477028b6907 SHA256 0552c29660861a6577290f4744cd5895cf66aa8905015b7d9e44b69c5ada09ee +EBUILD llpp-7.ebuild 1981 RMD160 fa3aa894237f0b293ac2a613191e2c18a3c8860d SHA1 a01185ccee97487aa6254329e902907f10b30734 SHA256 8ed286ce6f9d8132b94f23f797aecfdac960537623d996f7c6f0f46165685c1e EBUILD llpp-9999.ebuild 1866 RMD160 f12ba51fb59c2c4734bba387902edb6123875986 SHA1 c086715286305a3e25b80640479939ff035daec1 SHA256 5d045623144a0526dcb0427aec71228402a7635ce94799e585813815f281dcdc MISC ChangeLog 2472 RMD160 299bb268a7e82329b78e96963a0d65506704463a SHA1 0d5d428fd74c32aa5a8d05c6f708f7c0d69c0c2f SHA256 b31dcf67dce1dcc113a9cc4fe199df425f3ddaf4abd038c30374e8c321c1b01a MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEAREKAAYFAk7FVrEACgkQuUQtlDBCeQIEiQCbBHCzT7KIxc/WTqGW1f3wAuTu -BWAAoIQGXqHypkA6eQ2LjrPdlQW+zKzw -=WnL6 ------END PGP SIGNATURE----- diff --git a/app-text/llpp/llpp-0_p20110504.ebuild b/app-text/llpp/llpp-0_p20110504.ebuild deleted file mode 100644 index 13d096fc0375..000000000000 --- a/app-text/llpp/llpp-0_p20110504.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# 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-0_p20110504.ebuild,v 1.3 2011/08/24 19:08:01 maekke Exp $ - -EAPI=3 - -inherit toolchain-funcs - -DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)" -HOMEPAGE="http://repo.or.cz/w/llpp.git" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=app-text/mupdf-0.8.165 - dev-ml/lablgl[glut] - media-libs/jbig2dec - media-libs/openjpeg - x11-misc/xsel" -DEPEND="${RDEPEND}" - -src_compile() { - ocamlopt -c -o link.o -ccopt -O link.c || 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 -} - -src_install() { - dobin ${PN} || die - dodoc KEYS Thanks fixme || die -} diff --git a/app-text/llpp/llpp-5.ebuild b/app-text/llpp/llpp-5.ebuild deleted file mode 100644 index 6db59d07db23..000000000000 --- a/app-text/llpp/llpp-5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# 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-5.ebuild,v 1.1 2011/08/09 03:25:08 xmw Exp $ - -EAPI=3 - -inherit toolchain-funcs - -DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)" -HOMEPAGE="http://repo.or.cz/w/llpp.git" -# http://repo.or.cz/w/llpp.git/snapshot/1ef3f3e5b9c45ce9e4a7bb5859e448e1b44e0639.tar.gz -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=app-text/mupdf-0.8.165 - dev-ml/lablgl[glut] - media-libs/jbig2dec - media-libs/openjpeg - x11-misc/xsel" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${PN} - -src_compile() { - ocamlopt -c -o link.o -ccopt -O link.c || 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 -} - -src_install() { - dobin ${PN} || die - dodoc KEYS Thanks fixme || die -} diff --git a/app-text/llpp/llpp-7.ebuild b/app-text/llpp/llpp-7.ebuild index bbcda571ddac..eb839ab75eac 100644 --- a/app-text/llpp/llpp-7.ebuild +++ b/app-text/llpp/llpp-7.ebuild @@ -1,6 +1,6 @@ # 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-7.ebuild,v 1.3 2011/11/17 18:47:08 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-7.ebuild,v 1.4 2011/11/18 03:32:28 xmw Exp $ EAPI=3 @@ -35,7 +35,7 @@ src_compile() { printf 'let version ="%s";;\n' ${PV} >> help.ml || die local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE" - local mycclib="-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype" + local mycclib="-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lpthread" #if use ocamlopt ; then myccopt="${myccopt} -lpthread" ocamlopt -c -o link.o -ccopt "${myccopt}" link.c || die |