Version bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

3 files changed, 96 insertions, 12 deletions

diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index 691eb3f560bf..1635c8404bab 100644
--- a/app-text/llpp/ChangeLog
+++ b/app-text/llpp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/llpp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.57 2014/03/07 21:43:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.58 2014/04/17 14:39:47 xmw Exp $
+
+*llpp-18 (17 Apr 2014)
+
+  17 Apr 2014; Michael Weber <xmw@gentoo.org> +llpp-18.ebuild:
+  Version bump
 
   07 Mar 2014; Pacho Ramos <pacho@gentoo.org> llpp-17_p20140112.ebuild:
   amd64 stable, bug 472532
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 552caf7af5b8..2a18bcb745c0 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX llpp-11-WM_CLASS.patch 872 SHA256 efcbfc78ab6bcc1af0d4c6eafc737b55ef8ec0b1866f9cc9c95435a1e7d79bcc SHA512 15b25daeb9ef3d3845687c84287f477df10ca826f3909a204f20fe448c875e83741158f429c9c10c08000f481901bbf4f74c301c45c55db9dc8eaa6632e56f47 WHIRLPOOL d019176ea03c57c56d96d9dc652975edf7d024f941d0bccacef1bec6244a2a5544ae1e364786258c0de5686ee3fb6d9cbb3efdc89488ff890a0df1faa355036b
 DIST llpp-13_p20121123.tar.gz 110436 SHA256 367c01e14478b18c39a34bc515f495b980789e536744e7b698d1639e6935eb35 SHA512 2c8f47adb619416743eb2ee9f43df38989af4e255626810bc9ac34020e37d5e6637589a4e20324184184c1da21d2ed9c3f6083d02cc98a8364946091831edc60 WHIRLPOOL e8ccfbf7a6c782913ea8ba4851b42f30eba171f0c03a14946697e0763f4b95c0f56e629d0d1747f169b6bb138cedbe0bb2487012d9e1b76a902722aaf6866c59
 DIST llpp-15.tar.gz 109546 SHA256 cc415775a62144f8e4185f5d550952b6d2d573072b5b7d91bc8c09c564ce156c SHA512 96f4720f2ee0d9d2d5903ed452e7314e08d14a5806b13d439e01bfd4121fe714f5146e0cb6b33bced3c9c4b652ed8c9334070643e66276f07ea9e9b50d8b5b93 WHIRLPOOL 097871bcb121807eb1d5211254e8670c0cc08eb79787d9255217d10841a0e2436ee50194f038023efa052a4db4e5ac251dd88215ef44ae966689ff03cf79252a
 DIST llpp-17_p20140112.tar.gz 118951 SHA256 7d1ae89762054d9cb4fc06af11f766ab1c638ed230213dbcf36837b9379cc612 SHA512 38249f67a7151622833cba7e19de218f43110724ca9a304f4b80ac95661c71d01a1024fac30cf66c5013669545fb08bf320225d9463d2c31844446dc3c99de0c WHIRLPOOL c67b3e60bce82dc142624d3183144230d5a42921a203f19337f0a14942aec6fb395c57edf123b1d8127ce92c90df142b3caa11b4c14ec986aa2ad6d2fae6a383
+DIST llpp-18.tar.gz 119085 SHA256 fd87f99198c26071e898e65f9d7ee2b698a8a39768a44d740733ba935fb9fe4f SHA512 994d48fe690514078a708b9a52d94f96506693863ec0c277014fc2ab5b3aa831254a3b6e227524eb46d094bb06cfe3c51ec0f2dfe50cf83d6e97198e43e9cd1c WHIRLPOOL 51862737ca0144d09db19a46a456b808a9db9d2a78a637118dc4277170f43a287e1396d0634b9d90565de120bdf86a6b625c41e27b78f7fd534ca8504e380011
 EBUILD llpp-13_p20121123.ebuild 1557 SHA256 c7983c466e0cddc9ebb101f06cb5b83decd85ad82ba9cc1ab173b2f92fabb474 SHA512 38d0e1aaf4fb5ec72e11a31ee6321e56bfd3022d9cbc8475fe3450c02511292a30fe801ce8f14e5c42e3d1b42c5d44da4833675315c33e156efc22a14cd2e505 WHIRLPOOL 931c3fc2f9539352a4df0c8fb946086e2cbce6c3525c53429bb719db7ed4bf0237817f56ec33624aa8a68f79f8a8b03ed468b7df426c33810672ba8f8e709ee8
 EBUILD llpp-15.ebuild 2741 SHA256 72f9affc1a153d411e842ea17bb6a88d9aa79c5e6f04d2c9be45b82351a2586a SHA512 8d90f952f21047d429ccb5e8b1987850c1d72589ec6c0c0b4d33f8c4488b51baf2c8b87d29d539152eae123d8a2deec7d8e772df4b86eae25f4b6e59ba4dcd69 WHIRLPOOL d4fc7c6df4146ba87165530201866ff64332ab8f816968bf900488cdf4e4c3ff6daa0be0eff32de954997f2a74d4d4bca8d2be0c7e61e15da6529db1b88f3584
 EBUILD llpp-17_p20140112.ebuild 2883 SHA256 e7250db7063a0e137a4c0e972edcdb0c33c06e125e218b83326272f97e4cd776 SHA512 fcad82b8086d6549e935b05ce22b79de6ae2af7ba74556e27cbd7c32cd51f89992478716aad999d5e816eb98bb477b25ed073a8f7887edcaa6833ac20884996d WHIRLPOOL d25ad7d0cde4255df1cf8b89bdf0822872d1d4127409d9044e6735094e32c9c653452f1b1e00fc17268ee66f127ca58e958c0d8b9bd05940ee6c351f93675299
