Version bump, prepare for upcoming USE=egl

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

5 files changed, 157 insertions, 7 deletions

diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index 1a6a3422dcb3..af4601d1b93f 100644
--- a/app-text/llpp/ChangeLog
+++ b/app-text/llpp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.60 2014/07/21 23:08:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.61 2014/08/25 15:25:09 xmw Exp $
+
+*llpp-20_p20140818 (25 Aug 2014)
+
+  25 Aug 2014; Michael Weber <xmw@gentoo.org> +files/llpp-20-WM_CLASS.patch,
+  +llpp-20_p20140818.ebuild, metadata.xml:
+  Version bump, prepare for upcoming USE=egl
 
 *llpp-19 (21 Jul 2014)
 
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 50a3d2e945ce..467516c9e019 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -2,25 +2,28 @@
 Hash: SHA256
 
 AUX llpp-11-WM_CLASS.patch 872 SHA256 efcbfc78ab6bcc1af0d4c6eafc737b55ef8ec0b1866f9cc9c95435a1e7d79bcc SHA512 15b25daeb9ef3d3845687c84287f477df10ca826f3909a204f20fe448c875e83741158f429c9c10c08000f481901bbf4f74c301c45c55db9dc8eaa6632e56f47 WHIRLPOOL d019176ea03c57c56d96d9dc652975edf7d024f941d0bccacef1bec6244a2a5544ae1e364786258c0de5686ee3fb6d9cbb3efdc89488ff890a0df1faa355036b
+AUX llpp-20-WM_CLASS.patch 860 SHA256 1abb7720d9f1667915a29a8cbcd53394126179b4f3ca96052e94a960418d8f57 SHA512 4ad9badfd56f28d92707844a9aaf97fb5b2f3f385523b13bf3274954591c0266506a860bf0182447be7951321b7731d0dd5f36e5c1adeb79115107705c5964bd WHIRLPOOL 8b56f38932231a8d2a76b66bd5971b0e46478713845768920e4c311229991c311a7f951843e4ad20c24e6f988b07d373d342bb560e70aeae06b5086f679af35d
 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
 DIST llpp-19.tar.gz 122875 SHA256 a050d78ac9e3ea7b3ae285e5c860a2e52b35c3533b3c705787350ad80992c64c SHA512 997f067fc8836869657db709255e7973b4b0510a1bf7e5daef4ede524d9f60921bbc3d19cf650b7554c88781da29898d2e014b3f0c4ed4f50a97277c2d828956 WHIRLPOOL 683df1615b31a416725f38763659c0dba7755bd64aab459842bfc48fe98130b834e0e219565e0ae699595100e0e577b94204721b7e33960c99fe6c4a6e1db672
+DIST llpp-20_p20140818.tar.gz 127805 SHA256 959862916f6ee4261903bd8192dd7b6203cf9b5fa989b4bb3c19377e61fe23ea SHA512 f529414ce1731f2f155e80615792a1d79e62f58f40238b83f0c5fd59e65429a8a95fe02f6556e7b1c51619f0cac670494e4844b444b428ea3ddb991361268790 WHIRLPOOL e190b8bbed54b8e5157c477bc071bcb16681017838cb0c0295bccddff2244be426ff4c925c3effab43dd2939e5ceb0397e2d860c6e53538139d38f340dd05a71
 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 c5869c9029413c6596e96503855a0db46d1a612fcc39ca7413d4f3bd7b086cac SHA512 e1c3d35010f90d7f2eaf733e7207ca8482e8fad613a04907f3c84e2b6dbb7de81fa36dcd22792d790e11b736705eac42ba25bad0f2182d9712e149bbdbbffc8e WHIRLPOOL 730ff7e3d2c9802b57d5959027e1090d30454fc52cd1af8079347179afdf0b870beb633358bae71bbb9c30e58823a4a7fb8e6538cb5790971ebb5e602b0f906f
 EBUILD llpp-19.ebuild 2981 SHA256 d1b5077712988cb16b727b803fa4961b5651d2e919c5d2c26a3c862ba068b1e5 SHA512 8760ffde426de44fdd16d9cad26e48ba433ab3d2465480f891f92d94c73e112eddc91e883736e1e8196a2780e3dfa65011d569240cc0b264dde1331344732b6b WHIRLPOOL 1f043778d97f5c56c2d38d7694c683dc25909b3f97a92fd97b9bc79483063dc421e2dd0baef2cacb7ae063a6e4fd25d83745106a07828c825a9c07b5e38f0ad7
+EBUILD llpp-20_p20140818.ebuild 3262 SHA256 505da7f6b76f2544b916e9737125adaa65c746056de40a49ef7d41d6357acdd7 SHA512 0a9522301d82bf6bf1c2fe45bbe90c34cacbddee5406a4836812733f7cbefed19e602600d2a758857b549a89d2bdd040855e356e98267e554a6e9038aac401a7 WHIRLPOOL 7bd996daa5f857bd9db231bbc7f71e0dd941dad3f3afc1d45c032e5aa0e8469884e6472167d7e68cbcd10327a96737aaf87ba7049e6ebf5de60e6c67521b05c0
 EBUILD llpp-9999.ebuild 2724 SHA256 da248ac48adc856fa78c3ba4b64398d976af9015a7043378d2d387c95e4c2813 SHA512 7baa29e6ad9a9e910ec776722711d54f6610c346c95d61eb9a66fb1447625da8a65d4e7cbaaf17253fb8a5e2d1cf47bc3bd66daa9ed37289dd22e61c1d0cb003 WHIRLPOOL 348953b1fd337dc6d7d9a24a4ac0e17e74412caa4c6effa0d64b3b059924b8c65b1cdfcf6c8b3533ea8c2ee72bd79aab67c3e212a45285d2d430203691e391af
