Version bump (thanks Tim Harder, bug 409591)

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 104 insertions, 1 deletions

diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index 02d38920ffe0..c2e6ad80aec7 100644
--- a/app-text/llpp/ChangeLog
+++ b/app-text/llpp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2012/01/28 23:27:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.20 2012/03/25 23:27:33 xmw Exp $
+
+*llpp-11 (25 Mar 2012)
+
+  25 Mar 2012; Michael Weber <xmw@gentoo.org> +llpp-11.ebuild,
+  +files/llpp-11-WM_CLASS.patch:
+  Version bump (thanks Tim Harder, bug 409591)
 
   28 Jan 2012; Michael Weber <xmw@gentoo.org> llpp-9999.ebuild:
   fixed mupdf dep
diff --git a/app-text/llpp/files/llpp-11-WM_CLASS.patch b/app-text/llpp/files/llpp-11-WM_CLASS.patch
new file mode 100644
index 000000000000..1e767ad918fe
--- /dev/null
+++ b/app-text/llpp/files/llpp-11-WM_CLASS.patch
@@ -0,0 +1,42 @@
+--- llpp/link.c
++++ llpp/link.c
+@@ -2792,6 +2792,32 @@
+     CAMLreturn (Val_unit);
+ }
+ 
++#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 pipe_v, value params_v)
+ {
+     CAMLparam2 (pipe_v, params_v);
+@@ -2852,5 +2878,6 @@
+         errx (1, "pthread_create: %s", strerror (ret));
+     }
+ 
++    set_wm_class ();
+     CAMLreturn (Val_unit);
+ }
diff --git a/app-text/llpp/llpp-11.ebuild b/app-text/llpp/llpp-11.ebuild
new file mode 100644
index 000000000000..fb064275e865
--- /dev/null
+++ b/app-text/llpp/llpp-11.ebuild
@@ -0,0 +1,55 @@
+# 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-11.ebuild,v 1.1 2012/03/25 23:27:33 xmw Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a 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/c51fadb15f683d7e5c0350e25a22aacb91e88b2a.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/freetype
+	media-libs/jbig2dec
+	media-libs/openjpeg
+	virtual/jpeg
+	x11-libs/libX11
+	x11-misc/xsel"
+DEPEND="${RDEPEND}
+	=app-text/mupdf-0.9_p20120221
+	dev-lang/ocaml[ocamlopt]
+	dev-ml/lablgl[glut]"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-WM_CLASS.patch
+}
+
+src_compile() {
+	ocaml str.cma keystoml.ml KEYS > help.ml || die
+	printf 'let version ="%s";;\n' ${PV} >> help.ml || die
+
+	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
+	local mycclib="-lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lX11 -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
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc KEYS README Thanks fixme
+}