+EBUILD llpp-18.ebuild 2871 SHA256 6aacc413d167c3dc6809a2c0c09085e16aea0c22b7e40eaec5a235d1d05666dd SHA512 545e255d809b75ae2077941c9fbefcb0311e0fe3ce2f60536766d3230cf9369f2e42fe8c9bced58d9329df644b2b148bbd55cacfa23eef141f38dbb7d5e87cc1 WHIRLPOOL 38c82db21045eef268d287dcd07c2b72f1eee32ce55983b9cb75e4ad4ed8d7660d5b7150a1e531070d5ff3147f8a806f9453d5aad48dbeadac2155dd68b38878
 EBUILD llpp-9999.ebuild 2724 SHA256 da248ac48adc856fa78c3ba4b64398d976af9015a7043378d2d387c95e4c2813 SHA512 7baa29e6ad9a9e910ec776722711d54f6610c346c95d61eb9a66fb1447625da8a65d4e7cbaaf17253fb8a5e2d1cf47bc3bd66daa9ed37289dd22e61c1d0cb003 WHIRLPOOL 348953b1fd337dc6d7d9a24a4ac0e17e74412caa4c6effa0d64b3b059924b8c65b1cdfcf6c8b3533ea8c2ee72bd79aab67c3e212a45285d2d430203691e391af
-MISC ChangeLog 7704 SHA256 a7680436e7904ca0674d0bf235465a9a4f0ab22840b604b8375cea991d6839f2 SHA512 203bf511f652130c247a45a5fd38c2b19c4f7a964abe3572e27c5344a81f7af485d09a85e5cd53cec24b96f1a3e1e9f63fa408477567c3b37836a759c2386af5 WHIRLPOOL b25885d2f6e7c69bb82d2757ddfe3018746684a7672e2e80432837dd598fc77c36d1bb162ae8c19f2c540ff153954ebeeb448f9cfbe003f668b9162c1e717c82
+MISC ChangeLog 7805 SHA256 67270038320786b30b39d96154ed1ba0d9abc6e7fadc53dec7b8a4258f52929d SHA512 17e9afbf3024fe630dc42e44e270cb5ca4913340886fca0a7d3d46c5be9fccdad317579d3e23a022b3311856f55d951a6d8aa4885ceeffd0e5384124a126b6dc WHIRLPOOL 27f05e50a85d5f37b008d403cfe7028ef7f6f273635eafd67f372080d45c58cf5496be28ae550a13ce8d96e60a6e804984b2a686a268fe773fb647bcd125ff8b
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlMaPZcACgkQCaWpQKGI+9SbeQCbB4Wi1SHTEgt7KRxlcj0HEVty
-SMsAn3zViwHdz9iwGu7Rgy6it+sthIFW
-=se1g
------END PGP SIGNATURE-----
diff --git a/app-text/llpp/llpp-18.ebuild b/app-text/llpp/llpp-18.ebuild
new file mode 100644
index 000000000000..7fa984068893
--- /dev/null
+++ b/app-text/llpp/llpp-18.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-18.ebuild,v 1.1 2014/04/17 14:39:47 xmw Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="http://repo.or.cz/w/llpp.git"
+#SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/23585c732e608b486dffd2c210dc2cab43b1d4cb.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~xmw/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">app-text/mupdf-1.3_p20140118:0=[static-libs]
+	media-libs/openjpeg:2[static-libs]
+	media-libs/freetype:2[static-libs]
+	media-libs/jbig2dec[static-libs]
+	sys-libs/zlib[static-libs]
+	virtual/jpeg:0[static-libs]
+	x11-libs/libX11[static-libs]"
+RDEPEND="x11-misc/xsel
+	!static? ( ${LIB_DEPEND//\[static-libs]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND}
+		app-arch/bzip2[static-libs]
+		media-libs/libXcm[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libXmu[static-libs] )
+	dev-lang/ocaml[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
+}
+
+src_compile() {
+	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
+	local cmo=$(usex ocamlopt cmx cmo)
+	local cma=$(usex ocamlopt cmxa cma)
+	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
+	if use static ; then
+		local cclib=""
+		local slib=""
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do
+			case ${slib} in
+				-lm|-ldl|-lpthread)
+					einfo "${slib}: shared"
+					cclib+="${slib} " ;;
+				*)
+					local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
+					einfo "${slib}: use ${ccnew}"
+					cclib+="${ccnew} " ;;
+			esac
+		done
+	else
+		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
+	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
+	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc KEYS README Thanks fixme
+}