-MISC ChangeLog 7989 SHA256 f29460186cd9af7166e0cb86d634c90496bcb0d23fa5c7e7f02d203c3b4f2cd7 SHA512 fe09eb9b00cb74b3d94e150046cd2516efc0bce9c90832225d6af9d7869cab8978d7e9b7dd49cef3aa3ab8ea7ce790918d4bda77428f2ed739b9aed9da3464f1 WHIRLPOOL 82d0b8a4a5bbd6201a4e7c2b725a2264af0fe86149f8a9ff2568d9cb206460f325d6690abedbb99ea1b199c763360fb3302788f71e1202954af1c235df7e4db8
-MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+MISC ChangeLog 8189 SHA256 c79198fb9da9ff0b31c8631044263414ab04dc74435588d2a6464740306ea019 SHA512 53274984a28e1bb0e6d576c82c02ac45331c289e0613fa14b405fa1f2a517d99fd2fa7462a2ed1cc48e97ec0489811d99bd802526ee57bd96d6debde5645aa18 WHIRLPOOL 684612004b12b2bc90521e085a664cd614ce88ecb76fe3af5ae483bb030f6951f0e04c7bc139ce2aa65e16130f2c9c82ff072fc5ced9aef1a4c3d5a3dade6795
+MISC metadata.xml 284 SHA256 5b2067c1bdecb9a4c54e590c62450cd7d7b490898817c24d9ca77a367956d1b2 SHA512 a25df2c026c5b1b30986780bec59a2aac01a5e7c1cd0821c46c4ceb57ebc9d6da08c0b5edf9ba071d8db4105d4f9626fe1e53dac7d62c6daa37672f39449165d WHIRLPOOL 1226e1df53f9695bd63076436969ac2545e9c92e9f6a40b6cb370aebe09d850a78407aa825a709dcebf9370205586601847733ed25fe1b48c75639ea549deac7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlPNnYtfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlP7VVlfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDG7QD9GZddAbBcBxG5TxNBd6IPuSkJ
-5IuDKNgvwPHT1wGzjSUA/iMfs/nIqydgIJ0/HSPluHZJnyvIpOHQ4S5nuPm0B7J7
-=KBSI
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JC7pgD8CG7LZkyqqbtXdt5cdCJuYPi0
+kpcSNNijCRmbUtIqLQIA/0HRHfA/psNGLbHSPn7wCtpn/Jj1ALVw8U4N3HF55GVO
+=742Q
 -----END PGP SIGNATURE-----
diff --git a/app-text/llpp/files/llpp-20-WM_CLASS.patch b/app-text/llpp/files/llpp-20-WM_CLASS.patch
new file mode 100644
index 000000000000..7c12ff5ae9b3
--- /dev/null
+++ b/app-text/llpp/files/llpp-20-WM_CLASS.patch
@@ -0,0 +1,42 @@
+--- llpp-20/link.c
++++ llpp-20/link.c
+@@ -4305,6 +4305,32 @@
+ }
+ #endif
+ 
++#if !defined (_WIN32) && !defined (__APPLE__)
++#undef pixel
++#include <X11/X.h>
++#include <X11/Xlib.h>
++#include <X11/Xutil.h>
++#include <GL/glx.h>
++
++static void set_wm_class (void)
++{
++    Display *dpy;
++    Window win;
++    int screen;
++    XClassHint hint;
++
++    dpy = XOpenDisplay (getenv ("DISPLAY"));
++    screen = DefaultScreen (dpy);
++    hint.res_name = "llpp";
++    hint.res_class = "llpp";
++    win = glXGetCurrentDrawable ();
++    XSetClassHint (dpy, win, &hint);
++    XCloseDisplay (dpy);
++}
++#else
++#define set_wm_class()
++#endif
++
+ CAMLprim value ml_init (value csock_v, value params_v)
+ {
+     CAMLparam2 (csock_v, params_v);
+@@ -4425,5 +4451,6 @@
+         errx (1, "pthread_create: %s", strerror (ret));
+     }
+ 
++    set_wm_class ();
+     CAMLreturn (Val_unit);
+ }
diff --git a/app-text/llpp/llpp-20_p20140818.ebuild b/app-text/llpp/llpp-20_p20140818.ebuild
new file mode 100644
index 000000000000..2ca6aafe67b6
--- /dev/null
+++ b/app-text/llpp/llpp-20_p20140818.ebuild
@@ -0,0 +1,96 @@
+# 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-20_p20140818.ebuild,v 1.1 2014/08/25 15:25:09 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/4fc967506989680faf64fb6c1dd0e0d13c678124.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+#IUSE="egl +ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs]
+	media-libs/openjpeg:2[static-libs]
+	media-libs/fontconfig:1.0[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]"
+# egl? ( media-libs/mesa[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}-20-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 -DUSE_FONTCONFIG"
+	#if use egl ; then
+	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
+	#	local egl="egl"
+	#fi 
+	if use static ; then
+		local cclib=""
+		local slib=""
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
+		ewarn ${spath}
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -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 ${egl} fontconfig) -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 bo.${cmo} le/bo.ml
+	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 config.${cmo} -I +lablGL config.ml
+	verbose ${ocaml} -c -pp "sed -f pp.sed" -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}" \
+		bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN} misc/${PN}ac
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/llpp/metadata.xml b/app-text/llpp/metadata.xml
index 59acc2cc580e..57fe3d26fd62 100644
--- a/app-text/llpp/metadata.xml
+++ b/app-text/llpp/metadata.xml
@@ -5,5 +5,8 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<use>
+<flag name="egl">build with EGL support</flag>
+</use>
 </pkgmetadata>